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

blend-strings: removes the AUTO_COMPOSITE function enum

Browse Source 
This was mistakenly added some time ago because at some point when we
were discussing how to handle premultiplied alpha in Clutter/Cogl we
were considering having a magic "just do the right thing" option which
was later abandoned.
This commit is contained in:
Robert Bragg 2010-06-10 14:39:20 +01:00
parent 249ad97c8f
commit a1035389c0
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/cogl/cogl/cogl-blend-string.c
View File

@ -103,7 +103,6 @@ static CoglBlendStringColorSourceInfo tex_combine_texture_n_color_source = {
/* NB: These must be sorted so any name that's a subset of another /* NB: These must be sorted so any name that's a subset of another
* comes later than the longer name. */ * comes later than the longer name. */
static CoglBlendStringFunctionInfo tex_combine_functions[] = { static CoglBlendStringFunctionInfo tex_combine_functions[] = {
DEFINE_FUNCTION (AUTO_COMPOSITE, 14, 0),
DEFINE_FUNCTION (REPLACE, 7, 1), DEFINE_FUNCTION (REPLACE, 7, 1),
DEFINE_FUNCTION (MODULATE, 8, 2), DEFINE_FUNCTION (MODULATE, 8, 2),
DEFINE_FUNCTION (ADD_SIGNED, 10, 2), DEFINE_FUNCTION (ADD_SIGNED, 10, 2),
@ -115,7 +114,6 @@ static CoglBlendStringFunctionInfo tex_combine_functions[] = {
}; };
static CoglBlendStringFunctionInfo blend_functions[] = { static CoglBlendStringFunctionInfo blend_functions[] = {
DEFINE_FUNCTION (AUTO_COMPOSITE, 14, 0),
DEFINE_FUNCTION (ADD, 3, 2) DEFINE_FUNCTION (ADD, 3, 2)
}; };

1
clutter/cogl/cogl/cogl-blend-string.h
View File

@ -94,7 +94,6 @@ typedef struct _CoglBlendStringArgument
typedef enum _CoglBlendStringFunctionType typedef enum _CoglBlendStringFunctionType
{ {
/* shared */ /* shared */
COGL_BLEND_STRING_FUNCTION_AUTO_COMPOSITE,
COGL_BLEND_STRING_FUNCTION_ADD, COGL_BLEND_STRING_FUNCTION_ADD,
/* texture combine only */ /* texture combine only */

3
clutter/cogl/cogl/cogl-material.c
View File

@ -1222,9 +1222,6 @@ setup_texture_combine_state (CoglBlendStringStatement *statement,
switch (statement->function->type) switch (statement->function->type)
{ {
case COGL_BLEND_STRING_FUNCTION_AUTO_COMPOSITE:
*texture_combine_func = GL_MODULATE; /* FIXME */
break;
case COGL_BLEND_STRING_FUNCTION_REPLACE: case COGL_BLEND_STRING_FUNCTION_REPLACE:
*texture_combine_func = GL_REPLACE; *texture_combine_func = GL_REPLACE;
break; break;