jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9f7fc377ea06ecc91b2d98d72297a3d943da646a
commit 9f7fc377ea06ecc91b2d98d72297a3d943da646a
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Nov 10 20:07:46 2015 +0900
Evas GL: Fix oopsie in the shaders selection
Thanks @raster
---
src/modules/evas/engines/gl_common/evas_gl_shader.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 08f04d4..c5ef0b9 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -668,7 +668,8 @@ evas_gl_common_shader_flags_get(Evas_GL_Shared *shared,
Shader_Type type,
sam = SHD_SAM21;
else if (sh >= (h * 2))
sam = SHD_SAM12;
- flags |= (1 << (SHADER_FLAG_SAM_BITSHIFT + sam - 1));
+ if (sam)
+ flags |= (1 << (SHADER_FLAG_SAM_BITSHIFT + sam - 1));
}
// mask downscale sampling
@@ -680,7 +681,8 @@ evas_gl_common_shader_flags_get(Evas_GL_Shared *shared,
Shader_Type type,
masksam = SHD_SAM21;
else if (mtex->h >= (mh * 2))
masksam = SHD_SAM12;
- flags |= (1 << (SHADER_FLAG_MASKSAM_BITSHIFT + masksam - 1));
+ if (masksam)
+ flags |= (1 << (SHADER_FLAG_MASKSAM_BITSHIFT + masksam - 1));
}
switch (type)
--
