diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-11-30 12:48:27 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-12-13 17:22:57 +0000 |
| commit | 6b7139b0080b5b11e5562ebcc6442a5a0e8b850e (patch) | |
| tree | 4aaf8e476d4c0066d768b9d0a08ca07f3669e7d9 /cogl/cogl-pipeline-fragend-glsl.c | |
| parent | 0098dc7acccff51f2b50ac0ff4aba69be005a687 (diff) | |
| download | cogl-6b7139b0080b5b11e5562ebcc6442a5a0e8b850e.tar.gz | |
cogl-pipeline: Move texture enabling/disabling to fixed fragend
Previously enabling and disabling textures was done whatever the
backend in cogl-pipeline-opengl. However enabling and disabling
texture targets only has any meaning if no fragment shaders are being
used so this patch moves the code to cogl-pipeline-fragend-fixed.
The GLES2 wrapper has also been changed to ignore enabledness when
deciding whether to update texture coordinate attribute pointers.
Diffstat (limited to 'cogl/cogl-pipeline-fragend-glsl.c')
| -rw-r--r-- | cogl/cogl-pipeline-fragend-glsl.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cogl/cogl-pipeline-fragend-glsl.c b/cogl/cogl-pipeline-fragend-glsl.c index 48a47266..69a7df36 100644 --- a/cogl/cogl-pipeline-fragend-glsl.c +++ b/cogl/cogl-pipeline-fragend-glsl.c @@ -138,12 +138,6 @@ typedef struct _CoglPipelineFragendGlslPrivate const CoglPipelineFragend _cogl_pipeline_glsl_backend; -static int -_cogl_pipeline_fragend_glsl_get_max_texture_units (void) -{ - return _cogl_get_max_texture_image_units (); -} - static GlslProgramState * glsl_program_state_new (int n_layers) { @@ -1248,7 +1242,6 @@ _cogl_pipeline_fragend_glsl_free_priv (CoglPipeline *pipeline) const CoglPipelineFragend _cogl_pipeline_glsl_fragend = { - _cogl_pipeline_fragend_glsl_get_max_texture_units, _cogl_pipeline_fragend_glsl_start, _cogl_pipeline_fragend_glsl_add_layer, _cogl_pipeline_fragend_glsl_passthrough, |