From bbf912b61d298ca3b1a3aff399c79c9ad493cb6a Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 24 Nov 2010 17:42:34 +0000 Subject: [PATCH] Lower the priority of the GLSL pipeline backend Now that the GLSL backend can generate code it can effectively handle any pipeline unless there is an ARBfp program. However with current open source GL drivers the ARBfp compiler is more stable so it makes sense to prefer ARBfp when possible. The GLSL backend is also lower than the fixed function backend on the assumption that any driver that supports GLSL will also support ARBfp so it's quicker to try the fixed function backend next. --- cogl/cogl-pipeline-private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h index e05ace0d2..b4452b368 100644 --- a/cogl/cogl-pipeline-private.h +++ b/cogl/cogl-pipeline-private.h @@ -43,12 +43,12 @@ typedef struct _CoglPipelineLayer CoglPipelineLayer; #if defined (HAVE_COGL_GL) /* NB: pipeline->backend is currently a 3bit unsigned int bitfield */ -#define COGL_PIPELINE_BACKEND_GLSL 0 -#define COGL_PIPELINE_BACKEND_GLSL_MASK (1L<<0) -#define COGL_PIPELINE_BACKEND_ARBFP 1 -#define COGL_PIPELINE_BACKEND_ARBFP_MASK (1L<<1) -#define COGL_PIPELINE_BACKEND_FIXED 2 -#define COGL_PIPELINE_BACKEND_FIXED_MASK (1L<<2) +#define COGL_PIPELINE_BACKEND_ARBFP 0 +#define COGL_PIPELINE_BACKEND_ARBFP_MASK (1L<<0) +#define COGL_PIPELINE_BACKEND_FIXED 1 +#define COGL_PIPELINE_BACKEND_FIXED_MASK (1L<<1) +#define COGL_PIPELINE_BACKEND_GLSL 2 +#define COGL_PIPELINE_BACKEND_GLSL_MASK (1L<<2) #define COGL_PIPELINE_N_BACKENDS 3