AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: Use _mesa_bind_texture instead of _mesa_BindTexture

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick
2016-01-19 17:15:08 -08:00
parent e0ad314568
commit 5325a34ed7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/common/meta.c
+3 -3
View File
@@ -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);
src/mesa/drivers/common/meta_generate_mipmap.c
+2 -2
View File
@@ -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);