Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/GL3.txt
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/main/depthstencil.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/formats.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/readpix.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/samplerobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/texenv.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_cb_clear.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 2 insertions, 2 deletions

diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index cbc51ce19..94671ea25 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1032,7 +1032,7 @@ validate_samplers(const struct gl_program *prog, char *errMsg)
       "TEXTURE_2D",

       "TEXTURE_1D",

    };

-   GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS];

+   GLint targetUsed[MAX_COMBINED_TEXTURE_IMAGE_UNITS];

    GLbitfield samplersUsed = prog->SamplersUsed;

    GLuint i;

 

@@ -1050,7 +1050,7 @@ validate_samplers(const struct gl_program *prog, char *errMsg)
       gl_texture_index target;

       GLint sampler = _mesa_ffs(samplersUsed) - 1;

       assert(sampler >= 0);

-      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);

+      assert(sampler < Elements(prog->SamplerUnits));

       unit = prog->SamplerUnits[sampler];

       target = prog->SamplerTargets[sampler];

       if (targetUsed[unit] != -1 && targetUsed[unit] != (int) target) {