diff options
author | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/gallium/state_trackers/xorg/xorg_composite.c | |
parent | 884007546c98b1779bf266ec5111b1e7e2b68b2e (diff) | |
parent | d509f84543d0979e9bb53c20c195f378dd61e728 (diff) |
Merge branch 'width0'
Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_composite.c')
-rw-r--r-- | src/gallium/state_trackers/xorg/xorg_composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c index 4dbb490ca5..69a83b1523 100644 --- a/src/gallium/state_trackers/xorg/xorg_composite.c +++ b/src/gallium/state_trackers/xorg/xorg_composite.c @@ -439,8 +439,8 @@ setup_fs_constant_buffer(struct exa_context *exa) static void setup_constant_buffers(struct exa_context *exa, struct exa_pixmap_priv *pDst) { - int width = pDst->tex->width[0]; - int height = pDst->tex->height[0]; + int width = pDst->tex->width0; + int height = pDst->tex->height0; setup_vs_constant_buffer(exa, width, height); setup_fs_constant_buffer(exa); |