diff options
| author | Brian Paul <[email protected]> | 2015-10-05 08:14:56 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-10-08 13:53:33 -0600 |
| commit | 7d7dd1871174905dfdd3ca874a09d9d7837ac743 (patch) | |
| tree | ad0ddb10b205a163cbd567f18150c3290a23729b /src/mesa/main/textureview.c | |
| parent | d61f492aba354283933b5d84e3daacc45a836141 (diff) | |
mesa,meta: move gl_texture_object::TargetIndex initializations
Before, we were unconditionally assigning the TargetIndex field in
_mesa_BindTexture(), even if it was already set properly. Now we
initialize TargetIndex wherever we initialize the Target field, in
_mesa_initialize_texture_object(), finish_texture_init(), etc.
v2: also update the meta_copy_image code. In make_view() the
view_tex_obj->Target field was set, but not the TargetIndex field.
Also, remove a second, redundant assignment to view_tex_obj->Target.
Add sanity check assertions too.
Reviewed-by: Anuj Phogat <[email protected]>
Tested-by: Mark Janes <[email protected]>
Diffstat (limited to 'src/mesa/main/textureview.c')
| -rw-r--r-- | src/mesa/main/textureview.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 5a3282a40c1..04b7d73da5c 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -681,6 +681,8 @@ _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture, texObj->Immutable = GL_TRUE; texObj->ImmutableLevels = origTexObj->ImmutableLevels; texObj->Target = target; + texObj->TargetIndex = _mesa_tex_target_to_index(ctx, target); + assert(texObj->TargetIndex < NUM_TEXTURE_TARGETS); if (ctx->Driver.TextureView != NULL && !ctx->Driver.TextureView(ctx, texObj, origTexObj)) { |