Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/include/GL/internal/dri_interface.h
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_draw.c
	mesalib/src/mesa/state_tracker/st_program.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/Makefile.am
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/cz
	xorg-server/xkeyboard-config/symbols/in

2 files changed, 6 insertions, 5 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index bf4fef57a..40cb40e5c 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -42,6 +42,7 @@
 

 #include "main/imports.h"

 #include "main/image.h"

+#include "main/bufferobj.h"

 #include "main/macros.h"

 #include "main/mfeatures.h"

 #include "program/prog_uniform.h"

@@ -336,7 +337,7 @@ setup_interleaved_attribs(struct gl_context *ctx,
       assert(element_size == array->Size * _mesa_sizeof_type(array->Type));

 

       if (attr == 0) {

-         if (bufobj && bufobj->Name) {

+         if (bufobj && _mesa_is_bufferobj(bufobj)) {

             vbuffer->buffer = NULL;

             pipe_resource_reference(&vbuffer->buffer, stobj->buffer);

             vbuffer->buffer_offset = pointer_to_offset(low_addr);

@@ -402,7 +403,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
 

       assert(element_size == array->Size * _mesa_sizeof_type(array->Type));

 

-      if (bufobj && bufobj->Name) {

+      if (bufobj && _mesa_is_bufferobj(bufobj)) {

          /* Attribute data is in a VBO.

           * Recall that for VBOs, the gl_client_array->Ptr field is

           * really an offset from the start of the VBO, not a pointer.

@@ -493,7 +494,7 @@ setup_index_buffer(struct gl_context *ctx,
       }

 

       /* get/create the index buffer object */

-      if (bufobj && bufobj->Name) {

+      if (bufobj && _mesa_is_bufferobj(bufobj)) {

          /* elements/indexes are in a real VBO */

          struct st_buffer_object *stobj = st_buffer_object(bufobj);

          pipe_resource_reference(&ibuffer->buffer, stobj->buffer);

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index 1efc58799..2a67c7bd8 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -1087,8 +1087,8 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
       }

       break;

    default:

-      _mesa_problem(NULL, "Unexpected program target in "

-                    "destroy_program_variants_cb()");

+      _mesa_problem(NULL, "Unexpected program target 0x%x in "

+                    "destroy_program_variants_cb()", program->Target);

    }

 }