diff options
| author | Brian Paul <[email protected]> | 2011-10-04 18:26:39 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-10-05 21:06:47 -0600 |
| commit | 5253cf98057dad54e25b4b8c36f8cf24f559314c (patch) | |
| tree | e3eae8ee98685f9a1795e3d301680e96871d651a /src/mesa/drivers/dri/nouveau | |
| parent | c3ef232315a4e9c18b3d812dbb28ffac6830d6f8 (diff) | |
mesa: get rid of imageOffsets arrays in texstore code
These were used to find the start of a 3D image slice (or 2D array texture
slice) given a base address. Instead, use a simple array of address of
image slices instead.
This is a step toward getting rid of the gl_texture_image::ImageOffsets
field.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 17fa6f576a3..2212d895ae4 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -477,9 +477,9 @@ nouveau_teximage(struct gl_context *ctx, GLint dims, GLenum target, GLint level, 0, 0, width, height); ret = _mesa_texstore(ctx, dims, ti->_BaseFormat, - ti->TexFormat, ti->Data, + ti->TexFormat, 0, 0, 0, s->pitch, - ti->ImageOffsets, + (GLubyte **) &ti->Data, width, height, depth, format, type, pixels, packing); assert(ret); @@ -565,8 +565,9 @@ nouveau_texsubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint lev xoffset, yoffset, width, height); ret = _mesa_texstore(ctx, 3, ti->_BaseFormat, ti->TexFormat, - ti->Data, 0, 0, 0, s->pitch, - ti->ImageOffsets, width, height, depth, + 0, 0, 0, s->pitch, + (GLubyte **) &ti->Data, + width, height, depth, format, type, pixels, packing); assert(ret); |