diff options
| author | Laura Ekstrand <laura@jlekstrand.net> | 2015-03-24 15:03:38 -0700 |
|---|---|---|
| committer | Laura Ekstrand <laura@jlekstrand.net> | 2015-03-24 15:03:38 -0700 |
| commit | 3c9461c3510bbf3bc3d31e459bb04268bd8e654e (patch) | |
| tree | f0976e324f82f22360f437742be91268bda2116c | |
| parent | b160ad73dd27d7a5a7b5a9004ffb2d7951b0dfa2 (diff) | |
meta: decompress_texture_image now saves pointer for samplerSave.
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index d0857749fe..51e7ed86ed 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2985,7 +2985,7 @@ decompress_texture_image(struct gl_context *ctx, GLenum rbFormat; GLenum faceTarget; struct vertex verts[4]; - GLuint samplerSave; + struct gl_sampler_object *samplerSave; GLenum status; const bool use_glsl_version = ctx->Extensions.ARB_vertex_shader && ctx->Extensions.ARB_fragment_shader; @@ -3035,8 +3035,7 @@ decompress_texture_image(struct gl_context *ctx, _mesa_meta_begin(ctx, MESA_META_ALL & ~(MESA_META_PIXEL_STORE | MESA_META_DRAW_BUFFERS)); - samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ? - ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0; + samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler; /* Create/bind FBO/renderbuffer */ if (decompress_fbo->FBO == 0) { @@ -3193,7 +3192,7 @@ decompress_texture_image(struct gl_context *ctx, if (!use_glsl_version) _mesa_set_enable(ctx, target, GL_FALSE); - _mesa_BindSampler(ctx->Texture.CurrentUnit, samplerSave); + _mesa_bind_sampler(ctx, ctx->Texture.CurrentUnit, samplerSave); _mesa_meta_end(ctx); |