aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-11-15 05:03:45 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-11-15 05:03:45 +0000
commitdc0946e205944950fe8c24704137697593274838 (patch)
tree33f4e45e6ab147ce7fec4a0a910591e062692556
parentdevilhorns: warning told me that x is not being used.. and that looks (diff)
downloadefl-dc0946e205944950fe8c24704137697593274838.tar.gz
warning--
SVN revision: 79313
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c24
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c1
-rw-r--r--src/modules/evas/engines/software_x11/evas_x_egl.c2
4 files changed, 15 insertions, 14 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index a40d121459..490667f51e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -119,7 +119,7 @@ _evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint*
precision[0] = 24; // floor(-log2((1.0/16777218.0)));
}
return;
- shadertype = precisiontype = 0;
+ if (shadertype) shadertype = precisiontype = 0;
#endif
}
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 5dd14e8e4c..e4e7097ecd 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -109,15 +109,16 @@ _tex_format_index(GLuint format)
static void
_tex_2d(int intfmt, int w, int h, int fmt, int type)
{
-#ifdef GL_TEXTURE_INTERNAL_FORMAT
- int intfmtret = -1;
-#endif
glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL);
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_INTERNAL_FORMAT
+# ifdef GL_GLES
+# else
// this is not in opengles!!! hrrrm
- if (glGetTexLevelParameteriv)
+// if (glGetTexLevelParameteriv) // in case of weak symbols?
{
+ int intfmtret = -1;
+
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0,
GL_TEXTURE_INTERNAL_FORMAT, &intfmtret);
if (intfmtret != intfmt)
@@ -126,10 +127,11 @@ _tex_2d(int intfmt, int w, int h, int fmt, int type)
// XXX send async err to evas
}
}
- else
- {
- ERR("GL_TEXTURE_INTERNAL_FORMAT defined but no symbol loaded.");
- }
+// else
+// {
+// ERR("GL_TEXTURE_INTERNAL_FORMAT defined but no symbol loaded.");
+// }
+# endif
#endif
}
@@ -591,11 +593,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#else
- gc = NULL;
- w = 0;
- h = 0;
- intformat = 0;
- format = 0;
+ if (gc + w + h + intformat + format) return pt;
#endif
return pt;
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index 0b17572713..0ac8bb14ed 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -133,6 +133,7 @@ _output_egl_setup(int w, int h, int rot, Display *disp, Drawable draw,
evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
return re;
+ debug = 0;
}
static void
diff --git a/src/modules/evas/engines/software_x11/evas_x_egl.c b/src/modules/evas/engines/software_x11/evas_x_egl.c
index 7f259a7c1f..38ded3413e 100644
--- a/src/modules/evas/engines/software_x11/evas_x_egl.c
+++ b/src/modules/evas/engines/software_x11/evas_x_egl.c
@@ -278,4 +278,6 @@ evas_software_egl_outbuf_setup_x(int w, int h, int rot, Outbuf_Depth depth,
int shape_dither, int destination_alpha)
{
return NULL;
+ w = h = rot = depth = draw = cmap = x_depth = grayscale = max_colors = mask = shape_dither = destination_alpha = 0;
+ disp = NULL; vis = NULL;
}