diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
| commit | 733df0059f04e3fd7e3265d3c80dd8029f939c60 (patch) | |
| tree | 5073edcb41611b86c9a62fa75c2c089fd2babf48 /src/gallium/state_trackers/dri/common | |
| parent | 6fb364a1717858d8201b2caf234076ce5d4832ac (diff) | |
| parent | 5fa09846618ed702493f054a1d4b0ec2a28fbbd0 (diff) | |
Merge branch 'master' into gallium-new-formats
Conflicts:
src/gallium/auxiliary/util/u_format.csv
Diffstat (limited to 'src/gallium/state_trackers/dri/common')
| -rw-r--r-- | src/gallium/state_trackers/dri/common/dri_st_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_st_api.c b/src/gallium/state_trackers/dri/common/dri_st_api.c index 40b24b18e9..7ba7ec383d 100644 --- a/src/gallium/state_trackers/dri/common/dri_st_api.c +++ b/src/gallium/state_trackers/dri/common/dri_st_api.c @@ -80,7 +80,7 @@ dri_st_framebuffer_validate(struct st_framebuffer_iface *stfbi, } #else if (new_stamp) - drisw_update_drawable_info(drawable->dPriv); + drisw_update_drawable_info(drawable); drisw_allocate_textures(drawable, statt_mask); #endif |