summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnuj Phogat <anuj.phogat@gmail.com>2014-05-30 14:55:28 -0700
committerCarl Worth <cworth@cworth.org>2014-08-06 14:34:57 -0700
commit8bb6628cb98a2c92197d9af3614d3bfdc0b4da53 (patch)
tree6e5fd1a86ea039b603af45cbbd688d023c64468f /src
parent69d6ceda434fc9ce755bc00943a95a2edd7115c4 (diff)
mesa: Fix error condition for valid texture targets in glTexStorage* functions
Fixes gles3 Khronos CTS test: texture_storage_texture_targets Cc: <mesa-stable@lists.freedesktop.org> Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> (cherry picked from commit a94d78438d35cfde851596dff8461f1e739a0ddc)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texstorage.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 86c8f3c922d..44b5374fdbd 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -53,6 +53,13 @@
static GLboolean
legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
{
+ if (_mesa_is_gles3(ctx)
+ && target != GL_TEXTURE_2D
+ && target != GL_TEXTURE_CUBE_MAP
+ && target != GL_TEXTURE_3D
+ && target != GL_TEXTURE_2D_ARRAY)
+ return GL_FALSE;
+
switch (dims) {
case 1:
switch (target) {