summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_common/evas_gl_texture.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-04-21 19:47:44 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-04-21 20:11:02 +0900
commit8e8444bf35be2ce5af0b3dcdc751cd1a3d5328af (patch)
treef6215fcdbb28152d2d2e2ee6b70a5d8c0fb083c5 /src/modules/evas/engines/gl_common/evas_gl_texture.c
parenta812df731101bf0f2f2afa9ef3baa662d3b7fcfa (diff)
Evas GL common: Fix clang warnings
Mooooarrr!
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index a8f95ed253..f65784d9b3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -2,8 +2,6 @@
2 2
3static const GLenum rgba_fmt = GL_RGBA; 3static const GLenum rgba_fmt = GL_RGBA;
4static const GLenum rgba_ifmt = GL_RGBA; 4static const GLenum rgba_ifmt = GL_RGBA;
5static const GLenum rgb_fmt = GL_RGBA;
6static const GLenum rgb_ifmt = GL_RGB;
7 5
8#ifdef GL_GLES 6#ifdef GL_GLES
9static const GLenum bgra_fmt = GL_BGRA; 7static const GLenum bgra_fmt = GL_BGRA;
@@ -11,6 +9,8 @@ static const GLenum bgra_ifmt = GL_BGRA;
11static const GLenum bgr_fmt = GL_BGRA; 9static const GLenum bgr_fmt = GL_BGRA;
12static const GLenum bgr_ifmt = GL_BGRA; 10static const GLenum bgr_ifmt = GL_BGRA;
13#else 11#else
12static const GLenum rgb_fmt = GL_RGBA;
13static const GLenum rgb_ifmt = GL_RGB;
14static const GLenum bgra_fmt = GL_BGRA; 14static const GLenum bgra_fmt = GL_BGRA;
15static const GLenum bgra_ifmt = GL_RGBA; 15static const GLenum bgra_ifmt = GL_RGBA;
16static const GLenum bgr_fmt = GL_BGRA; 16static const GLenum bgr_fmt = GL_BGRA;
@@ -89,6 +89,8 @@ static const struct {
89 { MATCH_ANY, MATCH_ANY, EVAS_COLORSPACE_RGBA_S3TC_DXT5, &s3tc_rgba_dxt45_fmt, &s3tc_rgba_dxt45_fmt } 89 { MATCH_ANY, MATCH_ANY, EVAS_COLORSPACE_RGBA_S3TC_DXT5, &s3tc_rgba_dxt45_fmt, &s3tc_rgba_dxt45_fmt }
90}; 90};
91 91
92#ifdef GL_TEXTURE_INTERNAL_FORMAT
93# ifndef GL_GLES
92static const GLenum matching_rgb[] = { GL_RGB4, GL_RGB8, GL_RGB12, GL_RGB16, 0x0 }; 94static const GLenum matching_rgb[] = { GL_RGB4, GL_RGB8, GL_RGB12, GL_RGB16, 0x0 };
93static const GLenum matching_rgba[] = { GL_RGBA4, GL_RGBA8, GL_RGBA12, GL_RGBA16, 0x0 }; 95static const GLenum matching_rgba[] = { GL_RGBA4, GL_RGBA8, GL_RGBA12, GL_RGBA16, 0x0 };
94static const GLenum matching_alpha[] = { GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, 0x0 }; 96static const GLenum matching_alpha[] = { GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, 0x0 };
@@ -107,10 +109,6 @@ static const struct {
107 { GL_LUMINANCE_ALPHA, matching_luminance_alpha } 109 { GL_LUMINANCE_ALPHA, matching_luminance_alpha }
108}; 110};
109 111
110#define MATCH(_r, _v) ((_r == MATCH_ANY) || (_v == MATCH_ANY) || (_r == _v))
111
112#ifdef GL_TEXTURE_INTERNAL_FORMAT
113# ifndef GL_GLES
114static Eina_Bool 112static Eina_Bool
115_evas_gl_texture_match(GLenum intfmt, GLenum intfmtret) 113_evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
116{ 114{
@@ -134,6 +132,8 @@ _evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
134# endif 132# endif
135#endif 133#endif
136 134
135#define MATCH(_r, _v) ((_r == MATCH_ANY) || (_v == MATCH_ANY) || (_r == _v))
136
137static int 137static int
138_evas_gl_texture_search_format(Eina_Bool alpha, Eina_Bool bgra, Evas_Colorspace cspace) 138_evas_gl_texture_search_format(Eina_Bool alpha, Eina_Bool bgra, Evas_Colorspace cspace)
139{ 139{