xkbcomp mesa git update 14 Feb 2011

5 files changed, 230 insertions, 603 deletions

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index a30418990..9ff25a952 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -1,117 +1,117 @@
-

-Status of OpenGL 3.x features in Mesa

-

-

-Note: when an item is marked as "DONE" it means all the core Mesa

-infrastructure is complete but it may be the case that few (if any) drivers

-implement the features.

-

-

-Feature                                               Status

------------------------------------------------------ ------------------------

-

-GL 3.0:

-

-GLSL changes (GL_EXT_gpu_shader4, etc)                not started

-Conditional rendering (GL_NV_conditional_render)      DONE (swrast & softpipe)

-Map buffer subranges (GL_ARB_map_buffer_range)        DONE

-Clamping controls (GL_ARB_color_buffer_float)         BRANCH ~mareko/mesa floating2

-Float textures, renderbuffers (GL_ARB_texture_float)  BRANCH ~mareko/mesa floating2

-GL_EXT_packed_float                                   not started

-GL_EXT_texture_shared_exponent                        not started

-Float depth buffers (GL_ARB_depth_buffer_float)       not started

-Framebuffer objects (GL_EXT_framebuffer_object)       DONE

-Half-float                                            DONE

-Multisample blit                                      DONE

-Non-normalized Integer texture/framebuffer formats    ~50% done

-1D/2D Texture arrays                                  core Mesa, swrast done

-Packed depth/stencil formats                          DONE

-Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE

-GL_EXT_texture_compression_rgtc                       not started

-Red and red/green texture formats                     DONE (swrast, i965, gallium)

-Transform feedback (GL_EXT_transform_feedback)        ~50% done

-   glBindFragDataLocation, glGetFragDataLocation,

-   glBindBufferRange, glBindBufferBase commands

-Vertex array objects (GL_APPLE_vertex_array_object)   DONE

-sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     core GL done (i965, galliuum), GLX todo

-glClearBuffer commands                                DONE

-glGetStringi command                                  DONE

-glTexParameterI, glGetTexParameterI commands          DONE

-glVertexAttribI commands                              DONE (but converts int

-                                                            values to floats)

-

-

-GL 3.1:

-

-GLSL 1.30 and 1.40                                    not started

-Instanced drawing (GL_ARB_draw_instanced)             DONE (gallium, swrast)

-Buffer copying (GL_ARB_copy_buffer)                   DONE

-Primitive restart (GL_NV_primitive_restart)           DONE (gallium)

-16 vertex texture image units                         not started

-Texture buffer objs (GL_ARB_texture_buffer_object)    not started

-Rectangular textures (GL_ARB_texture_rectangle)       DONE

-Uniform buffer objs (GL_ARB_uniform_buffer_object)    not started

-Signed normalized textures (GL_EXT_texture_snorm)     ~50% done

-

-

-GL 3.2:

-

-Core/compatibility profiles                           not started

-GLSL 1.50                                             not started

-Geometry shaders (GL_ARB_geometry_shader4)            partially done (Zack)

-BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE

-Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE

-Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)

-Provoking vertex (GL_ARB_provoking_vertex)            DONE

-Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE, mostly?

-Multisample textures (GL_ARB_texture_multisample)     not started

-Frag depth clamp (GL_ARB_depth_clamp)                 DONE

-Fence objects (GL_ARB_sync)                           DONE

-

-

-GL 3.3:

-

-GLSL 3.30                                             not started

-GL_ARB_blend_func_extended                            not started

-GL_ARB_explicit_attrib_location                       DONE (swrast, i915, i965)

-GL_ARB_occlusion_query2                               DONE (swrast, gallium)

-GL_ARB_sampler_objects                                not started

-GL_ARB_texture_rgb10_a2ui                             not started

-GL_ARB_texture_swizzle                                DONE (same as EXT version)

-GL_ARB_timer_query                                    DONE (only Xlib sw driver)

-GL_ARB_instanced_arrays                               DONE (gallium)

-GL_ARB_vertex_type_2_10_10_10_rev                     not started

-

-

-GL 4.0:

-

-GLSL 4.0                                             not started

-GL_ARB_texture_query_lod                             not started

-GL_ARB_draw_buffers_blend                            DONE (gallium softpipe)

-GL_ARB_draw_indirect                                 not started

-GL_ARB_gpu_shader_fp64                               not started

-GL_ARB_sample_shading                                not started

-GL_ARB_shader_subroutine                             not started

-GL_ARB_tessellation_shader                           not started

-GL_ARB_texture_buffer_object_rgb32                   not started

-GL_ARB_texture_cube_map_array                        not started

-GL_ARB_texture_gather                                not started

-GL_ARB_transform_feedback2                           not started

-GL_ARB_transform_feedback3                           not started

-

-

-GL 4.1:

-

-GLSL 4.1                                             not started

-GL_ARB_ES2_compatibility                             not started

-GL_ARB_get_program_binary                            not started

-GL_ARB_separate_shader_objects                       some infrastructure done

-GL_ARB_shader_precision                              not started

-GL_ARB_vertex_attrib_64bit                           not started

-GL_ARB_viewport_array                                not started

-

-

-

-

-More info about these features and the work involved can be found at

-http://dri.freedesktop.org/wiki/MissingFunctionality

+
+Status of OpenGL 3.x features in Mesa
+
+
+Note: when an item is marked as "DONE" it means all the core Mesa
+infrastructure is complete but it may be the case that few (if any) drivers
+implement the features.
+
+
+Feature                                               Status
+----------------------------------------------------- ------------------------
+
+GL 3.0:
+
+GLSL changes (GL_EXT_gpu_shader4, etc)                not started
+Conditional rendering (GL_NV_conditional_render)      DONE (swrast & softpipe)
+Map buffer subranges (GL_ARB_map_buffer_range)        DONE
+Clamping controls (GL_ARB_color_buffer_float)         BRANCH ~mareko/mesa floating2
+Float textures, renderbuffers (GL_ARB_texture_float)  BRANCH ~mareko/mesa floating2
+GL_EXT_packed_float                                   not started
+GL_EXT_texture_shared_exponent                        not started
+Float depth buffers (GL_ARB_depth_buffer_float)       not started
+Framebuffer objects (GL_EXT_framebuffer_object)       DONE
+Half-float                                            DONE
+Multisample blit                                      DONE
+Non-normalized Integer texture/framebuffer formats    ~50% done
+1D/2D Texture arrays                                  core Mesa, swrast done
+Packed depth/stencil formats                          DONE
+Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE
+GL_EXT_texture_compression_rgtc                       not started
+Red and red/green texture formats                     DONE (swrast, i965, gallium)
+Transform feedback (GL_EXT_transform_feedback)        ~50% done
+   glBindFragDataLocation, glGetFragDataLocation,
+   glBindBufferRange, glBindBufferBase commands
+Vertex array objects (GL_APPLE_vertex_array_object)   DONE
+sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     core GL done (i965, gallium), GLX todo
+glClearBuffer commands                                DONE
+glGetStringi command                                  DONE
+glTexParameterI, glGetTexParameterI commands          DONE
+glVertexAttribI commands                              DONE (but converts int
+                                                            values to floats)
+
+
+GL 3.1:
+
+GLSL 1.30 and 1.40                                    not started
+Instanced drawing (GL_ARB_draw_instanced)             DONE (gallium, swrast)
+Buffer copying (GL_ARB_copy_buffer)                   DONE
+Primitive restart (GL_NV_primitive_restart)           DONE (gallium)
+16 vertex texture image units                         not started
+Texture buffer objs (GL_ARB_texture_buffer_object)    not started
+Rectangular textures (GL_ARB_texture_rectangle)       DONE
+Uniform buffer objs (GL_ARB_uniform_buffer_object)    not started
+Signed normalized textures (GL_EXT_texture_snorm)     ~50% done
+
+
+GL 3.2:
+
+Core/compatibility profiles                           not started
+GLSL 1.50                                             not started
+Geometry shaders (GL_ARB_geometry_shader4)            partially done (Zack)
+BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE
+Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE
+Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)
+Provoking vertex (GL_ARB_provoking_vertex)            DONE
+Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE, mostly?
+Multisample textures (GL_ARB_texture_multisample)     not started
+Frag depth clamp (GL_ARB_depth_clamp)                 DONE
+Fence objects (GL_ARB_sync)                           DONE
+
+
+GL 3.3:
+
+GLSL 3.30                                             not started
+GL_ARB_blend_func_extended                            not started
+GL_ARB_explicit_attrib_location                       DONE (swrast, i915, i965)
+GL_ARB_occlusion_query2                               DONE (swrast, gallium)
+GL_ARB_sampler_objects                                not started
+GL_ARB_texture_rgb10_a2ui                             not started
+GL_ARB_texture_swizzle                                DONE (same as EXT version)
+GL_ARB_timer_query                                    DONE (only Xlib sw driver)
+GL_ARB_instanced_arrays                               DONE (gallium)
+GL_ARB_vertex_type_2_10_10_10_rev                     not started
+
+
+GL 4.0:
+
+GLSL 4.0                                             not started
+GL_ARB_texture_query_lod                             not started
+GL_ARB_draw_buffers_blend                            DONE (gallium softpipe)
+GL_ARB_draw_indirect                                 not started
+GL_ARB_gpu_shader_fp64                               not started
+GL_ARB_sample_shading                                not started
+GL_ARB_shader_subroutine                             not started
+GL_ARB_tessellation_shader                           not started
+GL_ARB_texture_buffer_object_rgb32                   not started
+GL_ARB_texture_cube_map_array                        not started
+GL_ARB_texture_gather                                not started
+GL_ARB_transform_feedback2                           not started
+GL_ARB_transform_feedback3                           not started
+
+
+GL 4.1:
+
+GLSL 4.1                                             not started
+GL_ARB_ES2_compatibility                             not started
+GL_ARB_get_program_binary                            not started
+GL_ARB_separate_shader_objects                       some infrastructure done
+GL_ARB_shader_precision                              not started
+GL_ARB_vertex_attrib_64bit                           not started
+GL_ARB_viewport_array                                not started
+
+
+
+
+More info about these features and the work involved can be found at
+http://dri.freedesktop.org/wiki/MissingFunctionality
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.template b/mesalib/src/mesa/drivers/dri/Makefile.template
index 588210f8a..d1a119379 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.template
+++ b/mesalib/src/mesa/drivers/dri/Makefile.template
@@ -1,112 +1,111 @@
-# -*-makefile-*-

-

-COMMON_GALLIUM_SOURCES = \

-        ../common/utils.c \

-        ../common/vblank.c \

-        ../common/dri_util.c \

-        ../common/xmlconfig.c

-

-COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \

-        ../../common/driverfuncs.c \

-        ../common/texmem.c \

-        ../common/drirenderbuffer.c \

-	../common/dri_metaops.c

-

-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

-

-OBJECTS = $(C_SOURCES:.c=.o) \

-	  $(CXX_SOURCES:.cpp=.o) \

-	  $(ASM_SOURCES:.S=.o) 

-

-

-### Include directories

-SHARED_INCLUDES = \

-	-I. \

-	-I$(TOP)/src/mesa/drivers/dri/common \

-	-Iserver \

-	-I$(TOP)/include \

-	-I$(TOP)/src/mapi \

-	-I$(TOP)/src/mesa \

-	-I$(TOP)/src/egl/main \

-	-I$(TOP)/src/egl/drivers/dri \

-	$(LIBDRM_CFLAGS)

-

-CFLAGS += $(API_DEFINES)

-CXXFLAGS += $(API_DEFINES)

-

-##### RULES #####

-

-.c.o:

-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-.cpp.o:

-	$(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-.S.o:

-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-

-##### TARGETS #####

-

-default: subdirs lib

-

-

-.PHONY: lib

-lib: symlinks subdirs depend

-	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)

-

-$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \

-		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o

-	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

-		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)

-	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)

-	@rm -f $@.test

-	mv -f $@.tmp $@

-

-

-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

-	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 

-

-

-# If the Makefile defined SUBDIRS, run make in each

-.PHONY: subdirs

-subdirs:

-	@if test -n "$(SUBDIRS)" ; then \

-		for dir in $(SUBDIRS) ; do \

-			if [ -d $$dir ] ; then \

-				(cd $$dir && $(MAKE)) || exit 1; \

-			fi \

-		done \

-	fi

-

-

-.PHONY: symlinks

-symlinks:

-

-

-depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)

-	@ echo "running $(MKDEP)"

-	@ rm -f depend

-	@ touch depend

-	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \

-		$(C_SOURCES) $(CXX_SOURCES) \

-		$(ASM_SOURCES) > /dev/null 2>/dev/null

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` `find ../include`

-

-

-# Remove .o and backup files

-clean:

-	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)

-	-rm -f depend depend.bak

-

-

-install: $(LIBNAME)

-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-

-

--include depend

+# -*-makefile-*-
+
+COMMON_GALLIUM_SOURCES = \
+        ../common/utils.c \
+        ../common/vblank.c \
+        ../common/dri_util.c \
+        ../common/xmlconfig.c
+
+COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
+        ../../common/driverfuncs.c \
+        ../common/texmem.c \
+        ../common/drirenderbuffer.c
+
+INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
+
+OBJECTS = $(C_SOURCES:.c=.o) \
+	  $(CXX_SOURCES:.cpp=.o) \
+	  $(ASM_SOURCES:.S=.o) 
+
+
+### Include directories
+SHARED_INCLUDES = \
+	-I. \
+	-I$(TOP)/src/mesa/drivers/dri/common \
+	-Iserver \
+	-I$(TOP)/include \
+	-I$(TOP)/src/mapi \
+	-I$(TOP)/src/mesa \
+	-I$(TOP)/src/egl/main \
+	-I$(TOP)/src/egl/drivers/dri \
+	$(LIBDRM_CFLAGS)
+
+CFLAGS += $(API_DEFINES)
+CXXFLAGS += $(API_DEFINES)
+
+##### RULES #####
+
+.c.o:
+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
+
+.cpp.o:
+	$(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@
+
+.S.o:
+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
+
+
+##### TARGETS #####
+
+default: subdirs lib
+
+
+.PHONY: lib
+lib: symlinks subdirs depend
+	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+
+$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \
+		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
+	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
+	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	@rm -f $@.test
+	mv -f $@.tmp $@
+
+
+$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
+	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
+
+
+# If the Makefile defined SUBDIRS, run make in each
+.PHONY: subdirs
+subdirs:
+	@if test -n "$(SUBDIRS)" ; then \
+		for dir in $(SUBDIRS) ; do \
+			if [ -d $$dir ] ; then \
+				(cd $$dir && $(MAKE)) || exit 1; \
+			fi \
+		done \
+	fi
+
+
+.PHONY: symlinks
+symlinks:
+
+
+depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
+	@ echo "running $(MKDEP)"
+	@ rm -f depend
+	@ touch depend
+	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \
+		$(C_SOURCES) $(CXX_SOURCES) \
+		$(ASM_SOURCES) > /dev/null 2>/dev/null
+
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` `find ../include`
+
+
+# Remove .o and backup files
+clean:
+	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
+	-rm -f depend depend.bak
+
+
+install: $(LIBNAME)
+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+
+
+-include depend
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
deleted file mode 100644
index e259f11df..000000000
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/**************************************************************************

- *

- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

- * Copyright 2009 Intel Corporation.

- * All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- *

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- **************************************************************************/

-

-#include "main/arbprogram.h"

-#include "main/arrayobj.h"

-#include "main/bufferobj.h"

-#include "main/context.h"

-#include "main/enable.h"

-#include "main/matrix.h"

-#include "main/texstate.h"

-#include "main/varray.h"

-#include "main/viewport.h"

-#include "program/program.h"

-#include "dri_metaops.h"

-

-void

-meta_set_passthrough_transform(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-

-   meta->saved_vp_x = ctx->Viewport.X;

-   meta->saved_vp_y = ctx->Viewport.Y;

-   meta->saved_vp_width = ctx->Viewport.Width;

-   meta->saved_vp_height = ctx->Viewport.Height;

-   meta->saved_matrix_mode = ctx->Transform.MatrixMode;

-

-   meta->internal_viewport_call = GL_TRUE;

-   _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);

-   meta->internal_viewport_call = GL_FALSE;

-

-   _mesa_MatrixMode(GL_PROJECTION);

-   _mesa_PushMatrix();

-   _mesa_LoadIdentity();

-   _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1);

-

-   _mesa_MatrixMode(GL_MODELVIEW);

-   _mesa_PushMatrix();

-   _mesa_LoadIdentity();

-}

-

-void

-meta_restore_transform(struct dri_metaops *meta)

-{

-   _mesa_MatrixMode(GL_PROJECTION);

-   _mesa_PopMatrix();

-   _mesa_MatrixMode(GL_MODELVIEW);

-   _mesa_PopMatrix();

-

-   _mesa_MatrixMode(meta->saved_matrix_mode);

-

-   meta->internal_viewport_call = GL_TRUE;

-   _mesa_Viewport(meta->saved_vp_x, meta->saved_vp_y,

-		  meta->saved_vp_width, meta->saved_vp_height);

-   meta->internal_viewport_call = GL_FALSE;

-}

-

-

-/**

- * Set up a vertex program to pass through the position and first texcoord

- * for pixel path.

- */

-void

-meta_set_passthrough_vertex_program(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-   static const char *vp =

-      "!!ARBvp1.0\n"

-      "TEMP vertexClip;\n"

-      "DP4 vertexClip.x, state.matrix.mvp.row[0], vertex.position;\n"

-      "DP4 vertexClip.y, state.matrix.mvp.row[1], vertex.position;\n"

-      "DP4 vertexClip.z, state.matrix.mvp.row[2], vertex.position;\n"

-      "DP4 vertexClip.w, state.matrix.mvp.row[3], vertex.position;\n"

-      "MOV result.position, vertexClip;\n"

-      "MOV result.texcoord[0], vertex.texcoord[0];\n"

-      "MOV result.color, vertex.color;\n"

-      "END\n";

-

-   assert(meta->saved_vp == NULL);

-

-   _mesa_reference_vertprog(ctx, &meta->saved_vp,

-			    ctx->VertexProgram.Current);

-   if (meta->passthrough_vp == NULL) {

-      GLuint prog_name;

-      _mesa_GenPrograms(1, &prog_name);

-      _mesa_BindProgram(GL_VERTEX_PROGRAM_ARB, prog_name);

-      _mesa_ProgramStringARB(GL_VERTEX_PROGRAM_ARB,

-			     GL_PROGRAM_FORMAT_ASCII_ARB,

-			     strlen(vp), (const GLubyte *)vp);

-      _mesa_reference_vertprog(ctx, &meta->passthrough_vp,

-			       ctx->VertexProgram.Current);

-      _mesa_DeletePrograms(1, &prog_name);

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

-			    meta->passthrough_vp);

-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

-			   &meta->passthrough_vp->Base);

-

-   meta->saved_vp_enable = ctx->VertexProgram.Enabled;

-   _mesa_Enable(GL_VERTEX_PROGRAM_ARB);

-}

-

-/**

- * Restores the previous vertex program after

- * meta_set_passthrough_vertex_program()

- */

-void

-meta_restore_vertex_program(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-

-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

-			    meta->saved_vp);

-   _mesa_reference_vertprog(ctx, &meta->saved_vp, NULL);

-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

-			   &ctx->VertexProgram.Current->Base);

-

-   if (!meta->saved_vp_enable)

-      _mesa_Disable(GL_VERTEX_PROGRAM_ARB);

-}

-

-/**

- * Binds the given program string to GL_FRAGMENT_PROGRAM_ARB, caching the

- * program object.

- */

-void

-meta_set_fragment_program(struct dri_metaops *meta,

-			  struct gl_fragment_program **prog,

-			  const char *prog_string)

-{

-   struct gl_context *ctx = meta->ctx;

-   assert(meta->saved_fp == NULL);

-

-   _mesa_reference_fragprog(ctx, &meta->saved_fp,

-			    ctx->FragmentProgram.Current);

-   if (*prog == NULL) {

-      GLuint prog_name;

-      _mesa_GenPrograms(1, &prog_name);

-      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, prog_name);

-      _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,

-			     GL_PROGRAM_FORMAT_ASCII_ARB,

-			     strlen(prog_string), (const GLubyte *)prog_string);

-      _mesa_reference_fragprog(ctx, prog, ctx->FragmentProgram.Current);

-      /* Note that DeletePrograms unbinds the program on us */

-      _mesa_DeletePrograms(1, &prog_name);

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, *prog);

-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, &((*prog)->Base));

-

-   meta->saved_fp_enable = ctx->FragmentProgram.Enabled;

-   _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB);

-}

-

-/**

- * Restores the previous fragment program after

- * meta_set_fragment_program()

- */

-void

-meta_restore_fragment_program(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-

-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

-			    meta->saved_fp);

-   _mesa_reference_fragprog(ctx, &meta->saved_fp, NULL);

-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,

-			   &ctx->FragmentProgram.Current->Base);

-

-   if (!meta->saved_fp_enable)

-      _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);

-}

-

-static const float default_texcoords[4][2] = { { 0.0, 0.0 },

-					       { 1.0, 0.0 },

-					       { 1.0, 1.0 },

-					       { 0.0, 1.0 } };

-

-void

-meta_set_default_texrect(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-   struct gl_client_array *old_texcoord_array;

-

-   meta->saved_active_texture = ctx->Texture.CurrentUnit;

-   if (meta->saved_array_vbo == NULL) {

-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo,

-				    ctx->Array.ArrayBufferObj);

-   }

-

-   old_texcoord_array = &ctx->Array.ArrayObj->TexCoord[0];

-   meta->saved_texcoord_type = old_texcoord_array->Type;

-   meta->saved_texcoord_size = old_texcoord_array->Size;

-   meta->saved_texcoord_stride = old_texcoord_array->Stride;

-   meta->saved_texcoord_enable = old_texcoord_array->Enabled;

-   meta->saved_texcoord_ptr = old_texcoord_array->Ptr;

-   _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo,

-				 old_texcoord_array->BufferObj);

-

-   _mesa_ClientActiveTextureARB(GL_TEXTURE0);

-

-   if (meta->texcoord_vbo == NULL) {

-      GLuint vbo_name;

-

-      _mesa_GenBuffersARB(1, &vbo_name);

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo_name);

-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(default_texcoords),

-			  default_texcoords, GL_STATIC_DRAW_ARB);

-      _mesa_reference_buffer_object(ctx, &meta->texcoord_vbo,

-				    ctx->Array.ArrayBufferObj);

-   } else {

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

-			  meta->texcoord_vbo->Name);

-   }

-   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), NULL);

-

-   _mesa_Enable(GL_TEXTURE_COORD_ARRAY);

-}

-

-void

-meta_restore_texcoords(struct dri_metaops *meta)

-{

-   struct gl_context *ctx = meta->ctx;

-

-   /* Restore the old TexCoordPointer */

-   if (meta->saved_texcoord_vbo) {

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

-			  meta->saved_texcoord_vbo->Name);

-      _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo, NULL);

-   } else {

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

-   }

-

-   _mesa_TexCoordPointer(meta->saved_texcoord_size,

-			 meta->saved_texcoord_type,

-			 meta->saved_texcoord_stride,

-			 meta->saved_texcoord_ptr);

-   if (!meta->saved_texcoord_enable)

-      _mesa_Disable(GL_TEXTURE_COORD_ARRAY);

-

-   _mesa_ClientActiveTextureARB(GL_TEXTURE0 +

-				meta->saved_active_texture);

-

-   if (meta->saved_array_vbo) {

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

-			  meta->saved_array_vbo->Name);

-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo, NULL);

-   } else {

-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

-   }

-}

-

-

-void meta_init_metaops(struct gl_context *ctx, struct dri_metaops *meta)

-{

-   meta->ctx = ctx;

-}

-

-void meta_destroy_metaops(struct dri_metaops *meta)

-{

-

-}

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.h b/mesalib/src/mesa/drivers/dri/common/dri_metaops.h
deleted file mode 100644
index e72094e62..000000000
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**************************************************************************

- *

- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

- * Copyright 2009 Intel Corporation.

- * All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- *

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- **************************************************************************/

-

-#ifndef DRI_METAOPS_H

-#define DRI_METAOPS_H

-

-

-struct dri_metaops {

-    struct gl_context *ctx;

-    GLboolean internal_viewport_call;

-    struct gl_fragment_program *bitmap_fp;

-    struct gl_vertex_program *passthrough_vp;

-    struct gl_buffer_object *texcoord_vbo;

-    

-    struct gl_fragment_program *saved_fp;

-    GLboolean saved_fp_enable;

-    struct gl_vertex_program *saved_vp;

-    GLboolean saved_vp_enable;

-

-    struct gl_fragment_program *tex2d_fp;

-    

-    GLboolean saved_texcoord_enable;

-    struct gl_buffer_object *saved_array_vbo, *saved_texcoord_vbo;

-    GLenum saved_texcoord_type;

-    GLsizei saved_texcoord_size, saved_texcoord_stride;

-    const void *saved_texcoord_ptr;

-    int saved_active_texture;

-

-    GLint saved_vp_x, saved_vp_y;

-    GLsizei saved_vp_width, saved_vp_height;

-    GLenum saved_matrix_mode;

-};

-

-

-void meta_set_passthrough_transform(struct dri_metaops *meta);

-

-void meta_restore_transform(struct dri_metaops *meta);

-

-void meta_set_passthrough_vertex_program(struct dri_metaops *meta);

-

-void meta_restore_vertex_program(struct dri_metaops *meta);

-

-void meta_set_fragment_program(struct dri_metaops *meta,

-			  struct gl_fragment_program **prog,

-			  const char *prog_string);

-

-void meta_restore_fragment_program(struct dri_metaops *meta);

-

-void meta_set_default_texrect(struct dri_metaops *meta);

-

-void meta_restore_texcoords(struct dri_metaops *meta);

-

-void meta_init_metaops(struct gl_context *ctx, struct dri_metaops *meta);

-void meta_destroy_metaops(struct dri_metaops *meta);

-

-#endif

diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c
index 6eb3fb880..6d2ca7f90 100644
--- a/xkbcomp/geometry.c
+++ b/xkbcomp/geometry.c
@@ -179,7 +179,6 @@ typedef struct _OverlayInfo
     unsigned short nKeys;
     OverlayKeyInfo *keys;
 } OverlayInfo;
-#define	oiText(d,o)	((o)?XkbAtomText((d),(o)->name,XkbMessage):"default")
 
 
 #define	_GS_Default	(1<<0)
@@ -2575,7 +2574,8 @@ HandleOverlayDef(OverlayDef * def,
         {
             WSGO("Couldn't allocate OverlayKeyInfo\n");
             ACTION2("Overlay %s for section %s will be incomplete\n",
-                    oiText(info->dpy, &ol), scText(info->dpy, si));
+                    XkbAtomText(info->dpy, ol.name, XkbMessage),
+                    scText(info->dpy, si));
             return False;
         }
         strncpy(key->over, keyDef->over, XkbKeyNameLength);