[Cogl] [PATCH 1/2] squash: Always define update_uniforms

[Robert Bragg]

this looks good to land to me:

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Mon, Oct 1, 2012 at 3:32 PM, Neil Roberts <neil at linux.intel.com> wrote:
> This should be squashed into the patch to fix handling of the builtin
> uniforms on non-GLES2. Sorry about that.
> ---
>  cogl/driver/gl/cogl-pipeline-progend-glsl.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/driver/gl/cogl-pipeline-progend-glsl.c
> index 26504eb..245ed7f 100644
> --- a/cogl/driver/gl/cogl-pipeline-progend-glsl.c
> +++ b/cogl/driver/gl/cogl-pipeline-progend-glsl.c
> @@ -968,8 +968,6 @@ _cogl_pipeline_progend_glsl_pre_paint (CoglPipeline *pipeline,
>      }
>  }
>
> -#ifdef HAVE_COGL_GLES2
> -
>  static void
>  update_float_uniform (CoglPipeline *pipeline,
>                        int uniform_location,
> @@ -984,8 +982,6 @@ update_float_uniform (CoglPipeline *pipeline,
>    GE( ctx, glUniform1f (uniform_location, value) );
>  }
>
> -#endif
> -
>  const CoglPipelineProgend _cogl_pipeline_glsl_progend =
>    {
>      COGL_PIPELINE_VERTEND_GLSL,
> --
> 1.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl