Neil Roberts a131b697d9 Add the layer's sampler and uniform declarations at the start ... Previously the sampler uniform declarations such as cogl_sampler0 were generated by walking the list of layers in the shader state. This had two problems. Firstly it would only generate the declarations for layers that have been referenced. If a layer has a combine mode of replace then the samplers from previous layers couldn't be used by custom snippets. Secondly it meant that the samplers couldn't be referenced by functions in the declarations sections because the samplers are declared too late. This patch fixes it to generate the layer declarations in the backend start function using all of the layers on the pipeline instead. In addition it adds the sampler declarations to the vertex shader as they were previously missing. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 1824df902bbb9995cae6ffb7a413913f2df35eef) Conflicts: cogl/driver/gl/cogl-pipeline-fragend-glsl.c cogl/driver/gl/cogl-pipeline-vertend-glsl.c		2013-02-27 15:53:43 +00:00
..
gl	Don't set GL_TEXTURE_MAX_LEVEL on GLES	2013-01-25 18:21:09 +00:00
gles	Don't set GL_TEXTURE_MAX_LEVEL on GLES	2013-01-25 18:21:09 +00:00
cogl-attribute-gl-private.h	buffer: splits out GL specific code	2013-01-22 17:47:59 +00:00
cogl-attribute-gl.c	Remove cogl-internal.h	2013-01-22 17:48:17 +00:00
cogl-buffer-gl-private.h	Allow propogation of OOM errors to apps	2013-01-22 17:48:07 +00:00
cogl-buffer-gl.c	buffer: Don't set the invalidate hint when requesting read access	2013-02-19 15:03:30 +00:00
cogl-clip-stack-gl-private.h	clip-stack: Splits out opengl specific code	2013-01-22 17:47:59 +00:00
cogl-clip-stack-gl.c	Remove cogl-internal.h	2013-01-22 17:48:17 +00:00
cogl-framebuffer-gl-private.h	framebuffer: Bind the framebuffer before querying the bits	2013-01-22 17:48:18 +00:00
cogl-framebuffer-gl.c	win32: Minor build fixes for building for win32	2013-02-21 15:20:55 +00:00
cogl-pipeline-fragend-fixed-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-fragend-fixed.c	Remove cogl-internal.h	2013-01-22 17:48:17 +00:00
cogl-pipeline-fragend-glsl-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-fragend-glsl.c	Add the layer's sampler and uniform declarations at the start	2013-02-27 15:53:43 +00:00
cogl-pipeline-opengl-private.h	Remove the varying array for tex_coords	2013-01-22 17:48:06 +00:00
cogl-pipeline-opengl.c	Fix a clear of an array allocated with alloca which had the wrong size	2013-02-08 12:20:32 +00:00
cogl-pipeline-progend-fixed-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-progend-fixed.c	Add a GL 3 driver	2013-01-22 17:48:01 +00:00
cogl-pipeline-progend-glsl-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-progend-glsl.c	Remove cogl-internal.h	2013-01-22 17:48:17 +00:00
cogl-pipeline-vertend-fixed-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-vertend-fixed.c	Remove cogl-internal.h	2013-01-22 17:48:17 +00:00
cogl-pipeline-vertend-glsl-private.h	Re-organize the source layout	2013-01-22 17:47:19 +00:00
cogl-pipeline-vertend-glsl.c	Add the layer's sampler and uniform declarations at the start	2013-02-27 15:53:43 +00:00
cogl-texture-2d-gl-private.h	Allow lazy texture storage allocation	2013-01-22 17:48:17 +00:00
cogl-texture-2d-gl.c	Replace some #if HAVE_COGL_GL lines with #ifdef	2013-01-25 18:21:09 +00:00
cogl-texture-gl-private.h	Move _cogl_texture_get_gl_format to -texture-gl.c	2013-01-22 17:48:17 +00:00
cogl-texture-gl.c	Don't set GL_TEXTURE_MAX_LEVEL on GLES	2013-01-25 18:21:09 +00:00
cogl-util-gl-private.h	Add the layer's sampler and uniform declarations at the start	2013-02-27 15:53:43 +00:00
cogl-util-gl.c	Add the layer's sampler and uniform declarations at the start	2013-02-27 15:53:43 +00:00