Mesa (master): meta: Use _mesa_bind_texture instead of _mesa_BindTexture
Ian Romanick
idr at kemper.freedesktop.org
Wed Jan 3 00:24:25 UTC 2018
Module: Mesa
Branch: master
Commit: 5325a34ed78e2ffc3bd3d05fbdb49c8002853a77
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5325a34ed78e2ffc3bd3d05fbdb49c8002853a77
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Jan 19 17:15:08 2016 -0800
meta: Use _mesa_bind_texture instead of _mesa_BindTexture
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/mesa/drivers/common/meta.c | 6 +++---
src/mesa/drivers/common/meta_generate_mipmap.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 5bad17d76b..55d803fd5b 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1386,7 +1386,7 @@ _mesa_meta_setup_copypix_texture(struct gl_context *ctx,
{
bool newTex;
- _mesa_BindTexture(tex->Target, tex->tex_obj->Name);
+ _mesa_bind_texture(ctx, tex->Target, tex->tex_obj);
_mesa_texture_parameteriv(ctx, tex->tex_obj, GL_TEXTURE_MIN_FILTER,
(GLint *) &filter, false);
_mesa_texture_parameteriv(ctx, tex->tex_obj, GL_TEXTURE_MAG_FILTER,
@@ -1437,7 +1437,7 @@ _mesa_meta_setup_drawpix_texture(struct gl_context *ctx,
*/
static const GLint filter = GL_NEAREST;
- _mesa_BindTexture(tex->Target, tex->tex_obj->Name);
+ _mesa_bind_texture(ctx, tex->Target, tex->tex_obj);
_mesa_texture_parameteriv(ctx, tex->tex_obj, GL_TEXTURE_MIN_FILTER, &filter,
false);
_mesa_texture_parameteriv(ctx, tex->tex_obj, GL_TEXTURE_MAG_FILTER, &filter,
@@ -3176,7 +3176,7 @@ decompress_texture_image(struct gl_context *ctx,
_mesa_buffer_sub_data(ctx, decompress->buf_obj, 0, sizeof(verts), verts);
/* setup texture state */
- _mesa_BindTexture(target, texObj->Name);
+ _mesa_bind_texture(ctx, target, texObj);
if (!use_glsl_version)
_mesa_set_enable(ctx, target, GL_TRUE);
diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c
index 55093e9553..99d0931694 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -201,10 +201,10 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
/* We may have been called from glGenerateTextureMipmap with CurrentUnit
* still set to 0, so we don't know when we can skip binding the texture.
- * Assume that _mesa_BindTexture will be fast if we're rebinding the same
+ * Assume that _mesa_bind_texture will be fast if we're rebinding the same
* texture.
*/
- _mesa_BindTexture(target, texObj->Name);
+ _mesa_bind_texture(ctx, target, texObj);
if (mipmap->samp_obj == NULL) {
mipmap->samp_obj = ctx->Driver.NewSamplerObject(ctx, 0xDEADBEEF);
More information about the mesa-commit
mailing list