kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas_gl_shader: refractor shader/program compile check code. 

Summary:
    Call respective shader/program functions on shader/program target only.

Reviewers: cedric, raster, wonsik, spacegrapher, jpeg

Reviewed By: jpeg

Subscribers: alok25, sachin.dev, cedric, seoz

Differential Revision: https://phab.enlightenment.org/D3388
This commit is contained in:
Amitesh Singh 2015-12-02 16:47:27 +09:00 committed by Chris Michael
parent 9ef7237aa3
commit 0dd1a9144c
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/modules/evas/engines/gl_common/evas_gl_shader.c
View File

@ -66,32 +66,25 @@ static const char *_shader_flags[SHADER_FLAG_COUNT] = {
static Eina_Bool compiler_released = EINA_FALSE;
static void
gl_compile_link_error(GLuint target, const char *action)
gl_compile_link_error(GLuint target, const char *action, Eina_Bool is_shader)
{
int loglen = 0, chars = 0;
char *logtxt;
/* Shader info log */
glGetShaderiv(target, GL_INFO_LOG_LENGTH, &loglen);
if (loglen > 0)
{
logtxt = calloc(loglen, sizeof(char));
if (logtxt)
{
glGetShaderInfoLog(target, loglen, &chars, logtxt);
ERR("Failed to %s: %s", action, logtxt);
free(logtxt);
}
}
if (is_shader)
/* Shader info log */
glGetShaderiv(target, GL_INFO_LOG_LENGTH, &loglen);
else
/* Program info log */
glGetProgramiv(target, GL_INFO_LOG_LENGTH, &loglen);
/* Program info log */
glGetProgramiv(target, GL_INFO_LOG_LENGTH, &loglen);
if (loglen > 0)
{
logtxt = calloc(loglen, sizeof(char));
if (logtxt)
{
glGetProgramInfoLog(target, loglen, &chars, logtxt);
if (is_shader) glGetShaderInfoLog(target, loglen, &chars, logtxt);
else glGetProgramInfoLog(target, loglen, &chars, logtxt);
ERR("Failed to %s: %s", action, logtxt);
free(logtxt);
}
@ -155,7 +148,7 @@ _evas_gl_common_shader_program_binary_load(Eet_File *ef, unsigned int flags)
glGetProgramiv(prg, GL_LINK_STATUS, &ok);
if (!ok)
{
gl_compile_link_error(prg, "load a program object");
gl_compile_link_error(prg, "load a program object", EINA_FALSE);
ERR("Abort load of program (%s)", pname);
glDeleteProgram(prg);
glDeleteShader(vtx);
@ -381,7 +374,7 @@ evas_gl_common_shader_compile(unsigned int flags, const char *vertex,
glGetShaderiv(vtx, GL_COMPILE_STATUS, &ok);
if (!ok)
{
gl_compile_link_error(vtx, "compile vertex shader");
gl_compile_link_error(vtx, "compile vertex shader", EINA_TRUE);
ERR("Abort compile of vertex shader:\n%s", vertex);
glDeleteShader(vtx);
return NULL;
@ -393,7 +386,7 @@ evas_gl_common_shader_compile(unsigned int flags, const char *vertex,
glGetShaderiv(frg, GL_COMPILE_STATUS, &ok);
if (!ok)
{
gl_compile_link_error(frg, "compile fragment shader");
gl_compile_link_error(frg, "compile fragment shader", EINA_TRUE);
ERR("Abort compile of fragment shader:\n%s", fragment);
glDeleteShader(vtx);
glDeleteShader(frg);
@ -423,7 +416,7 @@ evas_gl_common_shader_compile(unsigned int flags, const char *vertex,
glGetProgramiv(prg, GL_LINK_STATUS, &ok);
if (!ok)
{
gl_compile_link_error(prg, "link fragment and vertex shaders");
gl_compile_link_error(prg, "link fragment and vertex shaders", EINA_FALSE);
ERR("Abort compile of shader (flags: %08x)", flags);
glDeleteShader(vtx);
glDeleteShader(frg);