Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/configure.ac
	mesalib/configs/linux-dri
	mesalib/docs/download.html
	mesalib/src/SConscript
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/bufferobj.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/renderbuffer.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/dix/window.c
	xorg-server/xkb/xkb.c
	xorg-server/xkb/xkmread.c

1 files changed, 3 insertions, 3 deletions

diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 4594356ce..b96f026dd 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -972,13 +972,13 @@ static void GLAPIENTRY
 vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,

                            GLsizei count, GLenum type, const GLvoid *indices)

 {

-   GET_CURRENT_CONTEXT(ctx);

-

-   if (MESA_VERBOSE & VERBOSE_DRAW)

+   if (MESA_VERBOSE & VERBOSE_DRAW) {

+      GET_CURRENT_CONTEXT(ctx);

       _mesa_debug(ctx,

                   "glDrawRangeElements(%s, %u, %u, %d, %s, %p)\n",

                   _mesa_lookup_enum_by_nr(mode), start, end, count,

                   _mesa_lookup_enum_by_nr(type), indices);

+   }

 

    vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,

 					indices, 0);