brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cogl-vertex-buffer] Some fixes for texturing and color arrays

Browse Source 
Fixes some blending issues when using color arrays since we were
conflicting with the cogl_enable state + fixes a texture layer
validation bug.

Adds a basic textured triangle to test-vertex-buffer-contiguous.
This commit is contained in:
Robert Bragg 2009-02-06 16:10:28 +00:00
parent 9059367dcc
commit c3b8dcd2f0
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/cogl-vertex-buffer.c
View File

@ -30,7 +30,7 @@
/* /*
* TODO: We need to do a better job of minimizing when we call glVertexPointer * TODO: We need to do a better job of minimizing when we call glVertexPointer
* and pals in enable_state_for_drawing_attributes_buffer * and pals in enable_state_for_drawing_buffer
* *
* We should have an internal 2-tuple cache of (VBO, offset) for each of them * We should have an internal 2-tuple cache of (VBO, offset) for each of them
* so we can avoid some GL calls. We could have cogl wrappers for the * so we can avoid some GL calls. We could have cogl wrappers for the
@ -394,7 +394,7 @@ get_gl_type_size (CoglVertexBufferAttribFlags flags)
return sizeof (GLdouble); return sizeof (GLdouble);
#endif #endif
default: default:
g_warning ("Mesh API: Unrecognised OpenGL type enum 0x%08x\n", gl_type); g_warning ("Vertex Buffer API: Unrecognised OpenGL type enum 0x%08x\n", gl_type);
return 0; return 0;
} }
} }
@ -1408,7 +1408,7 @@ get_gl_type_from_attribute_flags (CoglVertexBufferAttribFlags flags)
} }
static void static void
enable_state_for_drawing_attributes_buffer (CoglVertexBuffer *buffer) enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
{ {
GList *tmp; GList *tmp;
GLenum gl_type; GLenum gl_type;
@ -1442,8 +1442,8 @@ enable_state_for_drawing_attributes_buffer (CoglVertexBuffer *buffer)
switch (type) switch (type)
{ {
case COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY: case COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY:
/* FIXME: go through cogl cache to enable color array */ enable_flags |= COGL_ENABLE_COLOR_ARRAY | COGL_ENABLE_BLEND;
GE (glEnableClientState (GL_COLOR_ARRAY)); /* GE (glEnableClientState (GL_COLOR_ARRAY)); */
GE (glColorPointer (attribute->n_components, GE (glColorPointer (attribute->n_components,
gl_type, gl_type,
attribute->stride, attribute->stride,
@ -1532,8 +1532,6 @@ enable_state_for_drawing_attributes_buffer (CoglVertexBuffer *buffer)
*/ */
fallback_mask |= (1 << i); fallback_mask |= (1 << i);
} }
else if (!(disable_mask & (1 << i)))
fallback_mask |= (1 << i);
} }
cogl_material_flush_gl_state (ctx->source_material, cogl_material_flush_gl_state (ctx->source_material,
@ -1581,8 +1579,7 @@ disable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
switch (type) switch (type)
{ {
case COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY: case COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY:
/* FIXME: go through cogl cache to enable color array */ /* GE (glDisableClientState (GL_COLOR_ARRAY)); */
GE (glDisableClientState (GL_COLOR_ARRAY));
break; break;
case COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY: case COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY:
/* FIXME: go through cogl cache to enable normal array */ /* FIXME: go through cogl cache to enable normal array */
@ -1622,7 +1619,7 @@ cogl_vertex_buffer_draw (CoglHandle handle,
buffer = _cogl_vertex_buffer_pointer_from_handle (handle); buffer = _cogl_vertex_buffer_pointer_from_handle (handle);
enable_state_for_drawing_attributes_buffer (buffer); enable_state_for_drawing_buffer (buffer);
/* FIXME: flush cogl cache */ /* FIXME: flush cogl cache */
GE (glDrawArrays (mode, first, count)); GE (glDrawArrays (mode, first, count));
@ -1648,7 +1645,7 @@ cogl_vertex_buffer_draw_elements (CoglHandle handle,
buffer = _cogl_vertex_buffer_pointer_from_handle (handle); buffer = _cogl_vertex_buffer_pointer_from_handle (handle);
enable_state_for_drawing_attributes_buffer (buffer); enable_state_for_drawing_buffer (buffer);
/* FIXME: flush cogl cache */ /* FIXME: flush cogl cache */
GE (glDrawRangeElements (mode, min_index, max_index, GE (glDrawRangeElements (mode, min_index, max_index,