[Mesa-dev] [v3 8/8] mesa: Update TexStorage to support ARB_texture_view
Courtney Goeltzenleuchter
courtney at lunarg.com
Tue Nov 19 15:16:46 PST 2013
Call TextureView helper function to set TextureView state
appropriately for the TexStorage calls.
Misc updates from review feedback.
Signed-off-by: Courtney Goeltzenleuchter <courtney at LunarG.com>
---
src/mesa/main/teximage.c | 6 ++++++
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 793c5d3..149b6da 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"
@@ -4348,6 +4349,11 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
}
texObj->Immutable = immutable;
+
+ if (immutable) {
+ 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 84b8f82..4cdcb02 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -38,6 +38,7 @@
#include "teximage.h"
#include "texobj.h"
#include "texstorage.h"
+#include "textureview.h"
#include "mtypes.h"
@@ -436,8 +437,8 @@ texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat,
return;
}
- texObj->Immutable = GL_TRUE;
- texObj->ImmutableLevels = levels;
+ set_texture_view_state(ctx, texObj, target, levels);
+
}
}
--
1.8.1.2
More information about the mesa-dev
mailing list