diff options
| author | Brian Paul <[email protected]> | 2012-01-02 11:55:39 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-01-02 11:55:39 -0700 |
| commit | d69d287068e0a6b5e2f3c13b1f55335a9b6ce03b (patch) | |
| tree | 345c179ac005aead301355bd3e60433a8abadde4 /src/mesa/drivers | |
| parent | e833b98182ea7da142a57b385735be9e79776439 (diff) | |
mesa: remove the dstX/Y/Zoffset params to _mesa_texstore() functions
The were always zero. When doing a sub-texture replacement we account
for the dstX/Y/Zoffsets when we map the texture image. So no need to
pass them into the texstore code anymore.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_subimage.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index 258c3f5d6d9..eb8b9839a2b 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -118,7 +118,6 @@ intel_blit_texsubimage(struct gl_context * ctx, if (!_mesa_texstore(ctx, 2, texImage->_BaseFormat, texImage->TexFormat, - 0, 0, 0, /* x, y, z offset in dest buffer */ dstRowStride, &dstMap, width, height, 1, diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 0fb80ffd9cd..ae1ea37d845 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -480,7 +480,7 @@ nouveau_teximage(struct gl_context *ctx, GLint dims, ret = _mesa_texstore(ctx, dims, ti->_BaseFormat, ti->TexFormat, - 0, 0, 0, s->pitch, + s->pitch, &nti->base.Data, width, height, depth, format, type, pixels, packing); @@ -564,7 +564,7 @@ nouveau_texsubimage(struct gl_context *ctx, GLint dims, xoffset, yoffset, width, height); ret = _mesa_texstore(ctx, 3, ti->_BaseFormat, ti->TexFormat, - 0, 0, 0, s->pitch, + s->pitch, &nti->base.Data, width, height, depth, format, type, pixels, packing); |