diff options
| author | Roland Scheidegger <[email protected]> | 2009-11-27 17:15:47 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2009-11-27 17:15:47 +0100 |
| commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
| tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/gallium/include | |
| 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/include')
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 287b424e4ac..9766e86620c 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -343,9 +343,9 @@ struct pipe_texture enum pipe_texture_target target; /**< PIPE_TEXTURE_x */ enum pipe_format format; /**< PIPE_FORMAT_x */ - unsigned width[PIPE_MAX_TEXTURE_LEVELS]; - unsigned height[PIPE_MAX_TEXTURE_LEVELS]; - unsigned depth[PIPE_MAX_TEXTURE_LEVELS]; + unsigned width0; + unsigned height0; + unsigned depth0; struct pipe_format_block block; unsigned nblocksx[PIPE_MAX_TEXTURE_LEVELS]; /**< allocated width in blocks */ |