From 26628553ed395437455ce1aaab15df7d6c4a7769 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Thu, 10 Jun 2010 14:39:20 +0100
Subject: [PATCH] blend-strings: removes the AUTO_COMPOSITE function enum

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.
---
 cogl/cogl-blend-string.c | 2 --
 cogl/cogl-blend-string.h | 1 -
 cogl/cogl-material.c     | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/cogl/cogl-blend-string.c b/cogl/cogl-blend-string.c
index 7cbebd6d5..1ca746574 100644
--- a/cogl/cogl-blend-string.c
+++ b/cogl/cogl-blend-string.c
@@ -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
  * comes later than the longer name. */
 static CoglBlendStringFunctionInfo tex_combine_functions[] = {
-  DEFINE_FUNCTION (AUTO_COMPOSITE, 14, 0),
   DEFINE_FUNCTION (REPLACE, 7, 1),
   DEFINE_FUNCTION (MODULATE, 8, 2),
   DEFINE_FUNCTION (ADD_SIGNED, 10, 2),
@@ -115,7 +114,6 @@ static CoglBlendStringFunctionInfo tex_combine_functions[] = {
 };
 
 static CoglBlendStringFunctionInfo blend_functions[] = {
-  DEFINE_FUNCTION (AUTO_COMPOSITE, 14, 0),
   DEFINE_FUNCTION (ADD, 3, 2)
 };
 
diff --git a/cogl/cogl-blend-string.h b/cogl/cogl-blend-string.h
index c067f0a4a..99fe4073e 100644
--- a/cogl/cogl-blend-string.h
+++ b/cogl/cogl-blend-string.h
@@ -94,7 +94,6 @@ typedef struct _CoglBlendStringArgument
 typedef enum _CoglBlendStringFunctionType
 {
   /* shared */
-  COGL_BLEND_STRING_FUNCTION_AUTO_COMPOSITE,
   COGL_BLEND_STRING_FUNCTION_ADD,
 
   /* texture combine only */
diff --git a/cogl/cogl-material.c b/cogl/cogl-material.c
index c4715ba9c..2a0449163 100644
--- a/cogl/cogl-material.c
+++ b/cogl/cogl-material.c
@@ -1222,9 +1222,6 @@ setup_texture_combine_state (CoglBlendStringStatement *statement,
 
   switch (statement->function->type)
     {
-    case COGL_BLEND_STRING_FUNCTION_AUTO_COMPOSITE:
-      *texture_combine_func = GL_MODULATE; /* FIXME */
-      break;
     case COGL_BLEND_STRING_FUNCTION_REPLACE:
       *texture_combine_func = GL_REPLACE;
       break;