From 577d65c2c964aba9046aa07ef76aaf1a99c32b70 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Wed, 24 Nov 2010 17:33:07 +0000
Subject: [PATCH] Don't use the fixed function backend if there is a user
 program

The fixed function pipeline backend can't handle a user program so it
should bail out if one is given.
---
 clutter/cogl/cogl/cogl-pipeline-fixed.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/clutter/cogl/cogl/cogl-pipeline-fixed.c b/clutter/cogl/cogl/cogl-pipeline-fixed.c
index f925b1d26..38931103e 100644
--- a/clutter/cogl/cogl/cogl-pipeline-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-fixed.c
@@ -72,6 +72,12 @@ _cogl_pipeline_backend_fixed_start (CoglPipeline *pipeline,
                                     unsigned long pipelines_difference,
                                     int n_tex_coord_attribs)
 {
+  CoglHandle user_program;
+
+  user_program = cogl_pipeline_get_user_program (pipeline);
+  if (user_program != COGL_INVALID_HANDLE)
+    return FALSE;
+
   _cogl_use_program (0, COGL_PIPELINE_PROGRAM_TYPE_FIXED);
   return TRUE;
 }