mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 08:00:42 -05:00
cogl-vertex-buffer: Don't disable layers with no texture coords
It should be quite acceptable to use a texture without defining any texture coords. For example a shader may be in use that is doing texture lookups without referencing the texture coordinates. Also it should be possible to replace the vertex colors using a texture layer without a texture but with a constant layer color. enable_state_for_drawing_buffer no longer sets any disabled layers in the overrides. Instead of counting the number of units with texture coordinates it now keeps them in a mask. This means there can now be gaps in the list of enabled texture coordinate arrays. To cope with this, the Cogl context now also stores a mask to track the enabled arrays. Instead of code manually iterating each enabled array to disable them, there is now an internal function called _cogl_disable_texcoord_arrays which disables a given mask. I think this could also fix potential bugs when a vertex buffer has gaps in the texture coordinate attributes that it provides. For example if the vertex buffer only had texture coordinates for layer 2 then the disabling code would not disable the coordinates for layers 0 and 1 even though they are not used. This could cause a crash if the previous data for those arrays is no longer valid. http://bugzilla.openedhand.com/show_bug.cgi?id=2132
This commit is contained in:
parent
99c7e51145
commit
992d5f7fb6
@ -97,7 +97,7 @@ cogl_create_context (void)
|
||||
0, sizeof (CoglMaterialFlushOptions));
|
||||
_context->current_layers = g_array_new (FALSE, FALSE,
|
||||
sizeof (CoglLayerInfo));
|
||||
_context->n_texcoord_arrays_enabled = 0;
|
||||
_context->texcoord_arrays_enabled = 0;
|
||||
|
||||
_context->framebuffer_stack = _cogl_create_framebuffer_stack ();
|
||||
|
||||
|
@ -86,7 +86,8 @@ typedef struct
|
||||
unsigned long current_material_flags;
|
||||
CoglMaterialFlushOptions current_material_flush_options;
|
||||
GArray *current_layers;
|
||||
unsigned int n_texcoord_arrays_enabled;
|
||||
/* Bitmask of texture coordinates arrays that are enabled */
|
||||
unsigned int texcoord_arrays_enabled;
|
||||
|
||||
/* PBOs */
|
||||
/* This can be used to check if a pbo is bound */
|
||||
|
@ -132,6 +132,9 @@ _cogl_get_max_texture_image_units (void);
|
||||
void
|
||||
_cogl_flush_face_winding (void);
|
||||
|
||||
void
|
||||
_cogl_disable_texcoord_arrays (unsigned int mask);
|
||||
|
||||
#ifdef COGL_HAS_XLIB_SUPPORT
|
||||
|
||||
/*
|
||||
|
@ -372,8 +372,8 @@ _cogl_journal_flush_texcoord_vbo_offsets_and_entries (
|
||||
void *data)
|
||||
{
|
||||
CoglJournalFlushState *state = data;
|
||||
int prev_n_texcoord_arrays_enabled;
|
||||
int i;
|
||||
unsigned int layers_mask;
|
||||
|
||||
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
||||
|
||||
@ -395,14 +395,10 @@ _cogl_journal_flush_texcoord_vbo_offsets_and_entries (
|
||||
(POS_STRIDE + COLOR_STRIDE) * 4 +
|
||||
TEX_STRIDE * 4 * i)));
|
||||
}
|
||||
prev_n_texcoord_arrays_enabled =
|
||||
ctx->n_texcoord_arrays_enabled;
|
||||
ctx->n_texcoord_arrays_enabled = batch_start->n_layers;
|
||||
for (; i < prev_n_texcoord_arrays_enabled; i++)
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
|
||||
layers_mask = ~((~(unsigned int) 0) << batch_start->n_layers);
|
||||
ctx->texcoord_arrays_enabled |= layers_mask;
|
||||
_cogl_disable_texcoord_arrays (ctx->texcoord_arrays_enabled & ~layers_mask);
|
||||
|
||||
batch_and_call (batch_start,
|
||||
batch_len,
|
||||
|
@ -190,7 +190,6 @@ _cogl_add_path_to_stencil_buffer (CoglHandle path_handle,
|
||||
float bounds_h;
|
||||
unsigned long enable_flags = COGL_ENABLE_VERTEX_ARRAY;
|
||||
CoglHandle prev_source;
|
||||
int i;
|
||||
CoglHandle framebuffer = _cogl_get_framebuffer ();
|
||||
CoglMatrixStack *modelview_stack =
|
||||
_cogl_framebuffer_get_modelview_stack (framebuffer);
|
||||
@ -263,12 +262,8 @@ _cogl_add_path_to_stencil_buffer (CoglHandle path_handle,
|
||||
|
||||
GE (glStencilOp (GL_INVERT, GL_INVERT, GL_INVERT));
|
||||
|
||||
for (i = 0; i < ctx->n_texcoord_arrays_enabled; i++)
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
ctx->n_texcoord_arrays_enabled = 0;
|
||||
/* Disable all client texture coordinate arrays */
|
||||
_cogl_disable_texcoord_arrays (ctx->texcoord_arrays_enabled);
|
||||
|
||||
while (path_start < path->data->path_nodes->len)
|
||||
{
|
||||
|
@ -1012,7 +1012,7 @@ cogl_polygon (const CoglTextureVertex *vertices,
|
||||
unsigned int stride;
|
||||
gsize stride_bytes;
|
||||
GLfloat *v;
|
||||
int prev_n_texcoord_arrays_enabled;
|
||||
unsigned int layers_mask;
|
||||
CoglMaterialWrapModeOverrides wrap_mode_overrides;
|
||||
CoglMaterialWrapModeOverrides *wrap_mode_overrides_p = NULL;
|
||||
|
||||
@ -1165,14 +1165,9 @@ cogl_polygon (const CoglTextureVertex *vertices,
|
||||
v + 3 + 2 * i));
|
||||
}
|
||||
|
||||
prev_n_texcoord_arrays_enabled = ctx->n_texcoord_arrays_enabled;
|
||||
ctx->n_texcoord_arrays_enabled = n_layers;
|
||||
|
||||
for (; i < prev_n_texcoord_arrays_enabled; i++)
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
layers_mask = ~((~(unsigned int) 0) << n_layers);
|
||||
ctx->texcoord_arrays_enabled |= layers_mask;
|
||||
_cogl_disable_texcoord_arrays (ctx->texcoord_arrays_enabled & ~layers_mask);
|
||||
|
||||
if (use_sliced_polygon_fallback)
|
||||
_cogl_texture_polygon_multiple_primitives (vertices,
|
||||
|
@ -1518,10 +1518,9 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
GLuint generic_index = 0;
|
||||
#endif
|
||||
unsigned long enable_flags = 0;
|
||||
int max_texcoord_attrib_unit = -1;
|
||||
unsigned int texcoord_arrays_used = 0;
|
||||
const GList *layers;
|
||||
guint32 fallback_layers = 0;
|
||||
guint32 disable_layers = ~0;
|
||||
int i;
|
||||
CoglMaterialFlushOptions options;
|
||||
|
||||
@ -1531,8 +1530,7 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
cogl_vertex_buffer_submit_real (buffer);
|
||||
|
||||
options.flags =
|
||||
COGL_MATERIAL_FLUSH_FALLBACK_MASK |
|
||||
COGL_MATERIAL_FLUSH_DISABLE_MASK;
|
||||
COGL_MATERIAL_FLUSH_FALLBACK_MASK;
|
||||
memset (&options.wrap_mode_overrides, 0,
|
||||
sizeof (options.wrap_mode_overrides));
|
||||
|
||||
@ -1598,9 +1596,7 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
gl_type,
|
||||
attribute->stride,
|
||||
pointer));
|
||||
if (attribute->texture_unit > max_texcoord_attrib_unit)
|
||||
max_texcoord_attrib_unit = attribute->texture_unit;
|
||||
disable_layers &= ~(1 << attribute->texture_unit);
|
||||
texcoord_arrays_used |= (1 << attribute->texture_unit);
|
||||
break;
|
||||
case COGL_VERTEX_BUFFER_ATTRIB_FLAG_VERTEX_ARRAY:
|
||||
enable_flags |= COGL_ENABLE_VERTEX_ARRAY;
|
||||
@ -1638,7 +1634,7 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
|
||||
layers = cogl_material_get_layers (ctx->source_material);
|
||||
for (tmp = (GList *)layers, i = 0;
|
||||
tmp != NULL && i <= max_texcoord_attrib_unit;
|
||||
tmp != NULL;
|
||||
tmp = tmp->next, i++)
|
||||
{
|
||||
CoglHandle layer = (CoglHandle)tmp->data;
|
||||
@ -1702,12 +1698,8 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
}
|
||||
}
|
||||
|
||||
for (i = max_texcoord_attrib_unit + 1; i < ctx->n_texcoord_arrays_enabled; i++)
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
ctx->n_texcoord_arrays_enabled = max_texcoord_attrib_unit + 1;
|
||||
_cogl_disable_texcoord_arrays (ctx->texcoord_arrays_enabled &
|
||||
~texcoord_arrays_used);
|
||||
|
||||
/* NB: _cogl_framebuffer_flush_state may disrupt various state (such
|
||||
* as the material state) when flushing the clip stack, so should
|
||||
@ -1715,7 +1707,6 @@ enable_state_for_drawing_buffer (CoglVertexBuffer *buffer)
|
||||
_cogl_framebuffer_flush_state (_cogl_get_framebuffer (), 0);
|
||||
|
||||
options.fallback_layers = fallback_layers;
|
||||
options.disable_layers = disable_layers;
|
||||
|
||||
_cogl_material_flush_gl_state (ctx->source_material, &options);
|
||||
enable_flags |= _cogl_material_get_cogl_enable_flags (ctx->source_material);
|
||||
|
33
cogl/cogl.c
33
cogl/cogl.c
@ -763,12 +763,36 @@ cogl_read_pixels (int x,
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
_cogl_disable_texcoord_arrays (unsigned int mask)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
||||
|
||||
/* Update the mask of arrays that are enabled */
|
||||
ctx->texcoord_arrays_enabled &= ~mask;
|
||||
|
||||
/* Disable all of the texture coord arrays that have a 1 in the bit
|
||||
position in mask */
|
||||
while (mask)
|
||||
{
|
||||
if ((mask & 1))
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
|
||||
i++;
|
||||
mask >>= 1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
cogl_begin_gl (void)
|
||||
{
|
||||
CoglMaterialFlushOptions options;
|
||||
unsigned long enable_flags = 0;
|
||||
int i;
|
||||
|
||||
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
||||
|
||||
@ -816,12 +840,7 @@ cogl_begin_gl (void)
|
||||
_cogl_flush_face_winding ();
|
||||
|
||||
/* Disable all client texture coordinate arrays */
|
||||
for (i = 0; i < ctx->n_texcoord_arrays_enabled; i++)
|
||||
{
|
||||
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
||||
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
||||
}
|
||||
ctx->n_texcoord_arrays_enabled = 0;
|
||||
_cogl_disable_texcoord_arrays (ctx->texcoord_arrays_enabled);
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user