if (!status)
{
- char log[1024];
+ char shader_log[1024];
GLint len;
- glGetShaderInfoLog (shader, sizeof (log) - 1, &len, log);
- log[len] = '\0';
+ glGetShaderInfoLog (shader, sizeof (shader_log) - 1, &len, shader_log);
+ shader_log[len] = '\0';
- g_critical ("%s", log);
+ g_critical ("%s", shader_log);
glDeleteShader (shader);
CoglShader *shader
= _cogl_shader_pointer_from_handle ((CoglHandle) node->data);
- if (shader->type == CGL_VERTEX_SHADER)
+ if (shader->type == COGL_SHADER_TYPE_VERTEX)
custom_vertex_shader = TRUE;
- else if (shader->type == CGL_FRAGMENT_SHADER)
+ else if (shader->type == COGL_SHADER_TYPE_FRAGMENT)
custom_fragment_shader = TRUE;
}
}
if (!status)
{
- char log[1024];
+ char shader_log[1024];
GLint len;
- glGetProgramInfoLog (program->program, sizeof (log) - 1, &len, log);
- log[len] = '\0';
+ glGetProgramInfoLog (program->program, sizeof (shader_log) - 1, &len, shader_log);
+ shader_log[len] = '\0';
- g_critical ("%s", log);
+ g_critical ("%s", shader_log);
glDeleteProgram (program->program);
g_slice_free (CoglGles2WrapperProgram, program);
while (iter)
{
GSList *next = iter->next;
- GLfloat x0, x1;
- GLfloat y0, y1;
+ GLfloat x_0, x_1;
+ GLfloat y_0, y_1;
if (!next)
break;
- x0 = GPOINTER_TO_INT (iter->data);
- x1 = GPOINTER_TO_INT (next->data);
- y0 = bounds_y + i;
- y1 = bounds_y + i + 1.0625f;
+ x_0 = GPOINTER_TO_INT (iter->data);
+ x_1 = GPOINTER_TO_INT (next->data);
+ y_0 = bounds_y + i;
+ y_1 = bounds_y + i + 1.0625f;
/* render scanlines 1.0625 high to avoid gaps when
transformed */
- coords[span_no * 12 + 0] = x0;
- coords[span_no * 12 + 1] = y0;
- coords[span_no * 12 + 2] = x1;
- coords[span_no * 12 + 3] = y0;
- coords[span_no * 12 + 4] = x1;
- coords[span_no * 12 + 5] = y1;
- coords[span_no * 12 + 6] = x0;
- coords[span_no * 12 + 7] = y0;
- coords[span_no * 12 + 8] = x0;
- coords[span_no * 12 + 9] = y1;
- coords[span_no * 12 + 10] = x1;
- coords[span_no * 12 + 11] = y1;
+ coords[span_no * 12 + 0] = x_0;
+ coords[span_no * 12 + 1] = y_0;
+ coords[span_no * 12 + 2] = x_1;
+ coords[span_no * 12 + 3] = y_0;
+ coords[span_no * 12 + 4] = x_1;
+ coords[span_no * 12 + 5] = y_1;
+ coords[span_no * 12 + 6] = x_0;
+ coords[span_no * 12 + 7] = y_0;
+ coords[span_no * 12 + 8] = x_0;
+ coords[span_no * 12 + 9] = y_1;
+ coords[span_no * 12 + 10] = x_1;
+ coords[span_no * 12 + 11] = y_1;
span_no ++;
iter = next->next;
}
main (int argc, char **argv)
{
TestConformSharedState *shared_state = g_new0 (TestConformSharedState, 1);
- const gchar *display;
#ifdef HAVE_CLUTTER_GLX
/* on X11 we need a display connection to run the test suite */
- display = g_getenv ("DISPLAY");
+ const gchar *display = g_getenv ("DISPLAY");
if (!display || *display == '\0')
{
g_print ("No DISPLAY found. Unable to run the conformance "