forked from enlightenment/efl
and fail init of gl cleanly again... :)
SVN revision: 51644
This commit is contained in:
parent
fa19a2685b
commit
7e896b081a
|
@ -660,13 +660,16 @@ evas_gl_common_context_free(Evas_GL_Context *gc)
|
||||||
|
|
||||||
if (gc->def_surface) evas_gl_common_image_free(gc->def_surface);
|
if (gc->def_surface) evas_gl_common_image_free(gc->def_surface);
|
||||||
|
|
||||||
for (i = 0; i < gc->shared->info.pipes_max; i++)
|
if (gc->shared)
|
||||||
{
|
{
|
||||||
if (gc->pipe[i].array.vertex) free(gc->pipe[i].array.vertex);
|
for (i = 0; i < gc->shared->info.pipes_max; i++)
|
||||||
if (gc->pipe[i].array.color) free(gc->pipe[i].array.color);
|
{
|
||||||
if (gc->pipe[i].array.texuv) free(gc->pipe[i].array.texuv);
|
if (gc->pipe[i].array.vertex) free(gc->pipe[i].array.vertex);
|
||||||
if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
|
if (gc->pipe[i].array.color) free(gc->pipe[i].array.color);
|
||||||
if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
|
if (gc->pipe[i].array.texuv) free(gc->pipe[i].array.texuv);
|
||||||
|
if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
|
||||||
|
if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((gc->shared) && (gc->shared->references == 0))
|
if ((gc->shared) && (gc->shared->references == 0))
|
||||||
|
|
|
@ -441,6 +441,7 @@ evas_gl_common_shader_program_init(Evas_GL_Program *p,
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
glCompileShader(p->vert);
|
glCompileShader(p->vert);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
|
ok = 0;
|
||||||
glGetShaderiv(p->vert, GL_COMPILE_STATUS, &ok);
|
glGetShaderiv(p->vert, GL_COMPILE_STATUS, &ok);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if (!ok)
|
if (!ok)
|
||||||
|
@ -454,6 +455,7 @@ evas_gl_common_shader_program_init(Evas_GL_Program *p,
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
glCompileShader(p->frag);
|
glCompileShader(p->frag);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
|
ok = 0;
|
||||||
glGetShaderiv(p->frag, GL_COMPILE_STATUS, &ok);
|
glGetShaderiv(p->frag, GL_COMPILE_STATUS, &ok);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if (!ok)
|
if (!ok)
|
||||||
|
@ -482,6 +484,7 @@ evas_gl_common_shader_program_init(Evas_GL_Program *p,
|
||||||
|
|
||||||
glLinkProgram(p->prog);
|
glLinkProgram(p->prog);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
|
ok = 0;
|
||||||
glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
|
glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if (!ok)
|
if (!ok)
|
||||||
|
|
Loading…
Reference in New Issue