forked from enlightenment/efl
parent
940a75b5a8
commit
dc0946e205
|
@ -119,7 +119,7 @@ _evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint*
|
||||||
precision[0] = 24; // floor(-log2((1.0/16777218.0)));
|
precision[0] = 24; // floor(-log2((1.0/16777218.0)));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
shadertype = precisiontype = 0;
|
if (shadertype) shadertype = precisiontype = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,15 +109,16 @@ _tex_format_index(GLuint format)
|
||||||
static void
|
static void
|
||||||
_tex_2d(int intfmt, int w, int h, int fmt, int type)
|
_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);
|
glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
#ifdef GL_TEXTURE_INTERNAL_FORMAT
|
#ifdef GL_TEXTURE_INTERNAL_FORMAT
|
||||||
|
# ifdef GL_GLES
|
||||||
|
# else
|
||||||
// this is not in opengles!!! hrrrm
|
// this is not in opengles!!! hrrrm
|
||||||
if (glGetTexLevelParameteriv)
|
// if (glGetTexLevelParameteriv) // in case of weak symbols?
|
||||||
{
|
{
|
||||||
|
int intfmtret = -1;
|
||||||
|
|
||||||
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0,
|
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0,
|
||||||
GL_TEXTURE_INTERNAL_FORMAT, &intfmtret);
|
GL_TEXTURE_INTERNAL_FORMAT, &intfmtret);
|
||||||
if (intfmtret != intfmt)
|
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
|
// XXX send async err to evas
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
ERR("GL_TEXTURE_INTERNAL_FORMAT defined but no symbol loaded.");
|
// ERR("GL_TEXTURE_INTERNAL_FORMAT defined but no symbol loaded.");
|
||||||
}
|
// }
|
||||||
|
# endif
|
||||||
#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);
|
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
#else
|
#else
|
||||||
gc = NULL;
|
if (gc + w + h + intformat + format) return pt;
|
||||||
w = 0;
|
|
||||||
h = 0;
|
|
||||||
intformat = 0;
|
|
||||||
format = 0;
|
|
||||||
#endif
|
#endif
|
||||||
return pt;
|
return pt;
|
||||||
|
|
||||||
|
|
|
@ -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);
|
evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
|
||||||
|
|
||||||
return re;
|
return re;
|
||||||
|
debug = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -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)
|
int shape_dither, int destination_alpha)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
|
w = h = rot = depth = draw = cmap = x_depth = grayscale = max_colors = mask = shape_dither = destination_alpha = 0;
|
||||||
|
disp = NULL; vis = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue