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

test_glview: Refractored the shader/program log code. 

Summary:
Added a function print_glerror_log to handle both shaders and programs
logs.

Test Plan: elementary_test -> glview

Reviewers: raster, jpeg, seoz

Reviewed By: seoz

Subscribers: anand.km, seoz

Differential Revision: https://phab.enlightenment.org/D1826
This commit is contained in:
Amitesh Singh 2014-12-27 22:12:30 +09:00 committed by Daniel Juyung Seo
parent 69b6310954
commit eb3d69a8ec
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
legacy/elementary/src/bin/test_glview.c
View File

@ -340,13 +340,34 @@ static const char vertex_shader[] =
" gl_FragColor = color + white * dot(light_direction, rotated_normal);\n"
"}\n";
static void
_print_gl_log(Evas_GL_API *gl, GLuint id)
{
GLint log_len = 0;
char *log;
if (gl->glIsShader(id))
gl->glGetShaderiv(id, GL_INFO_LOG_LENGTH, &log_len);
else if (gl->glIsProgram(id))
gl->glGetProgramiv(id, GL_INFO_LOG_LENGTH, &log_len);
log = malloc(log_len * sizeof(char));
if (gl->glIsShader(id))
gl->glGetShaderInfoLog(id, log_len, NULL, log);
else if (gl->glIsProgram(id))
gl->glGetProgramInfoLog(id, log_len, NULL, log);
printf("%s", log);
free(log);
}
static void
gears_init(GLData *gld)
{
Evas_GL_API *gl = gld->glapi;
const char *p;
char msg[512];
gl->glEnable(GL_CULL_FACE);
gl->glEnable(GL_DEPTH_TEST);
@ -355,15 +376,13 @@ gears_init(GLData *gld)
gld->vtx_shader = gl->glCreateShader(GL_VERTEX_SHADER);
gl->glShaderSource(gld->vtx_shader, 1, &p, NULL);
gl->glCompileShader(gld->vtx_shader);
gl->glGetShaderInfoLog(gld->vtx_shader, sizeof msg, NULL, msg);
printf("vertex shader info: %s\n", msg);
_print_gl_log(gl, gld->vtx_shader);
p = fragment_shader;
gld->fgmt_shader = gl->glCreateShader(GL_FRAGMENT_SHADER);
gl->glShaderSource(gld->fgmt_shader, 1, &p, NULL);
gl->glCompileShader(gld->fgmt_shader);
gl->glGetShaderInfoLog(gld->fgmt_shader, sizeof msg, NULL, msg);
printf("fragment shader info: %s\n", msg);
_print_gl_log(gl, gld->fgmt_shader);
gld->program = gl->glCreateProgram();
gl->glAttachShader(gld->program, gld->vtx_shader);
@ -372,8 +391,7 @@ gears_init(GLData *gld)
gl->glBindAttribLocation(gld->program, 1, "normal");
gl->glLinkProgram(gld->program);
gl->glGetProgramInfoLog(gld->program, sizeof msg, NULL, msg);
printf("info: %s\n", msg);
_print_gl_log(gl, gld->program);
gl->glUseProgram(gld->program);
gld->proj_location = gl->glGetUniformLocation(gld->program, "proj");