Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa xkeyboard-config xserver git update 15 jan 2014
  randrproto libfontenc mesa xserver git update 10 Jan 2014
  randsrproto fontconfig libX11 git update 6 Jan 2014

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp
	mesalib/src/glsl/ir_builder.h
	xorg-server/Xext/xres.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/include/gc.h
	xorg-server/os/access.c

1 files changed, 4 insertions, 4 deletions

diff --git a/mesalib/src/glsl/link_uniform_initializers.cpp b/mesalib/src/glsl/link_uniform_initializers.cpp
index 04daa1760..7d5c1472d 100644
--- a/mesalib/src/glsl/link_uniform_initializers.cpp
+++ b/mesalib/src/glsl/link_uniform_initializers.cpp
@@ -106,7 +106,7 @@ set_uniform_binding(void *mem_ctx, gl_shader_program *prog,
          storage->storage[i].i = binding + i;
       }
 
-      for (int sh = 0; sh < MESA_SHADER_TYPES; sh++) {
+      for (int sh = 0; sh < MESA_SHADER_STAGES; sh++) {
          gl_shader *shader = prog->_LinkedShaders[sh];
 
          if (shader && storage->sampler[sh].active) {
@@ -119,7 +119,7 @@ set_uniform_binding(void *mem_ctx, gl_shader_program *prog,
       }
    } else if (storage->block_index != -1) {
       /* This is a field of a UBO.  val is the binding index. */
-      for (int i = 0; i < MESA_SHADER_TYPES; i++) {
+      for (int i = 0; i < MESA_SHADER_STAGES; i++) {
          int stage_index = prog->UniformBlockStageIndex[i][storage->block_index];
 
          if (stage_index != -1) {
@@ -194,7 +194,7 @@ set_uniform_initializer(void *mem_ctx, gl_shader_program *prog,
 			       val->type->components());
 
       if (storage->type->is_sampler()) {
-         for (int sh = 0; sh < MESA_SHADER_TYPES; sh++) {
+         for (int sh = 0; sh < MESA_SHADER_STAGES; sh++) {
             gl_shader *shader = prog->_LinkedShaders[sh];
 
             if (shader && storage->sampler[sh].active) {
@@ -215,7 +215,7 @@ link_set_uniform_initializers(struct gl_shader_program *prog)
 {
    void *mem_ctx = NULL;
 
-   for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) {
+   for (unsigned int i = 0; i < MESA_SHADER_STAGES; i++) {
       struct gl_shader *shader = prog->_LinkedShaders[i];
 
       if (shader == NULL)