mirror of
https://github.com/brl/mutter.git
synced 2024-11-27 02:20:43 -05:00
[build] Fixes a cogl-vertex-buffer.c warning when building for GLES
GLES 1 doesn't support GLSL so it never needs to use the generic_index variable for generic attributes which was flagging a warning.
This commit is contained in:
parent
891ed53564
commit
3d81f0c08e
@ -1435,7 +1435,9 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
|||||||
{
|
{
|
||||||
GList *tmp;
|
GList *tmp;
|
||||||
GLenum gl_type;
|
GLenum gl_type;
|
||||||
|
#ifdef MAY_HAVE_PROGRAMABLE_GL
|
||||||
GLuint generic_index = 0;
|
GLuint generic_index = 0;
|
||||||
|
#endif
|
||||||
gulong enable_flags = 0;
|
gulong enable_flags = 0;
|
||||||
guint max_texcoord_attrib_unit = 0;
|
guint max_texcoord_attrib_unit = 0;
|
||||||
const GList *layers;
|
const GList *layers;
|
||||||
@ -1577,7 +1579,9 @@ disable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
|||||||
{
|
{
|
||||||
GList *tmp;
|
GList *tmp;
|
||||||
GLenum gl_type;
|
GLenum gl_type;
|
||||||
|
#ifdef MAY_HAVE_PROGRAMABLE_GL
|
||||||
GLuint generic_index = 0;
|
GLuint generic_index = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
||||||
|
|
||||||
@ -1586,7 +1590,6 @@ disable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
|||||||
*/
|
*/
|
||||||
GE (glBindBuffer (GL_ARRAY_BUFFER, 0));
|
GE (glBindBuffer (GL_ARRAY_BUFFER, 0));
|
||||||
|
|
||||||
generic_index = 0;
|
|
||||||
for (tmp = buffer->submitted_vbos; tmp != NULL; tmp = tmp->next)
|
for (tmp = buffer->submitted_vbos; tmp != NULL; tmp = tmp->next)
|
||||||
{
|
{
|
||||||
CoglVertexBufferVBO *cogl_vbo = tmp->data;
|
CoglVertexBufferVBO *cogl_vbo = tmp->data;
|
||||||
|
Loading…
Reference in New Issue
Block a user