summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-02-10 02:27:00 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-02-10 02:30:10 +0900
commit2ca0756ad614f52c7c87c6aaccbb8becfd1c26d6 (patch)
tree05d1f65413da7dd7ab173becc8a0c4f39c624630 /src/modules
parent48d8cdb4dd430667b6c70adeabd0daffbab6249f (diff)
evas - gl enigne - mask logic fix with texa draw arrays
this fixes a logic oops in addition of masking to evas which caused crashes with a null texa array causing a crash in gldrawarrays
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 55118ea81d..4584e504db 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -3343,7 +3343,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3343 3343
3344 MASK_TEXTURE += 1; 3344 MASK_TEXTURE += 1;
3345 } 3345 }
3346 else if (gc->pipe[i].region.type == RTYPE_MAP) 3346 else if (gc->pipe[i].array.use_texa && (gc->pipe[i].region.type == RTYPE_MAP))
3347 { 3347 {
3348 /* FIXME: 3348 /* FIXME:
3349 * This is a workaround as we hijack some tex ids 3349 * This is a workaround as we hijack some tex ids