isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 14:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable the fixed function backend for GLES2

Browse Source 
GLES2 doesn't really support fixed function so if we disable it we can
remove the fixed function wrappers from the GLES2 Cogl backend.
This commit is contained in:
Neil Roberts 2010-11-23 14:51:49 +00:00
parent 3504491b46
commit 987e3c32dc
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/cogl/cogl/cogl-pipeline-fixed.c
View File

@ -47,10 +47,6 @@
#include <glib/gprintf.h>
#include <string.h>
#ifdef HAVE_COGL_GLES2
#include "../gles/cogl-gles2-wrapper.h"
#endif
const CoglPipelineBackend _cogl_pipeline_fixed_backend;
static int
@ -235,13 +231,6 @@ _cogl_pipeline_backend_fixed_end (CoglPipeline *pipeline,
GE (glDisable (GL_FOG));
}
#ifdef HAVE_COGL_GLES2
/* Let the GLES2 backend know that we're not using a user shader
anymore. This is a massive hack but it will go away once the GLSL
backend replaces the GLES2 wrapper */
_cogl_gles2_use_program (0);
#endif
return TRUE;
}

4
clutter/cogl/cogl/cogl-pipeline-private.h
View File

@ -56,10 +56,8 @@ typedef struct _CoglPipelineLayer CoglPipelineLayer;
#define COGL_PIPELINE_BACKEND_GLSL 0
#define COGL_PIPELINE_BACKEND_GLSL_MASK (1L<<0)
#define COGL_PIPELINE_BACKEND_FIXED 1
#define COGL_PIPELINE_BACKEND_FIXED_MASK (1L<<1)
#define COGL_PIPELINE_N_BACKENDS 2
#define COGL_PIPELINE_N_BACKENDS 1
#else /* HAVE_COGL_GLES */

2
clutter/cogl/cogl/cogl-pipeline.c
View File

@ -1173,8 +1173,10 @@ _cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
* code in response to a pipeline change therefore we don't want to
* try searching for another backend when the pipeline changes.
*/
#ifdef COGL_PIPELINE_BACKEND_FIXED
if (pipeline->backend == COGL_PIPELINE_BACKEND_FIXED)
_cogl_pipeline_set_backend (pipeline, COGL_PIPELINE_BACKEND_UNDEFINED);
#endif
if (pipeline->backend != COGL_PIPELINE_BACKEND_UNDEFINED &&
_cogl_pipeline_backends[pipeline->backend]->pipeline_pre_change_notify)