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

cogl: Remove stray references to gl*Pointer, which we're never calling

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/995
This commit is contained in:
Adam Jackson 2019-12-18 16:54:58 -05:00 committed by Georges Basile Stavracas Neto
parent 737763112e
commit abd094d135
3 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cogl/cogl/cogl-attribute.c
View File

@ -168,35 +168,6 @@ validate_n_components (const CoglAttributeNameState *name_state,
{ {
switch (name_state->name_id) switch (name_state->name_id)
{ {
case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY:
if (G_UNLIKELY (n_components == 1))
{
g_critical ("glVertexPointer doesn't allow 1 component vertex "
"positions so we currently only support \"cogl_vertex\" "
"attributes where n_components == 2, 3 or 4");
return FALSE;
}
break;
case COGL_ATTRIBUTE_NAME_ID_COLOR_ARRAY:
if (G_UNLIKELY (n_components != 3 && n_components != 4))
{
g_critical ("glColorPointer expects 3 or 4 component colors so we "
"currently only support \"cogl_color\" attributes where "
"n_components == 3 or 4");
return FALSE;
}
break;
case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY:
break;
case COGL_ATTRIBUTE_NAME_ID_NORMAL_ARRAY:
if (G_UNLIKELY (n_components != 3))
{
g_critical ("glNormalPointer expects 3 component normals so we "
"currently only support \"cogl_normal\" attributes "
"where n_components == 3");
return FALSE;
}
break;
case COGL_ATTRIBUTE_NAME_ID_POINT_SIZE_ARRAY: case COGL_ATTRIBUTE_NAME_ID_POINT_SIZE_ARRAY:
if (G_UNLIKELY (n_components != 1)) if (G_UNLIKELY (n_components != 1))
{ {
@ -205,6 +176,10 @@ validate_n_components (const CoglAttributeNameState *name_state,
return FALSE; return FALSE;
} }
break; break;
case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY:
case COGL_ATTRIBUTE_NAME_ID_COLOR_ARRAY:
case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY:
case COGL_ATTRIBUTE_NAME_ID_NORMAL_ARRAY:
case COGL_ATTRIBUTE_NAME_ID_CUSTOM_ARRAY: case COGL_ATTRIBUTE_NAME_ID_CUSTOM_ARRAY:
return TRUE; return TRUE;
} }

4
cogl/cogl/cogl-journal.c
View File

@ -1453,9 +1453,7 @@ _cogl_journal_flush (CoglJournal *journal)
* is the number of pipeline layers. * is the number of pipeline layers.
* 3) We split the entries explicitly by the number of pipeline layers: * 3) We split the entries explicitly by the number of pipeline layers:
* We pad our vertex data when the number of layers is < 2 so that we * We pad our vertex data when the number of layers is < 2 so that we
* can minimize changes in stride. Each time the number of layers * can minimize changes in stride.
* changes we need to call glTexCoordPointer to inform GL of new VBO
* offsets.
* 4) We then split according to compatible Cogl pipelines: * 4) We then split according to compatible Cogl pipelines:
* This is where we flush pipeline state * This is where we flush pipeline state
* 5) Finally we split according to modelview matrix changes: * 5) Finally we split according to modelview matrix changes:

1
cogl/cogl/driver/gl/cogl-attribute-gl.c
View File

@ -305,7 +305,6 @@ _cogl_gl_flush_attributes_state (CoglFramebuffer *framebuffer,
* { * {
* age = cogl_pipeline_get_age (pipeline); * age = cogl_pipeline_get_age (pipeline);
* XXX: actually we also need to check for legacy_state * XXX: actually we also need to check for legacy_state
* and blending overrides for use of glColorPointer...
* if (overrides->ags != age || * if (overrides->ags != age ||
* memcmp (&overrides->options, &options, * memcmp (&overrides->options, &options,
* sizeof (options) != 0) * sizeof (options) != 0)