diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2014-01-23 14:02:24 +0100 |
|---|---|---|
| committer | Fredrik Höglund <fredrik@kde.org> | 2014-05-02 02:53:25 +0200 |
| commit | 659d94b256fd6bcf19c8cdf261e2c0bb26e0faf2 (patch) | |
| tree | 7ec8b1fddaa58d6e1e99aecdbcd4443684d0923f /src/mesa/drivers/dri/nouveau | |
| parent | b8ee235e721ffd2503f4e8114d38685d58a0ceae (diff) | |
| download | external_mesa3d-659d94b256fd6bcf19c8cdf261e2c0bb26e0faf2.zip external_mesa3d-659d94b256fd6bcf19c8cdf261e2c0bb26e0faf2.tar.gz external_mesa3d-659d94b256fd6bcf19c8cdf261e2c0bb26e0faf2.tar.bz2 | |
mesa: Add a texUnit parameter to dd_function_table::BindTexture
This is for glBindTextures(), since it doesn't change the active
texture unit.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index ae8dbd4..e7d5c02 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -575,11 +575,11 @@ nouveau_compressed_texsubimage(struct gl_context *ctx, GLuint dims, } static void -nouveau_bind_texture(struct gl_context *ctx, GLenum target, - struct gl_texture_object *t) +nouveau_bind_texture(struct gl_context *ctx, GLuint texUnit, + GLenum target, struct gl_texture_object *t) { - context_dirty_i(ctx, TEX_OBJ, ctx->Texture.CurrentUnit); - context_dirty_i(ctx, TEX_ENV, ctx->Texture.CurrentUnit); + context_dirty_i(ctx, TEX_OBJ, texUnit); + context_dirty_i(ctx, TEX_ENV, texUnit); } static mesa_format |