diff options
author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2013-11-04 13:31:37 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2013-12-13 12:31:54 -0700 |
commit | 375f660e27d418a09cda75cf49ace2eb0211e64f (patch) | |
tree | 198b58fe0c46f2c1b0ca7229bd2fc7fc3cfcd525 | |
parent | 1db4cb841b489684f9141184f17a9244cdfa8c7e (diff) |
mesa: Update TexStorage to support ARB_texture_view
Call TextureView helper function to set TextureView state
appropriately for the TexStorage calls.
Misc updates from review feedback.
Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r-- | src/mesa/main/teximage.c | 6 | ||||
-rw-r--r-- | src/mesa/main/texstorage.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 7ec3e205bfe..f9427dcc45f 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -48,6 +48,7 @@ #include "texobj.h" #include "texstate.h" #include "texstorage.h" +#include "textureview.h" #include "mtypes.h" #include "glformats.h" @@ -4335,6 +4336,11 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples, } texObj->Immutable = immutable; + + if (immutable) { + _mesa_set_texture_view_state(ctx, texObj, target, 1); + } + _mesa_update_fbo_texture(ctx, texObj, 0, 0); } } diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 1dd63a31737..5062fdb4fd9 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -39,6 +39,7 @@ #include "texobj.h" #include "mipmap.h" #include "texstorage.h" +#include "textureview.h" #include "mtypes.h" @@ -415,8 +416,8 @@ texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat, return; } - texObj->Immutable = GL_TRUE; - texObj->ImmutableLevels = levels; + _mesa_set_texture_view_state(ctx, texObj, target, levels); + } } |