libXext libX11 mkfontscale mesa git update 9 May 2011

19 files changed, 2928 insertions, 2812 deletions

diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index 3266e0d00..ce3d25fab 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -572,6 +572,7 @@ extern LockInfoPtr _Xglobal_lock;
 #endif
 #endif
 
+#ifndef __clang_analyzer__
 #define SetReqLen(req,n,badlen) \
     if ((req->length + n) > (unsigned)65535) { \
 	if (dpy->bigreq_size) { \
@@ -582,6 +583,10 @@ extern LockInfoPtr _Xglobal_lock;
 	} \
     } else \
 	req->length += n
+#else
+#define SetReqLen(req,n,badlen) \
+    req->length += n
+#endif
 
 #define SyncHandle() \
 	if (dpy->synchandler) (*dpy->synchandler)(dpy)
diff --git a/libXext/configure.ac b/libXext/configure.ac
index aa8730726..79fb39c15 100644
--- a/libXext/configure.ac
+++ b/libXext/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXext], [1.2.99.0],
+AC_INIT([libXext], [1.3.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libXext/docbook.am b/libXext/docbook.am
index 3cf21e879..693708351 100644
--- a/libXext/docbook.am
+++ b/libXext/docbook.am
@@ -20,6 +20,7 @@ shelf_DATA =
 # DocBook/XML file with chapters, appendix and images it includes
 dist_shelf_DATA = $(docbook) $(chapters)
 
+if HAVE_XMLTO
 #
 # Generate DocBook/XML output formats with or without stylesheets
 #
@@ -91,5 +92,6 @@ XSLTPROC_FLAGS =					\
 
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
 
 CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
diff --git a/libXext/specs/Makefile.am b/libXext/specs/Makefile.am
index 659b5d217..80fb18f81 100644
--- a/libXext/specs/Makefile.am
+++ b/libXext/specs/Makefile.am
@@ -1,6 +1,5 @@
 
 if ENABLE_SPECS
-if HAVE_XMLTO
 
 # Main DocBook/XML files (DOCTYPE book)
 docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)
 # Generate DocBook/XML output formats with or without stylesheets
 include $(top_srcdir)/docbook.am
 
-endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index d57d56366..d86c4b0bf 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -1,119 +1,119 @@
-

-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 1.30 (GL_EXT_gpu_shader4, etc.)                  started

-Conditional rendering (GL_NV_conditional_render)      DONE (swrast, softpipe, i965)

-Map buffer subranges (GL_ARB_map_buffer_range)        DONE

-Clamping controls (GL_ARB_color_buffer_float)         DONE

-Float textures, renderbuffers (GL_ARB_texture_float)  DONE (gallium r300)

-GL_EXT_packed_float                                   DONE (gallium r600)

-GL_EXT_texture_shared_exponent                        DONE (gallium, swrast)

-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                       DONE (swrast, gallium r600)

-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)

-Depth format cube textures                            0% done

-

-

-

-GL 3.1:

-

-GLSL 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)     DONE (gallium)

-

-

-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                                DONE (gallium)

-GL_ARB_texture_rgb10_a2ui                             not started

-GL_ARB_texture_swizzle                                DONE (same as EXT version)

-GL_ARB_timer_query                                    ~60% done (the EXT variant)

-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                             DONE (i965)

-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 1.30 (GL_EXT_gpu_shader4, etc.)                  started
+Conditional rendering (GL_NV_conditional_render)      DONE (swrast, softpipe, i965)
+Map buffer subranges (GL_ARB_map_buffer_range)        DONE
+Clamping controls (GL_ARB_color_buffer_float)         DONE
+Float textures, renderbuffers (GL_ARB_texture_float)  DONE (gallium r300)
+GL_EXT_packed_float                                   DONE (gallium r600)
+GL_EXT_texture_shared_exponent                        DONE (gallium, swrast)
+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                       DONE (swrast, gallium r600)
+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)
+Depth format cube textures                            0% done
+
+
+
+GL 3.1:
+
+GLSL 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)     DONE (gallium)
+
+
+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
+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                                DONE (gallium)
+GL_ARB_texture_rgb10_a2ui                             not started
+GL_ARB_texture_swizzle                                DONE (same as EXT version)
+GL_ARB_timer_query                                    ~60% done (the EXT variant)
+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                             DONE (i965)
+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/docs/MESA_drm_image.spec b/mesalib/docs/MESA_drm_image.spec
index 76de3f8b6..1150a4c43 100644
--- a/mesalib/docs/MESA_drm_image.spec
+++ b/mesalib/docs/MESA_drm_image.spec
@@ -1,149 +1,153 @@
-Name

-

-    MESA_drm_image

-

-Name Strings

-

-    EGL_MESA_drm_image

-

-Contact

-

-    Kristian Høgsberg <krh@bitplanet.net>

-

-Status

-

-    Proposal

-

-Version

-

-    Version 2, August 25, 2010

-

-Number

-

-    EGL Extension #not assigned

-

-Dependencies

-

-    Requires EGL 1.4 or later.  This extension is written against the

-    wording of the EGL 1.4 specification.

-

-    EGL_KHR_base_image is required.

-

-Overview

-

-    This extension provides entry points for integrating EGLImage with the

-    Linux DRM mode setting and memory management drivers.  The extension

-    lets applications create EGLImages without a client API resource and

-    lets the application get the DRM buffer handles.

-

-IP Status

-

-    Open-source; freely implementable.

-

-New Procedures and Functions

-

-    EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,

-                                      const EGLint *attrib_list);

-

-    EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,

-                                     EGLImageKHR image,

-                                     EGLint *name,

-				     EGLint *handle,

-				     EGLint *stride);

-

-New Tokens

-

-    Accepted in the <attrib_list> parameter of eglCreateDRMImageMESA:

-

-        EGL_DRM_BUFFER_FORMAT_MESA		0x31D0

-        EGL_DRM_BUFFER_USE_MESA			0x31D1

-

-    Accepted as values for the EGL_IMAGE_FORMAT_MESA attribute:

-

-        EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2

-

-    Bits accepted in EGL_DRM_BUFFER_USE_MESA:

-

-        EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001

-        EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002

-

-    Accepted in the <target> parameter of eglCreateImageKHR:

-

-        EGL_DRM_BUFFER_MESA			0x31D3

-

-    Use when importing drm buffer:

-

-        EGL_DRM_BUFFER_STRIDE_MESA		0x31D4

-        EGL_DRM_BUFFER_FORMAT_MESA		0x31D0

-

-Additions to the EGL 1.4 Specification:

-

-    To create a DRM EGLImage, call

-

-        EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,

-                                          const EGLint *attrib_list);

-

-    In the attribute list, pass EGL_WIDTH, EGL_HEIGHT and format and

-    use in the attrib list using EGL_DRM_BUFFER_FORMAT_MESA and

-    EGL_DRM_BUFFER_USE_MESA.  The only format specified by this

-    extension is EGL_DRM_BUFFER_FORMAT_ARGB32_MESA, where each pixel

-    is a CPU-endian, 32-bit quantity, with alpha in the upper 8 bits,

-    then red, then green, then blue.  The bit values accepted by

-    EGL_DRM_BUFFER_USE_MESA are EGL_DRM_BUFFER_USE_SCANOUT_MESA and

-    EGL_DRM_BUFFER_USE_SHARE_MESA.  EGL_DRM_BUFFER_USE_SCANOUT_MESA

-    requests that the created EGLImage should be usable as a scanout

-    buffer with the DRM kernel modesetting API.  The

-    EGL_DRM_BUFFER_USE_SHARE_MESA bit requests that the EGLImage can

-    be shared with other processes by passing the underlying DRM

-    buffer name.

-

-    To create a process local handle or a global DRM name for a

-    buffer, call

-

-        EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,

-                                         EGLImageKHR image,

-                                         EGLint *name,

-                                         EGLint *handle,

-                                         EGLint *stride);

-

-    If <name> is non-NULL, a global name is assigned to the image and

-    written to <name>, the handle (local to the DRM file descriptor,

-    for use with DRM kernel modesetting API) is written to <handle> if

-    non-NULL and the stride (in bytes) is written to <stride>, if

-    non-NULL.

-

-    Import a shared buffer by calling eglCreateImageKHR with

-    EGL_DRM_BUFFER_MESA as the target, using EGL_WIDTH, EGL_HEIGHT,

-    EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_STRIDE_MESA

-    in the attrib list.

-

-Issues

-

-    1.  Why don't we use eglCreateImageKHR with a target that

-        indicates that we want to create an EGLImage from scratch?

-

-        RESOLVED: The eglCreateImageKHR entry point is reserved for

-        creating an EGLImage from an already existing client API

-        resource.  This is fine when we're creating the EGLImage from

-        an existing DRM buffer name, it doesn't seem right to overload

-        the function to also allocate the underlying resource.

-

-    2.  Why don't we use an eglQueryImageMESA type functions for

-        querying the DRM EGLImage attributes (name, handle, and stride)?

-

-        RESOLVED: The eglQueryImage function has been proposed often,

-        but it goes against the EGLImage design.  EGLImages are opaque

-        handles to a 2D array of pixels, which can be passed between

-        client APIs.  By referencing an EGLImage in a client API, the

-        EGLImage target (a texture, a renderbuffer or such) can be

-        used to query the attributes of the EGLImage.  We don't have a

-        full client API for creating and querying DRM buffers, though,

-        so we use a new EGL extension entry point instead.

-

-Revision History

-

-    Version 1, June 3, 2010

-        Initial draft (Kristian Høgsberg)

-    Version 2, August 25, 2010

-        Flesh out the extension a bit, add final EGL tokens, capture

-        some of the original discussion in the issues section.

+Name
+
+    MESA_drm_image
+
+Name Strings
+
+    EGL_MESA_drm_image
+
+Contact
+
+    Kristian Høgsberg <krh@bitplanet.net>
+
+Status
+
+    Proposal
+
+Version
+
+    Version 2, August 25, 2010
+
+Number
+
+    EGL Extension #not assigned
+
+Dependencies
+
+    Requires EGL 1.4 or later.  This extension is written against the
+    wording of the EGL 1.4 specification.
+
+    EGL_KHR_base_image is required.
+
+Overview
+
+    This extension provides entry points for integrating EGLImage with the
+    Linux DRM mode setting and memory management drivers.  The extension
+    lets applications create EGLImages without a client API resource and
+    lets the application get the DRM buffer handles.
+
+IP Status
+
+    Open-source; freely implementable.
+
+New Procedures and Functions
+
+    EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,
+                                      const EGLint *attrib_list);
+
+    EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,
+                                     EGLImageKHR image,
+                                     EGLint *name,
+				     EGLint *handle,
+				     EGLint *stride);
+
+New Tokens
+
+    Accepted in the <attrib_list> parameter of eglCreateDRMImageMESA:
+
+        EGL_DRM_BUFFER_FORMAT_MESA		0x31D0
+        EGL_DRM_BUFFER_USE_MESA			0x31D1
+
+    Accepted as values for the EGL_IMAGE_FORMAT_MESA attribute:
+
+        EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2
+
+    Bits accepted in EGL_DRM_BUFFER_USE_MESA:
+
+        EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001
+        EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002
+        EGL_DRM_BUFFER_USE_CURSOR_MESA		0x0004
+
+    Accepted in the <target> parameter of eglCreateImageKHR:
+
+        EGL_DRM_BUFFER_MESA			0x31D3
+
+    Use when importing drm buffer:
+
+        EGL_DRM_BUFFER_STRIDE_MESA		0x31D4
+        EGL_DRM_BUFFER_FORMAT_MESA		0x31D0
+
+Additions to the EGL 1.4 Specification:
+
+    To create a DRM EGLImage, call
+
+        EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,
+                                          const EGLint *attrib_list);
+
+    In the attribute list, pass EGL_WIDTH, EGL_HEIGHT and format and
+    use in the attrib list using EGL_DRM_BUFFER_FORMAT_MESA and
+    EGL_DRM_BUFFER_USE_MESA.  The only format specified by this
+    extension is EGL_DRM_BUFFER_FORMAT_ARGB32_MESA, where each pixel
+    is a CPU-endian, 32-bit quantity, with alpha in the upper 8 bits,
+    then red, then green, then blue.  The bit values accepted by
+    EGL_DRM_BUFFER_USE_MESA are EGL_DRM_BUFFER_USE_SCANOUT_MESA,
+    EGL_DRM_BUFFER_USE_SHARE_MESA and EGL_DRM_BUFFER_USE_CURSOR_MESA.
+    EGL_DRM_BUFFER_USE_SCANOUT_MESA requests that the created EGLImage
+    should be usable as a scanout buffer with the DRM kernel
+    modesetting API.  EGL_DRM_BUFFER_USE_SHARE_MESA requests that the
+    EGLImage can be shared with other processes by passing the
+    underlying DRM buffer name.  EGL_DRM_BUFFER_USE_CURSOR_MESA
+    requests that the image must be usable as a cursor with KMS.  When
+    EGL_DRM_BUFFER_USE_CURSOR_MESA is set, width and height must both
+    be 64.
+
+    To create a process local handle or a global DRM name for a
+    buffer, call
+
+        EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,
+                                         EGLImageKHR image,
+                                         EGLint *name,
+                                         EGLint *handle,
+                                         EGLint *stride);
+
+    If <name> is non-NULL, a global name is assigned to the image and
+    written to <name>, the handle (local to the DRM file descriptor,
+    for use with DRM kernel modesetting API) is written to <handle> if
+    non-NULL and the stride (in bytes) is written to <stride>, if
+    non-NULL.
+
+    Import a shared buffer by calling eglCreateImageKHR with
+    EGL_DRM_BUFFER_MESA as the target, using EGL_WIDTH, EGL_HEIGHT,
+    EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_STRIDE_MESA
+    in the attrib list.
+
+Issues
+
+    1.  Why don't we use eglCreateImageKHR with a target that
+        indicates that we want to create an EGLImage from scratch?
+
+        RESOLVED: The eglCreateImageKHR entry point is reserved for
+        creating an EGLImage from an already existing client API
+        resource.  This is fine when we're creating the EGLImage from
+        an existing DRM buffer name, it doesn't seem right to overload
+        the function to also allocate the underlying resource.
+
+    2.  Why don't we use an eglQueryImageMESA type functions for
+        querying the DRM EGLImage attributes (name, handle, and stride)?
+
+        RESOLVED: The eglQueryImage function has been proposed often,
+        but it goes against the EGLImage design.  EGLImages are opaque
+        handles to a 2D array of pixels, which can be passed between
+        client APIs.  By referencing an EGLImage in a client API, the
+        EGLImage target (a texture, a renderbuffer or such) can be
+        used to query the attributes of the EGLImage.  We don't have a
+        full client API for creating and querying DRM buffers, though,
+        so we use a new EGL extension entry point instead.
+
+Revision History
+
+    Version 1, June 3, 2010
+        Initial draft (Kristian Høgsberg)
+    Version 2, August 25, 2010
+        Flesh out the extension a bit, add final EGL tokens, capture
+        some of the original discussion in the issues section.
diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html
index 6951984bd..1c22b082e 100644
--- a/mesalib/docs/relnotes-7.11.html
+++ b/mesalib/docs/relnotes-7.11.html
@@ -1,79 +1,84 @@
-<HTML>

-

-<head>

-<TITLE>Mesa Release Notes</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css">

-<meta http-equiv="content-type" content="text/html; charset=utf-8" />

-</head>

-

-<BODY>

-

-<body bgcolor="#eeeeee">

-

-<H1>Mesa 7.11 Release Notes / (release date TBD)</H1>

-

-<p>

-Mesa 7.11 is a new development release.

-People who are concerned with stability and reliability should stick

-with a previous release or wait for Mesa 7.11.1.

-</p>

-<p>

-Mesa 7.11 implements the OpenGL 2.1 API, but the version reported by

-glGetString(GL_VERSION) depends on the particular driver being used.

-Some drivers don't support all the features required in OpenGL 2.1.

-</p>

-<p>

-See the <a href="install.html">Compiling/Installing page</a> for prerequisites

-for DRI hardware acceleration.

-</p>

-

-

-<h2>MD5 checksums</h2>

-<pre>

-tbd

-</pre>

-

-

-<h2>New features</h2>

-<ul>

-<li>GL_ARB_ES2_compatibility (gallium drivers)

-<li>GL_ARB_color_buffer_float (gallium drivers, i965)

-<li>GL_ARB_draw_buffers_blend (gallium)

-<li>GL_ARB_draw_instanced extension (gallium drivers, swrast)

-<li>GL_ARB_instanced_arrays extension (gallium drivers)

-<li>GL_ARB_occlusion_query2 (gallium drivers, swrast)

-<li>GL_ARB_robustness (all drivers)

-<li>GL_ARB_sampler_objects (gallium drivers)

-<li>GL_ARB_texture_compression_rgtc (gallium drivers, swrast, i965)

-<li>GL_ARB_texture_float (gallium, i965)

-<li>GL_EXT_packed_float (gallium r600)

-<li>GL_EXT_texture_compression_latc (gallium drivers, swrast)

-<li>GL_EXT_texture_compression_rgtc (gallium drivers, swrast, i965)

-<li>GL_EXT_texture_shared_exponent (gallium drivers, swrast)

-<li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)

-<li>GL_EXT_texture_snorm (gallium drivers)

-<li>GL_ATI_draw_buffers (all drivers)

-<li>GL_ATI_texture_compression_3dc (gallium drivers, swrast)

-<li>GL_ATI_texture_float (gallium, i965)

-<li>GL_NV_conditional_render (i965)

-<li>GL_NV_texture_barrier (gallium drivers)

-</ul>

-

-

-<h2>Bug fixes</h2>

-<ul>

-</ul>

-

-

-<h2>Changes</h2>

-<ul>

-<li>The Windows MSVC project files have been removed.

-They haven't been maintained in quite a while.

-Building with SCons is an alternative.

-<li>Removed GL_SGI_texture_color_table support from swrast driver - the only

-driver that implemented it.

-</ul>

-

-

-</body>

-</html>

+<HTML>
+
+<head>
+<TITLE>Mesa Release Notes</TITLE>
+<link rel="stylesheet" type="text/css" href="mesa.css">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+</head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.11 Release Notes / (release date TBD)</H1>
+
+<p>
+Mesa 7.11 is a new development release.
+People who are concerned with stability and reliability should stick
+with a previous release or wait for Mesa 7.11.1.
+</p>
+<p>
+Mesa 7.11 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+</p>
+<p>
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
+for DRI hardware acceleration.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+tbd
+</pre>
+
+
+<h2>New features</h2>
+<ul>
+<li>GL_ARB_ES2_compatibility (gallium drivers)
+<li>GL_ARB_color_buffer_float (gallium drivers, i965)
+<li>GL_ARB_draw_buffers_blend (gallium)
+<li>GL_ARB_draw_instanced extension (gallium drivers, swrast)
+<li>GL_ARB_instanced_arrays extension (gallium drivers)
+<li>GL_ARB_occlusion_query2 (gallium drivers, swrast)
+<li>GL_ARB_robustness (all drivers)
+<li>GL_ARB_sampler_objects (gallium drivers)
+<li>GL_ARB_seamless_cube_map (gallium r600)
+<li>GL_ARB_sync (gallium drivers only, intel support was in 7.6)
+<li>GL_ARB_texture_compression_rgtc (gallium drivers, swrast, i965)
+<li>GL_ARB_texture_float (gallium, i965)
+<li>GL_EXT_packed_float (gallium r600)
+<li>GL_EXT_texture_compression_latc (gallium drivers, swrast)
+<li>GL_EXT_texture_compression_rgtc (gallium drivers, swrast, i965)
+<li>GL_EXT_texture_shared_exponent (gallium drivers, swrast)
+<li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)
+<li>GL_EXT_texture_snorm (gallium drivers)
+<li>GL_AMD_draw_buffers_blend (alias of the ARB variant)
+<li>GL_AMD_seamless_cubemap_per_texture (gallium r600)
+<li>GL_AMD_shader_stencil_export (alias of the ARB variant)
+<li>GL_ATI_draw_buffers (all drivers)
+<li>GL_ATI_texture_compression_3dc (gallium drivers, swrast)
+<li>GL_ATI_texture_float (gallium, i965)
+<li>GL_NV_conditional_render (i965)
+<li>GL_NV_texture_barrier (gallium drivers)
+</ul>
+
+
+<h2>Bug fixes</h2>
+<ul>
+</ul>
+
+
+<h2>Changes</h2>
+<ul>
+<li>The Windows MSVC project files have been removed.
+They haven't been maintained in quite a while.
+Building with SCons is an alternative.
+<li>Removed GL_SGI_texture_color_table support from swrast driver - the only
+driver that implemented it.
+</ul>
+
+
+</body>
+</html>
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h
index 43eff8e99..3ac56bd59 100644
--- a/mesalib/include/EGL/eglext.h
+++ b/mesalib/include/EGL/eglext.h
@@ -1,397 +1,398 @@
-#ifndef __eglext_h_

-#define __eglext_h_

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/*

-** Copyright (c) 2007-2010 The Khronos Group Inc.

-**

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

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

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

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

-** distribute, sublicense, and/or sell copies of the Materials, and to

-** permit persons to whom the Materials are furnished to do so, subject to

-** the following conditions:

-**

-** The above copyright notice and this permission notice shall be included

-** in all copies or substantial portions of the Materials.

-**

-** THE MATERIALS ARE 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 NONINFRINGEMENT.

-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 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

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

-*/

-

-#include <EGL/eglplatform.h>

-

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

-

-/* Header file version number */

-/* Current version at http://www.khronos.org/registry/egl/ */

-/* $Revision$ on $Date: 2010-07-27 20:12:35 -0700 (Tue, 27 Jul 2010) $ */

-#define EGL_EGLEXT_VERSION 7

-

-#ifndef EGL_KHR_config_attribs

-#define EGL_KHR_config_attribs 1

-#define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */

-#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR	0x0020	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */

-#endif

-

-#ifndef EGL_KHR_lock_surface

-#define EGL_KHR_lock_surface 1

-#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */

-#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */

-#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */

-#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */

-#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */

-#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */

-#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */

-#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */

-#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);

-#endif

-

-#ifndef EGL_KHR_image

-#define EGL_KHR_image 1

-#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */

-typedef void *EGLImageKHR;

-#define EGL_NO_IMAGE_KHR			((EGLImageKHR)0)

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);

-#endif

-

-#ifndef EGL_KHR_vg_parent_image

-#define EGL_KHR_vg_parent_image 1

-#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_KHR_gl_texture_2D_image

-#define EGL_KHR_gl_texture_2D_image 1

-#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_gl_texture_cubemap_image

-#define EGL_KHR_gl_texture_cubemap_image 1

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_KHR_gl_texture_3D_image

-#define EGL_KHR_gl_texture_3D_image 1

-#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_gl_renderbuffer_image

-#define EGL_KHR_gl_renderbuffer_image 1

-#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_MESA_drm_image

-#define EGL_MESA_drm_image 1

-#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	/* eglCreateImageKHR attribute */

-#define EGL_DRM_BUFFER_USE_MESA			0x31D1

-

-/* EGL_DRM_BUFFER_FORMAT_MESA tokens */

-#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2

-

-/* EGL_DRM_BUFFER_USE_MESA bits */

-#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001

-#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002

-

-#define EGL_DRM_BUFFER_MESA			0x31D3  /* eglCreateImageKHR target */

-#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4	/* eglCreateImageKHR attribute */

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

-#endif

-typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESA) (EGLDisplay dpy, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESA) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

-#endif

-

-#ifndef EGL_WL_bind_wayland_display

-#define EGL_WL_bind_wayland_display 1

-

-#define EGL_WAYLAND_BUFFER_WL			0x31D5 /* eglCreateImageKHR target */

-struct wl_display;

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);

-EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);

-#endif

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */

-#ifndef EGL_KHR_reusable_sync

-#define EGL_KHR_reusable_sync 1

-

-typedef void* EGLSyncKHR;

-typedef khronos_utime_nanoseconds_t EGLTimeKHR;

-

-#define EGL_SYNC_STATUS_KHR			0x30F1

-#define EGL_SIGNALED_KHR			0x30F2

-#define EGL_UNSIGNALED_KHR			0x30F3

-#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5

-#define EGL_CONDITION_SATISFIED_KHR		0x30F6

-#define EGL_SYNC_TYPE_KHR			0x30F7

-#define EGL_SYNC_REUSABLE_KHR			0x30FA

-#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */

-#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull

-#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);

-EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

-EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);

-typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

-#endif

-#endif

-

-/* EGL_MESA_screen extension  >>> PRELIMINARY <<< */

-#ifndef EGL_MESA_screen_surface

-#define EGL_MESA_screen_surface 1

-

-#define EGL_BAD_SCREEN_MESA                    0x4000

-#define EGL_BAD_MODE_MESA                      0x4001

-#define EGL_SCREEN_COUNT_MESA                  0x4002

-#define EGL_SCREEN_POSITION_MESA               0x4003

-#define EGL_SCREEN_POSITION_GRANULARITY_MESA   0x4004

-#define EGL_MODE_ID_MESA                       0x4005

-#define EGL_REFRESH_RATE_MESA                  0x4006

-#define EGL_OPTIMAL_MESA                       0x4007

-#define EGL_INTERLACED_MESA                    0x4008

-#define EGL_SCREEN_BIT_MESA                    0x08

-

-typedef khronos_uint32_t EGLScreenMESA;

-typedef khronos_uint32_t EGLModeMESA;

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglChooseModeMESA(EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetModesMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetModeAttribMESA(EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetScreensMESA(EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);

-EGLAPI EGLSurface EGLAPIENTRY eglCreateScreenSurfaceMESA(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglShowScreenSurfaceMESA(EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);

-EGLAPI EGLBoolean EGLAPIENTRY eglScreenPositionMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenSurfaceMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenModeMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);

-EGLAPI const char * EGLAPIENTRY eglQueryModeStringMESA(EGLDisplay dpy, EGLModeMESA mode);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSEMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMODESMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGetModeATTRIBMESA) (EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSCRREENSMESA) (EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);

-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESCREENSURFACEMESA) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSHOWSCREENSURFACEMESA) (EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSCREENPOSIITONMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENSURFACEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);

-typedef const char * (EGLAPIENTRYP PFNEGLQUERYMODESTRINGMESA) (EGLDisplay dpy, EGLModeMESA mode);

-

-#endif /* EGL_MESA_screen_surface */

-

-

-#ifndef EGL_MESA_copy_context

-#define EGL_MESA_copy_context 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglCopyContextMESA(EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYCONTEXTMESA) (EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);

-

-#endif /* EGL_MESA_copy_context */

-

-#ifndef EGL_MESA_drm_display

-#define EGL_MESA_drm_display 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd);

-

-#endif /* EGL_MESA_drm_display */

-

-#ifndef EGL_KHR_image_base

-#define EGL_KHR_image_base 1

-/* Most interfaces defined by EGL_KHR_image_pixmap above */

-#define EGL_IMAGE_PRESERVED_KHR			0x30D2	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_image_pixmap

-#define EGL_KHR_image_pixmap 1

-/* Interfaces defined by EGL_KHR_image above */

-#endif

-

-#ifndef EGL_IMG_context_priority

-#define EGL_IMG_context_priority 1

-#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100

-#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101

-#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102

-#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103

-#endif

-

-#ifndef EGL_KHR_lock_surface2

-#define EGL_KHR_lock_surface2 1

-#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110

-#endif

-

-#ifndef EGL_NV_coverage_sample

-#define EGL_NV_coverage_sample 1

-#define EGL_COVERAGE_BUFFERS_NV 0x30E0

-#define EGL_COVERAGE_SAMPLES_NV 0x30E1

-#endif

-

-#ifndef EGL_NV_depth_nonlinear

-#define EGL_NV_depth_nonlinear 1

-#define EGL_DEPTH_ENCODING_NV 0x30E2

-#define EGL_DEPTH_ENCODING_NONE_NV 0

-#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */

-#ifndef EGL_NV_sync

-#define EGL_NV_sync 1

-#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6

-#define EGL_SYNC_STATUS_NV			0x30E7

-#define EGL_SIGNALED_NV				0x30E8

-#define EGL_UNSIGNALED_NV			0x30E9

-#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001

-#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull

-#define EGL_ALREADY_SIGNALED_NV			0x30EA

-#define EGL_TIMEOUT_EXPIRED_NV			0x30EB

-#define EGL_CONDITION_SATISFIED_NV		0x30EC

-#define EGL_SYNC_TYPE_NV			0x30ED

-#define EGL_SYNC_CONDITION_NV			0x30EE

-#define EGL_SYNC_FENCE_NV			0x30EF

-#define EGL_NO_SYNC_NV				((EGLSyncNV)0)

-typedef void* EGLSyncNV;

-typedef khronos_utime_nanoseconds_t EGLTimeNV;

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

-EGLBoolean eglDestroySyncNV (EGLSyncNV sync);

-EGLBoolean eglFenceNV (EGLSyncNV sync);

-EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

-EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);

-EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);

-typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);

-#endif

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */

-#ifndef EGL_KHR_fence_sync

-#define EGL_KHR_fence_sync 1

-/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */

-#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0

-#define EGL_SYNC_CONDITION_KHR			0x30F8

-#define EGL_SYNC_FENCE_KHR			0x30F9

-#endif

-#endif

-

-#ifndef EGL_HI_clientpixmap

-#define EGL_HI_clientpixmap 1

-

-/* Surface Attribute */

-#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74

-/*

- * Structure representing a client pixmap

- * (pixmap's data is in client-space memory).

- */

-struct EGLClientPixmapHI

-{

-	void*		pData;

-	EGLint		iWidth;

-	EGLint		iHeight;

-	EGLint		iStride;

-};

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

-#endif	/* EGL_HI_clientpixmap */

-

-#ifndef EGL_HI_colorformats

-#define EGL_HI_colorformats 1

-/* Config Attribute */

-#define EGL_COLOR_FORMAT_HI			0x8F70

-/* Color Formats */

-#define EGL_COLOR_RGB_HI			0x8F71

-#define EGL_COLOR_RGBA_HI			0x8F72

-#define EGL_COLOR_ARGB_HI			0x8F73

-#endif /* EGL_HI_colorformats */

-

-#ifndef EGL_NOK_swap_region

-#define EGL_NOK_swap_region 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);

-#endif

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);

-#endif

-

-

-#ifndef EGL_NOK_texture_from_pixmap

-#define EGL_NOK_texture_from_pixmap 1

-

-#define EGL_Y_INVERTED_NOK			0x307F

-#endif /* EGL_NOK_texture_from_pixmap */

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+#ifndef __eglext_h_
+#define __eglext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2010 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE 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 NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 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
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#include <EGL/eglplatform.h>
+
+/*************************************************************/
+
+/* Header file version number */
+/* Current version at http://www.khronos.org/registry/egl/ */
+/* $Revision$ on $Date: 2010-07-27 20:12:35 -0700 (Tue, 27 Jul 2010) $ */
+#define EGL_EGLEXT_VERSION 7
+
+#ifndef EGL_KHR_config_attribs
+#define EGL_KHR_config_attribs 1
+#define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */
+#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR	0x0020	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */
+#endif
+
+#ifndef EGL_KHR_lock_surface
+#define EGL_KHR_lock_surface 1
+#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */
+#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */
+#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */
+#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */
+#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */
+#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */
+#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);
+#endif
+
+#ifndef EGL_KHR_image
+#define EGL_KHR_image 1
+#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */
+typedef void *EGLImageKHR;
+#define EGL_NO_IMAGE_KHR			((EGLImageKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
+#endif
+
+#ifndef EGL_KHR_vg_parent_image
+#define EGL_KHR_vg_parent_image 1
+#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_2D_image
+#define EGL_KHR_gl_texture_2D_image 1
+#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_texture_cubemap_image
+#define EGL_KHR_gl_texture_cubemap_image 1
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_3D_image
+#define EGL_KHR_gl_texture_3D_image 1
+#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_renderbuffer_image
+#define EGL_KHR_gl_renderbuffer_image 1
+#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_MESA_drm_image
+#define EGL_MESA_drm_image 1
+#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	/* eglCreateImageKHR attribute */
+#define EGL_DRM_BUFFER_USE_MESA			0x31D1
+
+/* EGL_DRM_BUFFER_FORMAT_MESA tokens */
+#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2
+
+/* EGL_DRM_BUFFER_USE_MESA bits */
+#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001
+#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002
+#define EGL_DRM_BUFFER_USE_CURSOR_MESA		0x0004
+
+#define EGL_DRM_BUFFER_MESA			0x31D3  /* eglCreateImageKHR target */
+#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4	/* eglCreateImageKHR attribute */
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESA) (EGLDisplay dpy, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESA) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+
+#ifndef EGL_WL_bind_wayland_display
+#define EGL_WL_bind_wayland_display 1
+
+#define EGL_WAYLAND_BUFFER_WL			0x31D5 /* eglCreateImageKHR target */
+struct wl_display;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+#endif
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */
+#ifndef EGL_KHR_reusable_sync
+#define EGL_KHR_reusable_sync 1
+
+typedef void* EGLSyncKHR;
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+
+#define EGL_SYNC_STATUS_KHR			0x30F1
+#define EGL_SIGNALED_KHR			0x30F2
+#define EGL_UNSIGNALED_KHR			0x30F3
+#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5
+#define EGL_CONDITION_SATISFIED_KHR		0x30F6
+#define EGL_SYNC_TYPE_KHR			0x30F7
+#define EGL_SYNC_REUSABLE_KHR			0x30FA
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */
+#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull
+#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+/* EGL_MESA_screen extension  >>> PRELIMINARY <<< */
+#ifndef EGL_MESA_screen_surface
+#define EGL_MESA_screen_surface 1
+
+#define EGL_BAD_SCREEN_MESA                    0x4000
+#define EGL_BAD_MODE_MESA                      0x4001
+#define EGL_SCREEN_COUNT_MESA                  0x4002
+#define EGL_SCREEN_POSITION_MESA               0x4003
+#define EGL_SCREEN_POSITION_GRANULARITY_MESA   0x4004
+#define EGL_MODE_ID_MESA                       0x4005
+#define EGL_REFRESH_RATE_MESA                  0x4006
+#define EGL_OPTIMAL_MESA                       0x4007
+#define EGL_INTERLACED_MESA                    0x4008
+#define EGL_SCREEN_BIT_MESA                    0x08
+
+typedef khronos_uint32_t EGLScreenMESA;
+typedef khronos_uint32_t EGLModeMESA;
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglChooseModeMESA(EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetModesMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetModeAttribMESA(EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetScreensMESA(EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);
+EGLAPI EGLSurface EGLAPIENTRY eglCreateScreenSurfaceMESA(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglShowScreenSurfaceMESA(EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);
+EGLAPI EGLBoolean EGLAPIENTRY eglScreenPositionMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenSurfaceMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenModeMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);
+EGLAPI const char * EGLAPIENTRY eglQueryModeStringMESA(EGLDisplay dpy, EGLModeMESA mode);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSEMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMODESMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGetModeATTRIBMESA) (EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSCRREENSMESA) (EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESCREENSURFACEMESA) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSHOWSCREENSURFACEMESA) (EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSCREENPOSIITONMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENSURFACEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);
+typedef const char * (EGLAPIENTRYP PFNEGLQUERYMODESTRINGMESA) (EGLDisplay dpy, EGLModeMESA mode);
+
+#endif /* EGL_MESA_screen_surface */
+
+
+#ifndef EGL_MESA_copy_context
+#define EGL_MESA_copy_context 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglCopyContextMESA(EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYCONTEXTMESA) (EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);
+
+#endif /* EGL_MESA_copy_context */
+
+#ifndef EGL_MESA_drm_display
+#define EGL_MESA_drm_display 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd);
+
+#endif /* EGL_MESA_drm_display */
+
+#ifndef EGL_KHR_image_base
+#define EGL_KHR_image_base 1
+/* Most interfaces defined by EGL_KHR_image_pixmap above */
+#define EGL_IMAGE_PRESERVED_KHR			0x30D2	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_image_pixmap
+#define EGL_KHR_image_pixmap 1
+/* Interfaces defined by EGL_KHR_image above */
+#endif
+
+#ifndef EGL_IMG_context_priority
+#define EGL_IMG_context_priority 1
+#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100
+#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101
+#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102
+#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103
+#endif
+
+#ifndef EGL_KHR_lock_surface2
+#define EGL_KHR_lock_surface2 1
+#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110
+#endif
+
+#ifndef EGL_NV_coverage_sample
+#define EGL_NV_coverage_sample 1
+#define EGL_COVERAGE_BUFFERS_NV 0x30E0
+#define EGL_COVERAGE_SAMPLES_NV 0x30E1
+#endif
+
+#ifndef EGL_NV_depth_nonlinear
+#define EGL_NV_depth_nonlinear 1
+#define EGL_DEPTH_ENCODING_NV 0x30E2
+#define EGL_DEPTH_ENCODING_NONE_NV 0
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */
+#ifndef EGL_NV_sync
+#define EGL_NV_sync 1
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6
+#define EGL_SYNC_STATUS_NV			0x30E7
+#define EGL_SIGNALED_NV				0x30E8
+#define EGL_UNSIGNALED_NV			0x30E9
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001
+#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull
+#define EGL_ALREADY_SIGNALED_NV			0x30EA
+#define EGL_TIMEOUT_EXPIRED_NV			0x30EB
+#define EGL_CONDITION_SATISFIED_NV		0x30EC
+#define EGL_SYNC_TYPE_NV			0x30ED
+#define EGL_SYNC_CONDITION_NV			0x30EE
+#define EGL_SYNC_FENCE_NV			0x30EF
+#define EGL_NO_SYNC_NV				((EGLSyncNV)0)
+typedef void* EGLSyncNV;
+typedef khronos_utime_nanoseconds_t EGLTimeNV;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+EGLBoolean eglDestroySyncNV (EGLSyncNV sync);
+EGLBoolean eglFenceNV (EGLSyncNV sync);
+EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);
+EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */
+#ifndef EGL_KHR_fence_sync
+#define EGL_KHR_fence_sync 1
+/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0
+#define EGL_SYNC_CONDITION_KHR			0x30F8
+#define EGL_SYNC_FENCE_KHR			0x30F9
+#endif
+#endif
+
+#ifndef EGL_HI_clientpixmap
+#define EGL_HI_clientpixmap 1
+
+/* Surface Attribute */
+#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74
+/*
+ * Structure representing a client pixmap
+ * (pixmap's data is in client-space memory).
+ */
+struct EGLClientPixmapHI
+{
+	void*		pData;
+	EGLint		iWidth;
+	EGLint		iHeight;
+	EGLint		iStride;
+};
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif	/* EGL_HI_clientpixmap */
+
+#ifndef EGL_HI_colorformats
+#define EGL_HI_colorformats 1
+/* Config Attribute */
+#define EGL_COLOR_FORMAT_HI			0x8F70
+/* Color Formats */
+#define EGL_COLOR_RGB_HI			0x8F71
+#define EGL_COLOR_RGBA_HI			0x8F72
+#define EGL_COLOR_ARGB_HI			0x8F73
+#endif /* EGL_HI_colorformats */
+
+#ifndef EGL_NOK_swap_region
+#define EGL_NOK_swap_region 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);
+#endif
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);
+#endif
+
+
+#ifndef EGL_NOK_texture_from_pixmap
+#define EGL_NOK_texture_from_pixmap 1
+
+#define EGL_Y_INVERTED_NOK			0x307F
+#endif /* EGL_NOK_texture_from_pixmap */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 2fb729afc..d79155798 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -816,6 +816,7 @@ struct __DRIdri2ExtensionRec {
 
 #define __DRI_IMAGE_USE_SHARE		0x0001
 #define __DRI_IMAGE_USE_SCANOUT		0x0002
+#define __DRI_IMAGE_USE_CURSOR		0x0004
 
 /**
  * queryImage attributes
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index e17fd0ff6..743841be4 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -355,7 +355,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
 
 
 #ifndef M_PI
-#define M_PI (3.1415926536)
+#define M_PI (3.14159265358979323846)
 #endif
 
 #ifndef M_E
@@ -366,10 +366,6 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
 #define M_LOG2E     (1.4426950408889634074)
 #endif
 
-#ifndef ONE_DIV_LN2
-#define ONE_DIV_LN2 (1.442695040888963456)
-#endif
-
 #ifndef ONE_DIV_SQRT_LN2
 #define ONE_DIV_SQRT_LN2 (1.201122408786449815)
 #endif
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 1062cde9e..a9ef8fa4c 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -260,6 +260,7 @@ static const struct extension extension_table[] = {
    { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },
    { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },
    { "GL_AMD_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },
+   { "GL_AMD_seamless_cubemap_per_texture",        o(AMD_seamless_cubemap_per_texture),        GL,             2009 },
    { "GL_AMD_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
    { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },
    { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index fba65e890..29c8cfd23 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1339,6 +1339,7 @@ struct gl_sampler_object
    GLenum CompareFunc;		/**< GL_ARB_shadow */
    GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */
    GLenum sRGBDecode;           /**< GL_DECODE_EXT or GL_SKIP_DECODE_EXT */
+   GLboolean CubeMapSeamless;   /**< GL_AMD_seamless_cubemap_per_texture */
 
    /* deprecated sampler state */
    GLenum DepthMode;		/**< GL_ARB_depth_texture */
@@ -2885,6 +2886,7 @@ struct gl_extensions
    GLboolean OES_standard_derivatives;
    /* vendor extensions */
    GLboolean AMD_conservative_depth;
+   GLboolean AMD_seamless_cubemap_per_texture;
    GLboolean APPLE_client_storage;
    GLboolean APPLE_packed_pixels;
    GLboolean APPLE_vertex_array_object;
diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c
index 4a28c917c..229267f8c 100644
--- a/mesalib/src/mesa/main/samplerobj.c
+++ b/mesalib/src/mesa/main/samplerobj.c
@@ -133,6 +133,7 @@ _mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name)
    sampObj->CompareFunc = GL_LEQUAL;
    sampObj->CompareFailValue = 0.0;
    sampObj->sRGBDecode = GL_FALSE;
+   sampObj->CubeMapSeamless = GL_FALSE;
    sampObj->DepthMode = 0;
 }
 
@@ -567,6 +568,25 @@ set_sampler_max_anisotropy(struct gl_context *ctx,
 }
 
 
+static GLuint
+set_sampler_cube_map_seamless(struct gl_context *ctx,
+                              struct gl_sampler_object *samp, GLboolean param)
+{
+   if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+      return INVALID_PNAME;
+
+   if (samp->CubeMapSeamless == param)
+      return GL_FALSE;
+
+   if (param != GL_TRUE && param != GL_FALSE)
+      return INVALID_VALUE;
+
+   flush(ctx);
+   samp->CubeMapSeamless = param;
+   return GL_TRUE;
+}
+
+
 static void GLAPIENTRY
 _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
@@ -615,6 +635,9 @@ _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) param);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, param);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       /* fall-through */
    default:
@@ -696,6 +719,9 @@ _mesa_SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, param);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, (GLboolean) param);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       /* fall-through */
    default:
@@ -774,6 +800,9 @@ _mesa_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, params[0]);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       {
          GLfloat c[4];
@@ -862,6 +891,9 @@ _mesa_SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *params)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, params[0]);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, (GLboolean) params[0]);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       res = set_sampler_border_colorf(ctx, sampObj, params);
       break;
@@ -941,6 +973,9 @@ _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, params[0]);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       res = set_sampler_border_colori(ctx, sampObj, params);
       break;
@@ -1021,6 +1056,9 @@ _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params)
    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
       res = set_sampler_max_anisotropy(ctx, sampObj, (GLfloat) params[0]);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      res = set_sampler_cube_map_seamless(ctx, sampObj, params[0]);
+      break;
    case GL_TEXTURE_BORDER_COLOR:
       res = set_sampler_border_colorui(ctx, sampObj, params);
       break;
@@ -1110,6 +1148,11 @@ _mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
       params[2] = FLOAT_TO_INT(sampObj->BorderColor.f[2]);
       params[3] = FLOAT_TO_INT(sampObj->BorderColor.f[3]);
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         goto invalid_pname;
+      *params = sampObj->CubeMapSeamless;
+      break;
    default:
       goto invalid_pname;
    }
@@ -1178,6 +1221,11 @@ _mesa_GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
       params[2] = sampObj->BorderColor.f[2];
       params[3] = sampObj->BorderColor.f[3];
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         goto invalid_pname;
+      *params = (GLfloat) sampObj->CubeMapSeamless;
+      break;
    default:
       goto invalid_pname;
    }
@@ -1247,6 +1295,11 @@ _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
       params[2] = sampObj->BorderColor.i[2];
       params[3] = sampObj->BorderColor.i[3];
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         goto invalid_pname;
+      *params = sampObj->CubeMapSeamless;
+      break;
    default:
       goto invalid_pname;
    }
@@ -1316,6 +1369,11 @@ _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
       params[2] = sampObj->BorderColor.ui[2];
       params[3] = sampObj->BorderColor.ui[3];
       break;
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         goto invalid_pname;
+      *params = sampObj->CubeMapSeamless;
+      break;
    default:
       goto invalid_pname;
    }
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 43d6e52df..f2d214f93 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -141,6 +141,7 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->Sampler.CompareFunc = GL_LEQUAL;       /* ARB_shadow */
    obj->Sampler.CompareFailValue = 0.0F;       /* ARB_shadow_ambient */
    obj->Sampler.DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
+   obj->Sampler.CubeMapSeamless = GL_FALSE;
    obj->Swizzle[0] = GL_RED;
    obj->Swizzle[1] = GL_GREEN;
    obj->Swizzle[2] = GL_BLUE;
@@ -251,6 +252,7 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->Sampler.CompareMode = src->Sampler.CompareMode;
    dest->Sampler.CompareFunc = src->Sampler.CompareFunc;
    dest->Sampler.CompareFailValue = src->Sampler.CompareFailValue;
+   dest->Sampler.CubeMapSeamless = src->Sampler.CubeMapSeamless;
    dest->Sampler.DepthMode = src->Sampler.DepthMode;
    dest->_MaxLevel = src->_MaxLevel;
    dest->_MaxLambda = src->_MaxLambda;
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 74e1f4a1b..4b9dcb5d3 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -1,1458 +1,1490 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.5

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  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, sublicense,

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL 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.

- */

-

-/** 

- * \file texparam.c

- *

- * glTexParameter-related functions

- */

-

-

-#include "main/glheader.h"

-#include "main/colormac.h"

-#include "main/context.h"

-#include "main/enums.h"

-#include "main/formats.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-#include "main/mtypes.h"

-#include "main/state.h"

-#include "main/texcompress.h"

-#include "main/texparam.h"

-#include "main/teximage.h"

-#include "main/texstate.h"

-#include "main/texfetch.h"

-#include "program/prog_instruction.h"

-

-

-/**

- * Check if a coordinate wrap mode is supported for the texture target.

- * \return GL_TRUE if legal, GL_FALSE otherwise

- */

-static GLboolean 

-validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)

-{

-   const struct gl_extensions * const e = & ctx->Extensions;

-

-   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||

-       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {

-      /* any texture target */

-      return GL_TRUE;

-   }

-   else if (target != GL_TEXTURE_RECTANGLE_NV &&

-	    (wrap == GL_REPEAT ||

-	     (wrap == GL_MIRRORED_REPEAT &&

-	      e->ARB_texture_mirrored_repeat) ||

-	     (wrap == GL_MIRROR_CLAMP_EXT &&

-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||

-	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&

-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||

-	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&

-	      (e->EXT_texture_mirror_clamp)))) {

-      /* non-rectangle texture */

-      return GL_TRUE;

-   }

-

-   _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );

-   return GL_FALSE;

-}

-

-

-/**

- * Get current texture object for given target.

- * Return NULL if any error (and record the error).

- * Note that this is different from _mesa_select_tex_object() in that proxy

- * targets are not accepted.

- * Only the glGetTexLevelParameter() functions accept proxy targets.

- */

-static struct gl_texture_object *

-get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)

-{

-   struct gl_texture_unit *texUnit;

-

-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "gl%sTexParameter(current unit)", get ? "Get" : "");

-      return NULL;

-   }

-

-   texUnit = _mesa_get_current_tex_unit(ctx);

-

-   switch (target) {

-   case GL_TEXTURE_1D:

-      return texUnit->CurrentTex[TEXTURE_1D_INDEX];

-   case GL_TEXTURE_2D:

-      return texUnit->CurrentTex[TEXTURE_2D_INDEX];

-   case GL_TEXTURE_3D:

-      return texUnit->CurrentTex[TEXTURE_3D_INDEX];

-   case GL_TEXTURE_CUBE_MAP:

-      if (ctx->Extensions.ARB_texture_cube_map) {

-         return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];

-      }

-      break;

-   case GL_TEXTURE_RECTANGLE_NV:

-      if (ctx->Extensions.NV_texture_rectangle) {

-         return texUnit->CurrentTex[TEXTURE_RECT_INDEX];

-      }

-      break;

-   case GL_TEXTURE_1D_ARRAY_EXT:

-      if (ctx->Extensions.MESA_texture_array ||

-          ctx->Extensions.EXT_texture_array) {

-         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];

-      }

-      break;

-   case GL_TEXTURE_2D_ARRAY_EXT:

-      if (ctx->Extensions.MESA_texture_array ||

-          ctx->Extensions.EXT_texture_array) {

-         return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];

-      }

-      break;

-   default:

-      ;

-   }

-

-   _mesa_error(ctx, GL_INVALID_ENUM,

-                  "gl%sTexParameter(target)", get ? "Get" : "");

-   return NULL;

-}

-

-

-/**

- * Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.

- * \return -1 if error.

- */

-static GLint

-comp_to_swizzle(GLenum comp)

-{

-   switch (comp) {

-   case GL_RED:

-      return SWIZZLE_X;

-   case GL_GREEN:

-      return SWIZZLE_Y;

-   case GL_BLUE:

-      return SWIZZLE_Z;

-   case GL_ALPHA:

-      return SWIZZLE_W;

-   case GL_ZERO:

-      return SWIZZLE_ZERO;

-   case GL_ONE:

-      return SWIZZLE_ONE;

-   default:

-      return -1;

-   }

-}

-

-

-static void

-set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)

-{

-   ASSERT(comp < 4);

-   ASSERT(swz <= SWIZZLE_NIL);

-   {

-      GLuint mask = 0x7 << (3 * comp);

-      GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));

-      *swizzle = s;

-   }

-}

-

-

-/**

- * This is called just prior to changing any texture object state which

- * will not effect texture completeness.

- */

-static INLINE void

-flush(struct gl_context *ctx)

-{

-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-}

-

-

-/**

- * This is called just prior to changing any texture object state which

- * can effect texture completeness (texture base level, max level,

- * minification filter).

- * Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE

- * state flag and then mark the texture object as 'incomplete' so that any

- * per-texture derived state gets recomputed.

- */

-static INLINE void

-incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)

-{

-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-   texObj->_Complete = GL_FALSE;

-}

-

-

-/**

- * Set an integer-valued texture parameter

- * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise

- */

-static GLboolean

-set_tex_parameteri(struct gl_context *ctx,

-                   struct gl_texture_object *texObj,

-                   GLenum pname, const GLint *params)

-{

-   switch (pname) {

-   case GL_TEXTURE_MIN_FILTER:

-      if (texObj->Sampler.MinFilter == params[0])

-         return GL_FALSE;

-      switch (params[0]) {

-      case GL_NEAREST:

-      case GL_LINEAR:

-         incomplete(ctx, texObj);

-         texObj->Sampler.MinFilter = params[0];

-         return GL_TRUE;

-      case GL_NEAREST_MIPMAP_NEAREST:

-      case GL_LINEAR_MIPMAP_NEAREST:

-      case GL_NEAREST_MIPMAP_LINEAR:

-      case GL_LINEAR_MIPMAP_LINEAR:

-         if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {

-            incomplete(ctx, texObj);

-            texObj->Sampler.MinFilter = params[0];

-            return GL_TRUE;

-         }

-         /* fall-through */

-      default:

-         goto invalid_param;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_MAG_FILTER:

-      if (texObj->Sampler.MagFilter == params[0])

-         return GL_FALSE;

-      switch (params[0]) {

-      case GL_NEAREST:

-      case GL_LINEAR:

-         flush(ctx); /* does not effect completeness */

-         texObj->Sampler.MagFilter = params[0];

-         return GL_TRUE;

-      default:

-         goto invalid_param;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_WRAP_S:

-      if (texObj->Sampler.WrapS == params[0])

-         return GL_FALSE;

-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

-         flush(ctx);

-         texObj->Sampler.WrapS = params[0];

-         return GL_TRUE;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_WRAP_T:

-      if (texObj->Sampler.WrapT == params[0])

-         return GL_FALSE;

-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

-         flush(ctx);

-         texObj->Sampler.WrapT = params[0];

-         return GL_TRUE;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_WRAP_R:

-      if (texObj->Sampler.WrapR == params[0])

-         return GL_FALSE;

-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

-         flush(ctx);

-         texObj->Sampler.WrapR = params[0];

-         return GL_TRUE;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_BASE_LEVEL:

-      if (texObj->BaseLevel == params[0])

-         return GL_FALSE;

-      if (params[0] < 0 ||

-          (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {

-         _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glTexParameter(param=%d)", params[0]);

-         return GL_FALSE;

-      }

-      incomplete(ctx, texObj);

-      texObj->BaseLevel = params[0];

-      return GL_TRUE;

-

-   case GL_TEXTURE_MAX_LEVEL:

-      if (texObj->MaxLevel == params[0])

-         return GL_FALSE;

-      if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

-                     "glTexParameter(param=%d)", params[0]);

-         return GL_FALSE;

-      }

-      incomplete(ctx, texObj);

-      texObj->MaxLevel = params[0];

-      return GL_TRUE;

-

-   case GL_GENERATE_MIPMAP_SGIS:

-      if (texObj->GenerateMipmap != params[0]) {

-         /* no flush() */

-	 texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;

-	 return GL_TRUE;

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_COMPARE_MODE_ARB:

-      if (ctx->Extensions.ARB_shadow) {

-         if (texObj->Sampler.CompareMode == params[0])

-            return GL_FALSE;

-         if (params[0] == GL_NONE ||

-             params[0] == GL_COMPARE_R_TO_TEXTURE_ARB) {

-            flush(ctx);

-            texObj->Sampler.CompareMode = params[0];

-            return GL_TRUE;

-         }

-         goto invalid_param;

-      }

-      goto invalid_pname;

-

-   case GL_TEXTURE_COMPARE_FUNC_ARB:

-      if (ctx->Extensions.ARB_shadow) {

-         if (texObj->Sampler.CompareFunc == params[0])

-            return GL_FALSE;

-         switch (params[0]) {

-         case GL_LEQUAL:

-         case GL_GEQUAL:

-            flush(ctx);

-            texObj->Sampler.CompareFunc = params[0];

-            return GL_TRUE;

-         case GL_EQUAL:

-         case GL_NOTEQUAL:

-         case GL_LESS:

-         case GL_GREATER:

-         case GL_ALWAYS:

-         case GL_NEVER:

-            if (ctx->Extensions.EXT_shadow_funcs) {

-               flush(ctx);

-               texObj->Sampler.CompareFunc = params[0];

-               return GL_TRUE;

-            }

-            /* fall-through */

-         default:

-            goto invalid_param;

-         }

-      }

-      goto invalid_pname;

-

-   case GL_DEPTH_TEXTURE_MODE_ARB:

-      if (ctx->Extensions.ARB_depth_texture) {

-         if (texObj->Sampler.DepthMode == params[0])

-            return GL_FALSE;

-         if (params[0] == GL_LUMINANCE ||

-             params[0] == GL_INTENSITY ||

-             params[0] == GL_ALPHA ||

-             (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) {

-            flush(ctx);

-            texObj->Sampler.DepthMode = params[0];

-            return GL_TRUE;

-         }

-         goto invalid_param;

-      }

-      goto invalid_pname;

-

-#if FEATURE_OES_draw_texture

-   case GL_TEXTURE_CROP_RECT_OES:

-      texObj->CropRect[0] = params[0];

-      texObj->CropRect[1] = params[1];

-      texObj->CropRect[2] = params[2];

-      texObj->CropRect[3] = params[3];

-      return GL_TRUE;

-#endif

-

-   case GL_TEXTURE_SWIZZLE_R_EXT:

-   case GL_TEXTURE_SWIZZLE_G_EXT:

-   case GL_TEXTURE_SWIZZLE_B_EXT:

-   case GL_TEXTURE_SWIZZLE_A_EXT:

-      if (ctx->Extensions.EXT_texture_swizzle) {

-         const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

-         const GLint swz = comp_to_swizzle(params[0]);

-         if (swz < 0) {

-            _mesa_error(ctx, GL_INVALID_OPERATION,

-                        "glTexParameter(swizzle 0x%x)", params[0]);

-            return GL_FALSE;

-         }

-         ASSERT(comp < 4);

-         if (swz >= 0) {

-            flush(ctx);

-            texObj->Swizzle[comp] = params[0];

-            set_swizzle_component(&texObj->_Swizzle, comp, swz);

-            return GL_TRUE;

-         }

-      }

-      goto invalid_pname;

-

-   case GL_TEXTURE_SWIZZLE_RGBA_EXT:

-      if (ctx->Extensions.EXT_texture_swizzle) {

-         GLuint comp;

-         flush(ctx);

-         for (comp = 0; comp < 4; comp++) {

-            const GLint swz = comp_to_swizzle(params[comp]);

-            if (swz >= 0) {

-               texObj->Swizzle[comp] = params[comp];

-               set_swizzle_component(&texObj->_Swizzle, comp, swz);

-            }

-            else {

-               _mesa_error(ctx, GL_INVALID_OPERATION,

-                           "glTexParameter(swizzle 0x%x)", params[comp]);

-               return GL_FALSE;

-            }

-         }

-         return GL_TRUE;

-      }

-      goto invalid_pname;

-

-   case GL_TEXTURE_SRGB_DECODE_EXT:

-      if (ctx->Extensions.EXT_texture_sRGB_decode) {

-	 GLenum decode = params[0];

-	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {

-	    if (texObj->Sampler.sRGBDecode != decode) {

-	       flush(ctx);

-	       texObj->Sampler.sRGBDecode = decode;

-	       _mesa_update_fetch_functions(texObj);

-	    }

-	    return GL_TRUE;

-	 }

-      }

-      goto invalid_pname;

-

-   default:

-      goto invalid_pname;

-   }

-

-invalid_pname:

-   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=%s)",

-               _mesa_lookup_enum_by_nr(pname));

-   return GL_FALSE;

-

-invalid_param:

-   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=%s)",

-               _mesa_lookup_enum_by_nr(params[0]));

-   return GL_FALSE;

-}

-

-

-/**

- * Set a float-valued texture parameter

- * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise

- */

-static GLboolean

-set_tex_parameterf(struct gl_context *ctx,

-                   struct gl_texture_object *texObj,

-                   GLenum pname, const GLfloat *params)

-{

-   switch (pname) {

-   case GL_TEXTURE_MIN_LOD:

-      if (texObj->Sampler.MinLod == params[0])

-         return GL_FALSE;

-      flush(ctx);

-      texObj->Sampler.MinLod = params[0];

-      return GL_TRUE;

-

-   case GL_TEXTURE_MAX_LOD:

-      if (texObj->Sampler.MaxLod == params[0])

-         return GL_FALSE;

-      flush(ctx);

-      texObj->Sampler.MaxLod = params[0];

-      return GL_TRUE;

-

-   case GL_TEXTURE_PRIORITY:

-      flush(ctx);

-      texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);

-      return GL_TRUE;

-

-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

-      if (ctx->Extensions.EXT_texture_filter_anisotropic) {

-         if (texObj->Sampler.MaxAnisotropy == params[0])

-            return GL_FALSE;

-         if (params[0] < 1.0) {

-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );

-            return GL_FALSE;

-         }

-         flush(ctx);

-         /* clamp to max, that's what NVIDIA does */

-         texObj->Sampler.MaxAnisotropy = MIN2(params[0],

-                                      ctx->Const.MaxTextureMaxAnisotropy);

-         return GL_TRUE;

-      }

-      else {

-         static GLuint count = 0;

-         if (count++ < 10)

-            _mesa_error(ctx, GL_INVALID_ENUM,

-                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

-      if (ctx->Extensions.ARB_shadow_ambient) {

-         if (texObj->Sampler.CompareFailValue != params[0]) {

-            flush(ctx);

-            texObj->Sampler.CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);

-            return GL_TRUE;

-         }

-      }

-      else {

-         _mesa_error(ctx, GL_INVALID_ENUM,

-                    "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");

-      }

-      return GL_FALSE;

-

-   case GL_TEXTURE_LOD_BIAS:

-      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */

-      if (ctx->Extensions.EXT_texture_lod_bias) {

-         if (texObj->Sampler.LodBias != params[0]) {

-            flush(ctx);

-            texObj->Sampler.LodBias = params[0];

-            return GL_TRUE;

-         }

-         return GL_FALSE;

-      }

-      break;

-

-   case GL_TEXTURE_BORDER_COLOR:

-      flush(ctx);

-      /* ARB_texture_float disables clamping */

-      if (ctx->Extensions.ARB_texture_float) {

-         texObj->Sampler.BorderColor.f[RCOMP] = params[0];

-         texObj->Sampler.BorderColor.f[GCOMP] = params[1];

-         texObj->Sampler.BorderColor.f[BCOMP] = params[2];

-         texObj->Sampler.BorderColor.f[ACOMP] = params[3];

-      } else {

-         texObj->Sampler.BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);

-         texObj->Sampler.BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);

-         texObj->Sampler.BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);

-         texObj->Sampler.BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);

-      }

-      return GL_TRUE;

-

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

-   }

-   return GL_FALSE;

-}

-

-

-void GLAPIENTRY

-_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)

-{

-   GLboolean need_update;

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_MIN_FILTER:

-   case GL_TEXTURE_MAG_FILTER:

-   case GL_TEXTURE_WRAP_S:

-   case GL_TEXTURE_WRAP_T:

-   case GL_TEXTURE_WRAP_R:

-   case GL_TEXTURE_BASE_LEVEL:

-   case GL_TEXTURE_MAX_LEVEL:

-   case GL_GENERATE_MIPMAP_SGIS:

-   case GL_TEXTURE_COMPARE_MODE_ARB:

-   case GL_TEXTURE_COMPARE_FUNC_ARB:

-   case GL_DEPTH_TEXTURE_MODE_ARB:

-   case GL_TEXTURE_SRGB_DECODE_EXT:

-      {

-         /* convert float param to int */

-         GLint p[4];

-         p[0] = (GLint) param;

-         p[1] = p[2] = p[3] = 0;

-         need_update = set_tex_parameteri(ctx, texObj, pname, p);

-      }

-      break;

-   default:

-      {

-         /* this will generate an error if pname is illegal */

-         GLfloat p[4];

-         p[0] = param;

-         p[1] = p[2] = p[3] = 0.0F;

-         need_update = set_tex_parameterf(ctx, texObj, pname, p);

-      }

-   }

-

-   if (ctx->Driver.TexParameter && need_update) {

-      ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)

-{

-   GLboolean need_update;

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_MIN_FILTER:

-   case GL_TEXTURE_MAG_FILTER:

-   case GL_TEXTURE_WRAP_S:

-   case GL_TEXTURE_WRAP_T:

-   case GL_TEXTURE_WRAP_R:

-   case GL_TEXTURE_BASE_LEVEL:

-   case GL_TEXTURE_MAX_LEVEL:

-   case GL_GENERATE_MIPMAP_SGIS:

-   case GL_TEXTURE_COMPARE_MODE_ARB:

-   case GL_TEXTURE_COMPARE_FUNC_ARB:

-   case GL_DEPTH_TEXTURE_MODE_ARB:

-   case GL_TEXTURE_SRGB_DECODE_EXT:

-      {

-         /* convert float param to int */

-         GLint p[4];

-         p[0] = (GLint) params[0];

-         p[1] = p[2] = p[3] = 0;

-         need_update = set_tex_parameteri(ctx, texObj, pname, p);

-      }

-      break;

-

-#if FEATURE_OES_draw_texture

-   case GL_TEXTURE_CROP_RECT_OES:

-      {

-         /* convert float params to int */

-         GLint iparams[4];

-         iparams[0] = (GLint) params[0];

-         iparams[1] = (GLint) params[1];

-         iparams[2] = (GLint) params[2];

-         iparams[3] = (GLint) params[3];

-         need_update = set_tex_parameteri(ctx, texObj, pname, iparams);

-      }

-      break;

-#endif

-

-   default:

-      /* this will generate an error if pname is illegal */

-      need_update = set_tex_parameterf(ctx, texObj, pname, params);

-   }

-

-   if (ctx->Driver.TexParameter && need_update) {

-      ctx->Driver.TexParameter(ctx, target, texObj, pname, params);

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_TexParameteri(GLenum target, GLenum pname, GLint param)

-{

-   GLboolean need_update;

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_MIN_LOD:

-   case GL_TEXTURE_MAX_LOD:

-   case GL_TEXTURE_PRIORITY:

-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

-   case GL_TEXTURE_LOD_BIAS:

-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

-      {

-         GLfloat fparam[4];

-         fparam[0] = (GLfloat) param;

-         fparam[1] = fparam[2] = fparam[3] = 0.0F;

-         /* convert int param to float */

-         need_update = set_tex_parameterf(ctx, texObj, pname, fparam);

-      }

-      break;

-   default:

-      /* this will generate an error if pname is illegal */

-      {

-         GLint iparam[4];

-         iparam[0] = param;

-         iparam[1] = iparam[2] = iparam[3] = 0;

-         need_update = set_tex_parameteri(ctx, texObj, pname, iparam);

-      }

-   }

-

-   if (ctx->Driver.TexParameter && need_update) {

-      GLfloat fparam = (GLfloat) param;

-      ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)

-{

-   GLboolean need_update;

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_BORDER_COLOR:

-      {

-         /* convert int params to float */

-         GLfloat fparams[4];

-         fparams[0] = INT_TO_FLOAT(params[0]);

-         fparams[1] = INT_TO_FLOAT(params[1]);

-         fparams[2] = INT_TO_FLOAT(params[2]);

-         fparams[3] = INT_TO_FLOAT(params[3]);

-         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);

-      }

-      break;

-   case GL_TEXTURE_MIN_LOD:

-   case GL_TEXTURE_MAX_LOD:

-   case GL_TEXTURE_PRIORITY:

-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

-   case GL_TEXTURE_LOD_BIAS:

-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

-      {

-         /* convert int param to float */

-         GLfloat fparams[4];

-         fparams[0] = (GLfloat) params[0];

-         fparams[1] = fparams[2] = fparams[3] = 0.0F;

-         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);

-      }

-      break;

-   default:

-      /* this will generate an error if pname is illegal */

-      need_update = set_tex_parameteri(ctx, texObj, pname, params);

-   }

-

-   if (ctx->Driver.TexParameter && need_update) {

-      GLfloat fparams[4];

-      fparams[0] = INT_TO_FLOAT(params[0]);

-      if (pname == GL_TEXTURE_BORDER_COLOR ||

-          pname == GL_TEXTURE_CROP_RECT_OES) {

-         fparams[1] = INT_TO_FLOAT(params[1]);

-         fparams[2] = INT_TO_FLOAT(params[2]);

-         fparams[3] = INT_TO_FLOAT(params[3]);

-      }

-      ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);

-   }

-}

-

-

-/**

- * Set tex parameter to integer value(s).  Primarily intended to set

- * integer-valued texture border color (for integer-valued textures).

- * New in GL 3.0.

- */

-void GLAPIENTRY

-_mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)

-{

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_BORDER_COLOR:

-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-      /* set the integer-valued border color */

-      COPY_4V(texObj->Sampler.BorderColor.i, params);

-      break;

-   default:

-      _mesa_TexParameteriv(target, pname, params);

-      break;

-   }

-   /* XXX no driver hook for TexParameterIiv() yet */

-}

-

-

-/**

- * Set tex parameter to unsigned integer value(s).  Primarily intended to set

- * uint-valued texture border color (for integer-valued textures).

- * New in GL 3.0

- */

-void GLAPIENTRY

-_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)

-{

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_FALSE);

-   if (!texObj)

-      return;

-

-   switch (pname) {

-   case GL_TEXTURE_BORDER_COLOR:

-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-      /* set the unsigned integer-valued border color */

-      COPY_4V(texObj->Sampler.BorderColor.ui, params);

-      break;

-   default:

-      _mesa_TexParameteriv(target, pname, (const GLint *) params);

-      break;

-   }

-   /* XXX no driver hook for TexParameterIuiv() yet */

-}

-

-

-

-

-void GLAPIENTRY

-_mesa_GetTexLevelParameterfv( GLenum target, GLint level,

-                              GLenum pname, GLfloat *params )

-{

-   GLint iparam;

-   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );

-   *params = (GLfloat) iparam;

-}

-

-

-void GLAPIENTRY

-_mesa_GetTexLevelParameteriv( GLenum target, GLint level,

-                              GLenum pname, GLint *params )

-{

-   const struct gl_texture_unit *texUnit;

-   struct gl_texture_object *texObj;

-   const struct gl_texture_image *img = NULL;

-   GLint maxLevels;

-   gl_format texFormat;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glGetTexLevelParameteriv(current unit)");

-      return;

-   }

-

-   texUnit = _mesa_get_current_tex_unit(ctx);

-

-   /* this will catch bad target values */

-   maxLevels = _mesa_max_texture_levels(ctx, target);

-   if (maxLevels == 0) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glGetTexLevelParameter[if]v(target=0x%x)", target);

-      return;

-   }

-

-   if (level < 0 || level >= maxLevels) {

-      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );

-      return;

-   }

-

-   texObj = _mesa_select_tex_object(ctx, texUnit, target);

-

-   img = _mesa_select_tex_image(ctx, texObj, target, level);

-   if (!img || !img->TexFormat) {

-      /* undefined texture image */

-      if (pname == GL_TEXTURE_COMPONENTS)

-         *params = 1;

-      else

-         *params = 0;

-      return;

-   }

-

-   texFormat = img->TexFormat;

-

-   switch (pname) {

-      case GL_TEXTURE_WIDTH:

-         *params = img->Width;

-         break;

-      case GL_TEXTURE_HEIGHT:

-         *params = img->Height;

-         break;

-      case GL_TEXTURE_DEPTH:

-         *params = img->Depth;

-         break;

-      case GL_TEXTURE_INTERNAL_FORMAT:

-         if (_mesa_is_format_compressed(texFormat)) {

-            /* need to return the actual compressed format */

-            *params = _mesa_compressed_format_to_glenum(ctx, texFormat);

-         }

-         else {

-            /* return the user's requested internal format */

-            *params = img->InternalFormat;

-         }

-         break;

-      case GL_TEXTURE_BORDER:

-         *params = img->Border;

-         break;

-      case GL_TEXTURE_RED_SIZE:

-         if (img->_BaseFormat == GL_RED) {

-            *params = _mesa_get_format_bits(texFormat, pname);

-	    break;

-	 }

-	 /* FALLTHROUGH */

-      case GL_TEXTURE_GREEN_SIZE:

-         if (img->_BaseFormat == GL_RG) {

-            *params = _mesa_get_format_bits(texFormat, pname);

-	    break;

-	 }

-	 /* FALLTHROUGH */

-      case GL_TEXTURE_BLUE_SIZE:

-         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)

-            *params = _mesa_get_format_bits(texFormat, pname);

-         else

-            *params = 0;

-         break;

-      case GL_TEXTURE_ALPHA_SIZE:

-         if (img->_BaseFormat == GL_ALPHA ||

-             img->_BaseFormat == GL_LUMINANCE_ALPHA ||

-             img->_BaseFormat == GL_RGBA)

-            *params = _mesa_get_format_bits(texFormat, pname);

-         else

-            *params = 0;

-         break;

-      case GL_TEXTURE_INTENSITY_SIZE:

-         if (img->_BaseFormat != GL_INTENSITY)

-            *params = 0;

-         else {

-            *params = _mesa_get_format_bits(texFormat, pname);

-            if (*params == 0) {

-               /* intensity probably stored as rgb texture */

-               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),

-                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));

-            }

-         }

-         break;

-      case GL_TEXTURE_LUMINANCE_SIZE:

-         if (img->_BaseFormat != GL_LUMINANCE &&

-             img->_BaseFormat != GL_LUMINANCE_ALPHA)

-            *params = 0;

-         else {

-            *params = _mesa_get_format_bits(texFormat, pname);

-            if (*params == 0) {

-               /* luminance probably stored as rgb texture */

-               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),

-                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));

-            }

-         }

-         break;

-      case GL_TEXTURE_INDEX_SIZE_EXT:

-         if (img->_BaseFormat == GL_COLOR_INDEX)

-            *params = _mesa_get_format_bits(texFormat, pname);

-         else

-            *params = 0;

-         break;

-      case GL_TEXTURE_DEPTH_SIZE_ARB:

-         if (ctx->Extensions.ARB_depth_texture)

-            *params = _mesa_get_format_bits(texFormat, pname);

-         else

-            goto invalid_pname;

-         break;

-      case GL_TEXTURE_STENCIL_SIZE_EXT:

-         if (ctx->Extensions.EXT_packed_depth_stencil ||

-             ctx->Extensions.ARB_framebuffer_object) {

-            *params = _mesa_get_format_bits(texFormat, pname);

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_SHARED_SIZE:

-         if (ctx->VersionMajor >= 3 ||

-             ctx->Extensions.EXT_texture_shared_exponent) {

-            *params = texFormat == MESA_FORMAT_RGB9_E5_FLOAT ? 5 : 0;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-

-      /* GL_ARB_texture_compression */

-      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:

-	 if (_mesa_is_format_compressed(texFormat) &&

-             !_mesa_is_proxy_texture(target)) {

-            *params = _mesa_format_image_size(texFormat, img->Width,

-                                              img->Height, img->Depth);

-	 }

-	 else {

-	    _mesa_error(ctx, GL_INVALID_OPERATION,

-			"glGetTexLevelParameter[if]v(pname)");

-	 }

-         break;

-      case GL_TEXTURE_COMPRESSED:

-         *params = (GLint) _mesa_is_format_compressed(texFormat);

-         break;

-

-      /* GL_ARB_texture_float */

-      case GL_TEXTURE_RED_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_GREEN_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_BLUE_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_BLUE_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_ALPHA_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_ALPHA_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_LUMINANCE_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_LUMINANCE_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_INTENSITY_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_INTENSITY_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-      case GL_TEXTURE_DEPTH_TYPE_ARB:

-         if (ctx->Extensions.ARB_texture_float) {

-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_DEPTH_SIZE) ?

-               _mesa_get_format_datatype(texFormat) : GL_NONE;

-         }

-         else {

-            goto invalid_pname;

-         }

-         break;

-

-      default:

-         goto invalid_pname;

-   }

-

-   /* no error if we get here */

-   return;

-

-invalid_pname:

-   _mesa_error(ctx, GL_INVALID_ENUM,

-               "glGetTexLevelParameter[if]v(pname=%s)",

-               _mesa_lookup_enum_by_nr(pname));

-}

-

-

-

-void GLAPIENTRY

-_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )

-{

-   struct gl_texture_object *obj;

-   GLboolean error = GL_FALSE;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   obj = get_texobj(ctx, target, GL_TRUE);

-   if (!obj)

-      return;

-

-   _mesa_lock_texture(ctx, obj);

-   switch (pname) {

-      case GL_TEXTURE_MAG_FILTER:

-	 *params = ENUM_TO_FLOAT(obj->Sampler.MagFilter);

-	 break;

-      case GL_TEXTURE_MIN_FILTER:

-         *params = ENUM_TO_FLOAT(obj->Sampler.MinFilter);

-         break;

-      case GL_TEXTURE_WRAP_S:

-         *params = ENUM_TO_FLOAT(obj->Sampler.WrapS);

-         break;

-      case GL_TEXTURE_WRAP_T:

-         *params = ENUM_TO_FLOAT(obj->Sampler.WrapT);

-         break;

-      case GL_TEXTURE_WRAP_R:

-         *params = ENUM_TO_FLOAT(obj->Sampler.WrapR);

-         break;

-      case GL_TEXTURE_BORDER_COLOR:

-         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))

-            _mesa_update_state_locked(ctx);

-         if(ctx->Color._ClampFragmentColor)

-         {

-            params[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);

-            params[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);

-            params[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);

-            params[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);

-         }

-         else

-         {

-            params[0] = obj->Sampler.BorderColor.f[0];

-            params[1] = obj->Sampler.BorderColor.f[1];

-            params[2] = obj->Sampler.BorderColor.f[2];

-            params[3] = obj->Sampler.BorderColor.f[3];

-         }

-         break;

-      case GL_TEXTURE_RESIDENT:

-         {

-            GLboolean resident;

-            if (ctx->Driver.IsTextureResident)

-               resident = ctx->Driver.IsTextureResident(ctx, obj);

-            else

-               resident = GL_TRUE;

-            *params = ENUM_TO_FLOAT(resident);

-         }

-         break;

-      case GL_TEXTURE_PRIORITY:

-         *params = obj->Priority;

-         break;

-      case GL_TEXTURE_MIN_LOD:

-         *params = obj->Sampler.MinLod;

-         break;

-      case GL_TEXTURE_MAX_LOD:

-         *params = obj->Sampler.MaxLod;

-         break;

-      case GL_TEXTURE_BASE_LEVEL:

-         *params = (GLfloat) obj->BaseLevel;

-         break;

-      case GL_TEXTURE_MAX_LEVEL:

-         *params = (GLfloat) obj->MaxLevel;

-         break;

-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:

-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {

-            *params = obj->Sampler.MaxAnisotropy;

-         }

-	 else

-	    error = GL_TRUE;

-         break;

-      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

-         if (ctx->Extensions.ARB_shadow_ambient) {

-            *params = obj->Sampler.CompareFailValue;

-         }

-	 else 

-	    error = GL_TRUE;

-         break;

-      case GL_GENERATE_MIPMAP_SGIS:

-	 *params = (GLfloat) obj->GenerateMipmap;

-         break;

-      case GL_TEXTURE_COMPARE_MODE_ARB:

-         if (ctx->Extensions.ARB_shadow) {

-            *params = (GLfloat) obj->Sampler.CompareMode;

-         }

-	 else 

-	    error = GL_TRUE;

-         break;

-      case GL_TEXTURE_COMPARE_FUNC_ARB:

-         if (ctx->Extensions.ARB_shadow) {

-            *params = (GLfloat) obj->Sampler.CompareFunc;

-         }

-	 else 

-	    error = GL_TRUE;

-         break;

-      case GL_DEPTH_TEXTURE_MODE_ARB:

-         if (ctx->Extensions.ARB_depth_texture) {

-            *params = (GLfloat) obj->Sampler.DepthMode;

-         }

-	 else 

-	    error = GL_TRUE;

-         break;

-      case GL_TEXTURE_LOD_BIAS:

-         if (ctx->Extensions.EXT_texture_lod_bias) {

-            *params = obj->Sampler.LodBias;

-         }

-	 else 

-	    error = GL_TRUE;

-         break;

-#if FEATURE_OES_draw_texture

-      case GL_TEXTURE_CROP_RECT_OES:

-         params[0] = obj->CropRect[0];

-         params[1] = obj->CropRect[1];

-         params[2] = obj->CropRect[2];

-         params[3] = obj->CropRect[3];

-         break;

-#endif

-

-      case GL_TEXTURE_SWIZZLE_R_EXT:

-      case GL_TEXTURE_SWIZZLE_G_EXT:

-      case GL_TEXTURE_SWIZZLE_B_EXT:

-      case GL_TEXTURE_SWIZZLE_A_EXT:

-         if (ctx->Extensions.EXT_texture_swizzle) {

-            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

-            *params = (GLfloat) obj->Swizzle[comp];

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-

-      case GL_TEXTURE_SWIZZLE_RGBA_EXT:

-         if (ctx->Extensions.EXT_texture_swizzle) {

-            GLuint comp;

-            for (comp = 0; comp < 4; comp++) {

-               params[comp] = (GLfloat) obj->Swizzle[comp];

-            }

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-

-      default:

-	 error = GL_TRUE;

-	 break;

-   }

-

-   if (error)

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",

-		  pname);

-

-   _mesa_unlock_texture(ctx, obj);

-}

-

-

-void GLAPIENTRY

-_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )

-{

-   struct gl_texture_object *obj;

-   GLboolean error = GL_FALSE;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-    obj = get_texobj(ctx, target, GL_TRUE);

-    if (!obj)

-       return;

-

-   _mesa_lock_texture(ctx, obj);

-   switch (pname) {

-      case GL_TEXTURE_MAG_FILTER:

-         *params = (GLint) obj->Sampler.MagFilter;

-         break;;

-      case GL_TEXTURE_MIN_FILTER:

-         *params = (GLint) obj->Sampler.MinFilter;

-         break;;

-      case GL_TEXTURE_WRAP_S:

-         *params = (GLint) obj->Sampler.WrapS;

-         break;;

-      case GL_TEXTURE_WRAP_T:

-         *params = (GLint) obj->Sampler.WrapT;

-         break;;

-      case GL_TEXTURE_WRAP_R:

-         *params = (GLint) obj->Sampler.WrapR;

-         break;;

-      case GL_TEXTURE_BORDER_COLOR:

-         {

-            GLfloat b[4];

-            b[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);

-            b[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);

-            b[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);

-            b[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);

-            params[0] = FLOAT_TO_INT(b[0]);

-            params[1] = FLOAT_TO_INT(b[1]);

-            params[2] = FLOAT_TO_INT(b[2]);

-            params[3] = FLOAT_TO_INT(b[3]);

-         }

-         break;;

-      case GL_TEXTURE_RESIDENT:

-         {

-            GLboolean resident;

-            if (ctx->Driver.IsTextureResident)

-               resident = ctx->Driver.IsTextureResident(ctx, obj);

-            else

-               resident = GL_TRUE;

-            *params = (GLint) resident;

-         }

-         break;;

-      case GL_TEXTURE_PRIORITY:

-         *params = FLOAT_TO_INT(obj->Priority);

-         break;;

-      case GL_TEXTURE_MIN_LOD:

-         *params = (GLint) obj->Sampler.MinLod;

-         break;;

-      case GL_TEXTURE_MAX_LOD:

-         *params = (GLint) obj->Sampler.MaxLod;

-         break;;

-      case GL_TEXTURE_BASE_LEVEL:

-         *params = obj->BaseLevel;

-         break;;

-      case GL_TEXTURE_MAX_LEVEL:

-         *params = obj->MaxLevel;

-         break;;

-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:

-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {

-            *params = (GLint) obj->Sampler.MaxAnisotropy;

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

-         if (ctx->Extensions.ARB_shadow_ambient) {

-            *params = (GLint) FLOAT_TO_INT(obj->Sampler.CompareFailValue);

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-      case GL_GENERATE_MIPMAP_SGIS:

-	 *params = (GLint) obj->GenerateMipmap;

-         break;

-      case GL_TEXTURE_COMPARE_MODE_ARB:

-         if (ctx->Extensions.ARB_shadow) {

-            *params = (GLint) obj->Sampler.CompareMode;

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-      case GL_TEXTURE_COMPARE_FUNC_ARB:

-         if (ctx->Extensions.ARB_shadow) {

-            *params = (GLint) obj->Sampler.CompareFunc;

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-      case GL_DEPTH_TEXTURE_MODE_ARB:

-         if (ctx->Extensions.ARB_depth_texture) {

-            *params = (GLint) obj->Sampler.DepthMode;

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-      case GL_TEXTURE_LOD_BIAS:

-         if (ctx->Extensions.EXT_texture_lod_bias) {

-            *params = (GLint) obj->Sampler.LodBias;

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-#if FEATURE_OES_draw_texture

-      case GL_TEXTURE_CROP_RECT_OES:

-         params[0] = obj->CropRect[0];

-         params[1] = obj->CropRect[1];

-         params[2] = obj->CropRect[2];

-         params[3] = obj->CropRect[3];

-         break;

-#endif

-      case GL_TEXTURE_SWIZZLE_R_EXT:

-      case GL_TEXTURE_SWIZZLE_G_EXT:

-      case GL_TEXTURE_SWIZZLE_B_EXT:

-      case GL_TEXTURE_SWIZZLE_A_EXT:

-         if (ctx->Extensions.EXT_texture_swizzle) {

-            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

-            *params = obj->Swizzle[comp];

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-

-      case GL_TEXTURE_SWIZZLE_RGBA_EXT:

-         if (ctx->Extensions.EXT_texture_swizzle) {

-            COPY_4V(params, obj->Swizzle);

-         }

-         else {

-            error = GL_TRUE;

-         }

-         break;

-

-      default:

-         ; /* silence warnings */

-   }

-

-   if (error)

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)",

-		  pname);

-

-   _mesa_unlock_texture(ctx, obj);

-}

-

-

-/** New in GL 3.0 */

-void GLAPIENTRY

-_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)

-{

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_TRUE);

-   

-   switch (pname) {

-   case GL_TEXTURE_BORDER_COLOR:

-      COPY_4V(params, texObj->Sampler.BorderColor.i);

-      break;

-   default:

-      _mesa_GetTexParameteriv(target, pname, params);

-   }

-}

-

-

-/** New in GL 3.0 */

-void GLAPIENTRY

-_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)

-{

-   struct gl_texture_object *texObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   texObj = get_texobj(ctx, target, GL_TRUE);

-   

-   switch (pname) {

-   case GL_TEXTURE_BORDER_COLOR:

-      COPY_4V(params, texObj->Sampler.BorderColor.i);

-      break;

-   default:

-      {

-         GLint ip[4];

-         _mesa_GetTexParameteriv(target, pname, ip);

-         params[0] = ip[0];

-         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT || 

-             pname == GL_TEXTURE_CROP_RECT_OES) {

-            params[1] = ip[1];

-            params[2] = ip[2];

-            params[3] = ip[3];

-         }

-      }

-   }

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  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, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL 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.
+ */
+
+/** 
+ * \file texparam.c
+ *
+ * glTexParameter-related functions
+ */
+
+
+#include "main/glheader.h"
+#include "main/colormac.h"
+#include "main/context.h"
+#include "main/enums.h"
+#include "main/formats.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+#include "main/state.h"
+#include "main/texcompress.h"
+#include "main/texparam.h"
+#include "main/teximage.h"
+#include "main/texstate.h"
+#include "main/texfetch.h"
+#include "program/prog_instruction.h"
+
+
+/**
+ * Check if a coordinate wrap mode is supported for the texture target.
+ * \return GL_TRUE if legal, GL_FALSE otherwise
+ */
+static GLboolean 
+validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
+{
+   const struct gl_extensions * const e = & ctx->Extensions;
+
+   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||
+       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {
+      /* any texture target */
+      return GL_TRUE;
+   }
+   else if (target != GL_TEXTURE_RECTANGLE_NV &&
+	    (wrap == GL_REPEAT ||
+	     (wrap == GL_MIRRORED_REPEAT &&
+	      e->ARB_texture_mirrored_repeat) ||
+	     (wrap == GL_MIRROR_CLAMP_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&
+	      (e->EXT_texture_mirror_clamp)))) {
+      /* non-rectangle texture */
+      return GL_TRUE;
+   }
+
+   _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );
+   return GL_FALSE;
+}
+
+
+/**
+ * Get current texture object for given target.
+ * Return NULL if any error (and record the error).
+ * Note that this is different from _mesa_select_tex_object() in that proxy
+ * targets are not accepted.
+ * Only the glGetTexLevelParameter() functions accept proxy targets.
+ */
+static struct gl_texture_object *
+get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
+{
+   struct gl_texture_unit *texUnit;
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "gl%sTexParameter(current unit)", get ? "Get" : "");
+      return NULL;
+   }
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
+
+   switch (target) {
+   case GL_TEXTURE_1D:
+      return texUnit->CurrentTex[TEXTURE_1D_INDEX];
+   case GL_TEXTURE_2D:
+      return texUnit->CurrentTex[TEXTURE_2D_INDEX];
+   case GL_TEXTURE_3D:
+      return texUnit->CurrentTex[TEXTURE_3D_INDEX];
+   case GL_TEXTURE_CUBE_MAP:
+      if (ctx->Extensions.ARB_texture_cube_map) {
+         return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];
+      }
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      if (ctx->Extensions.NV_texture_rectangle) {
+         return texUnit->CurrentTex[TEXTURE_RECT_INDEX];
+      }
+      break;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      if (ctx->Extensions.MESA_texture_array ||
+          ctx->Extensions.EXT_texture_array) {
+         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
+      }
+      break;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      if (ctx->Extensions.MESA_texture_array ||
+          ctx->Extensions.EXT_texture_array) {
+         return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
+      }
+      break;
+   default:
+      ;
+   }
+
+   _mesa_error(ctx, GL_INVALID_ENUM,
+                  "gl%sTexParameter(target)", get ? "Get" : "");
+   return NULL;
+}
+
+
+/**
+ * Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.
+ * \return -1 if error.
+ */
+static GLint
+comp_to_swizzle(GLenum comp)
+{
+   switch (comp) {
+   case GL_RED:
+      return SWIZZLE_X;
+   case GL_GREEN:
+      return SWIZZLE_Y;
+   case GL_BLUE:
+      return SWIZZLE_Z;
+   case GL_ALPHA:
+      return SWIZZLE_W;
+   case GL_ZERO:
+      return SWIZZLE_ZERO;
+   case GL_ONE:
+      return SWIZZLE_ONE;
+   default:
+      return -1;
+   }
+}
+
+
+static void
+set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
+{
+   ASSERT(comp < 4);
+   ASSERT(swz <= SWIZZLE_NIL);
+   {
+      GLuint mask = 0x7 << (3 * comp);
+      GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));
+      *swizzle = s;
+   }
+}
+
+
+/**
+ * This is called just prior to changing any texture object state which
+ * will not effect texture completeness.
+ */
+static INLINE void
+flush(struct gl_context *ctx)
+{
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+}
+
+
+/**
+ * This is called just prior to changing any texture object state which
+ * can effect texture completeness (texture base level, max level,
+ * minification filter).
+ * Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE
+ * state flag and then mark the texture object as 'incomplete' so that any
+ * per-texture derived state gets recomputed.
+ */
+static INLINE void
+incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)
+{
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+   texObj->_Complete = GL_FALSE;
+}
+
+
+/**
+ * Set an integer-valued texture parameter
+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
+ */
+static GLboolean
+set_tex_parameteri(struct gl_context *ctx,
+                   struct gl_texture_object *texObj,
+                   GLenum pname, const GLint *params)
+{
+   switch (pname) {
+   case GL_TEXTURE_MIN_FILTER:
+      if (texObj->Sampler.MinFilter == params[0])
+         return GL_FALSE;
+      switch (params[0]) {
+      case GL_NEAREST:
+      case GL_LINEAR:
+         incomplete(ctx, texObj);
+         texObj->Sampler.MinFilter = params[0];
+         return GL_TRUE;
+      case GL_NEAREST_MIPMAP_NEAREST:
+      case GL_LINEAR_MIPMAP_NEAREST:
+      case GL_NEAREST_MIPMAP_LINEAR:
+      case GL_LINEAR_MIPMAP_LINEAR:
+         if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
+            incomplete(ctx, texObj);
+            texObj->Sampler.MinFilter = params[0];
+            return GL_TRUE;
+         }
+         /* fall-through */
+      default:
+         goto invalid_param;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_MAG_FILTER:
+      if (texObj->Sampler.MagFilter == params[0])
+         return GL_FALSE;
+      switch (params[0]) {
+      case GL_NEAREST:
+      case GL_LINEAR:
+         flush(ctx); /* does not effect completeness */
+         texObj->Sampler.MagFilter = params[0];
+         return GL_TRUE;
+      default:
+         goto invalid_param;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_WRAP_S:
+      if (texObj->Sampler.WrapS == params[0])
+         return GL_FALSE;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
+         flush(ctx);
+         texObj->Sampler.WrapS = params[0];
+         return GL_TRUE;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_WRAP_T:
+      if (texObj->Sampler.WrapT == params[0])
+         return GL_FALSE;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
+         flush(ctx);
+         texObj->Sampler.WrapT = params[0];
+         return GL_TRUE;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_WRAP_R:
+      if (texObj->Sampler.WrapR == params[0])
+         return GL_FALSE;
+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
+         flush(ctx);
+         texObj->Sampler.WrapR = params[0];
+         return GL_TRUE;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_BASE_LEVEL:
+      if (texObj->BaseLevel == params[0])
+         return GL_FALSE;
+      if (params[0] < 0 ||
+          (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexParameter(param=%d)", params[0]);
+         return GL_FALSE;
+      }
+      incomplete(ctx, texObj);
+      texObj->BaseLevel = params[0];
+      return GL_TRUE;
+
+   case GL_TEXTURE_MAX_LEVEL:
+      if (texObj->MaxLevel == params[0])
+         return GL_FALSE;
+      if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexParameter(param=%d)", params[0]);
+         return GL_FALSE;
+      }
+      incomplete(ctx, texObj);
+      texObj->MaxLevel = params[0];
+      return GL_TRUE;
+
+   case GL_GENERATE_MIPMAP_SGIS:
+      if (texObj->GenerateMipmap != params[0]) {
+         /* no flush() */
+	 texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+	 return GL_TRUE;
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+      if (ctx->Extensions.ARB_shadow) {
+         if (texObj->Sampler.CompareMode == params[0])
+            return GL_FALSE;
+         if (params[0] == GL_NONE ||
+             params[0] == GL_COMPARE_R_TO_TEXTURE_ARB) {
+            flush(ctx);
+            texObj->Sampler.CompareMode = params[0];
+            return GL_TRUE;
+         }
+         goto invalid_param;
+      }
+      goto invalid_pname;
+
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+      if (ctx->Extensions.ARB_shadow) {
+         if (texObj->Sampler.CompareFunc == params[0])
+            return GL_FALSE;
+         switch (params[0]) {
+         case GL_LEQUAL:
+         case GL_GEQUAL:
+            flush(ctx);
+            texObj->Sampler.CompareFunc = params[0];
+            return GL_TRUE;
+         case GL_EQUAL:
+         case GL_NOTEQUAL:
+         case GL_LESS:
+         case GL_GREATER:
+         case GL_ALWAYS:
+         case GL_NEVER:
+            if (ctx->Extensions.EXT_shadow_funcs) {
+               flush(ctx);
+               texObj->Sampler.CompareFunc = params[0];
+               return GL_TRUE;
+            }
+            /* fall-through */
+         default:
+            goto invalid_param;
+         }
+      }
+      goto invalid_pname;
+
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+      if (ctx->Extensions.ARB_depth_texture) {
+         if (texObj->Sampler.DepthMode == params[0])
+            return GL_FALSE;
+         if (params[0] == GL_LUMINANCE ||
+             params[0] == GL_INTENSITY ||
+             params[0] == GL_ALPHA ||
+             (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) {
+            flush(ctx);
+            texObj->Sampler.DepthMode = params[0];
+            return GL_TRUE;
+         }
+         goto invalid_param;
+      }
+      goto invalid_pname;
+
+#if FEATURE_OES_draw_texture
+   case GL_TEXTURE_CROP_RECT_OES:
+      texObj->CropRect[0] = params[0];
+      texObj->CropRect[1] = params[1];
+      texObj->CropRect[2] = params[2];
+      texObj->CropRect[3] = params[3];
+      return GL_TRUE;
+#endif
+
+   case GL_TEXTURE_SWIZZLE_R_EXT:
+   case GL_TEXTURE_SWIZZLE_G_EXT:
+   case GL_TEXTURE_SWIZZLE_B_EXT:
+   case GL_TEXTURE_SWIZZLE_A_EXT:
+      if (ctx->Extensions.EXT_texture_swizzle) {
+         const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+         const GLint swz = comp_to_swizzle(params[0]);
+         if (swz < 0) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glTexParameter(swizzle 0x%x)", params[0]);
+            return GL_FALSE;
+         }
+         ASSERT(comp < 4);
+         if (swz >= 0) {
+            flush(ctx);
+            texObj->Swizzle[comp] = params[0];
+            set_swizzle_component(&texObj->_Swizzle, comp, swz);
+            return GL_TRUE;
+         }
+      }
+      goto invalid_pname;
+
+   case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+      if (ctx->Extensions.EXT_texture_swizzle) {
+         GLuint comp;
+         flush(ctx);
+         for (comp = 0; comp < 4; comp++) {
+            const GLint swz = comp_to_swizzle(params[comp]);
+            if (swz >= 0) {
+               texObj->Swizzle[comp] = params[comp];
+               set_swizzle_component(&texObj->_Swizzle, comp, swz);
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glTexParameter(swizzle 0x%x)", params[comp]);
+               return GL_FALSE;
+            }
+         }
+         return GL_TRUE;
+      }
+      goto invalid_pname;
+
+   case GL_TEXTURE_SRGB_DECODE_EXT:
+      if (ctx->Extensions.EXT_texture_sRGB_decode) {
+	 GLenum decode = params[0];
+	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {
+	    if (texObj->Sampler.sRGBDecode != decode) {
+	       flush(ctx);
+	       texObj->Sampler.sRGBDecode = decode;
+	       _mesa_update_fetch_functions(texObj);
+	    }
+	    return GL_TRUE;
+	 }
+      }
+      goto invalid_pname;
+
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {
+         GLenum param = params[0];
+         if (param != GL_TRUE && param != GL_FALSE) {
+            goto invalid_param;
+         }
+         if (param != texObj->Sampler.CubeMapSeamless) {
+            flush(ctx);
+            texObj->Sampler.CubeMapSeamless = param;
+         }
+         return GL_TRUE;
+      }
+      goto invalid_pname;
+
+   default:
+      goto invalid_pname;
+   }
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+   return GL_FALSE;
+
+invalid_param:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=%s)",
+               _mesa_lookup_enum_by_nr(params[0]));
+   return GL_FALSE;
+}
+
+
+/**
+ * Set a float-valued texture parameter
+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
+ */
+static GLboolean
+set_tex_parameterf(struct gl_context *ctx,
+                   struct gl_texture_object *texObj,
+                   GLenum pname, const GLfloat *params)
+{
+   switch (pname) {
+   case GL_TEXTURE_MIN_LOD:
+      if (texObj->Sampler.MinLod == params[0])
+         return GL_FALSE;
+      flush(ctx);
+      texObj->Sampler.MinLod = params[0];
+      return GL_TRUE;
+
+   case GL_TEXTURE_MAX_LOD:
+      if (texObj->Sampler.MaxLod == params[0])
+         return GL_FALSE;
+      flush(ctx);
+      texObj->Sampler.MaxLod = params[0];
+      return GL_TRUE;
+
+   case GL_TEXTURE_PRIORITY:
+      flush(ctx);
+      texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
+      return GL_TRUE;
+
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+      if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+         if (texObj->Sampler.MaxAnisotropy == params[0])
+            return GL_FALSE;
+         if (params[0] < 1.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return GL_FALSE;
+         }
+         flush(ctx);
+         /* clamp to max, that's what NVIDIA does */
+         texObj->Sampler.MaxAnisotropy = MIN2(params[0],
+                                      ctx->Const.MaxTextureMaxAnisotropy);
+         return GL_TRUE;
+      }
+      else {
+         static GLuint count = 0;
+         if (count++ < 10)
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+      if (ctx->Extensions.ARB_shadow_ambient) {
+         if (texObj->Sampler.CompareFailValue != params[0]) {
+            flush(ctx);
+            texObj->Sampler.CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
+            return GL_TRUE;
+         }
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                    "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");
+      }
+      return GL_FALSE;
+
+   case GL_TEXTURE_LOD_BIAS:
+      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
+      if (ctx->Extensions.EXT_texture_lod_bias) {
+         if (texObj->Sampler.LodBias != params[0]) {
+            flush(ctx);
+            texObj->Sampler.LodBias = params[0];
+            return GL_TRUE;
+         }
+         return GL_FALSE;
+      }
+      break;
+
+   case GL_TEXTURE_BORDER_COLOR:
+      flush(ctx);
+      /* ARB_texture_float disables clamping */
+      if (ctx->Extensions.ARB_texture_float) {
+         texObj->Sampler.BorderColor.f[RCOMP] = params[0];
+         texObj->Sampler.BorderColor.f[GCOMP] = params[1];
+         texObj->Sampler.BorderColor.f[BCOMP] = params[2];
+         texObj->Sampler.BorderColor.f[ACOMP] = params[3];
+      } else {
+         texObj->Sampler.BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);
+         texObj->Sampler.BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);
+      }
+      return GL_TRUE;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+   }
+   return GL_FALSE;
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   GLboolean need_update;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_FILTER:
+   case GL_TEXTURE_MAG_FILTER:
+   case GL_TEXTURE_WRAP_S:
+   case GL_TEXTURE_WRAP_T:
+   case GL_TEXTURE_WRAP_R:
+   case GL_TEXTURE_BASE_LEVEL:
+   case GL_TEXTURE_MAX_LEVEL:
+   case GL_GENERATE_MIPMAP_SGIS:
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+   case GL_TEXTURE_SRGB_DECODE_EXT:
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      {
+         /* convert float param to int */
+         GLint p[4];
+         p[0] = (GLint) param;
+         p[1] = p[2] = p[3] = 0;
+         need_update = set_tex_parameteri(ctx, texObj, pname, p);
+      }
+      break;
+   default:
+      {
+         /* this will generate an error if pname is illegal */
+         GLfloat p[4];
+         p[0] = param;
+         p[1] = p[2] = p[3] = 0.0F;
+         need_update = set_tex_parameterf(ctx, texObj, pname, p);
+      }
+   }
+
+   if (ctx->Driver.TexParameter && need_update) {
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GLboolean need_update;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_FILTER:
+   case GL_TEXTURE_MAG_FILTER:
+   case GL_TEXTURE_WRAP_S:
+   case GL_TEXTURE_WRAP_T:
+   case GL_TEXTURE_WRAP_R:
+   case GL_TEXTURE_BASE_LEVEL:
+   case GL_TEXTURE_MAX_LEVEL:
+   case GL_GENERATE_MIPMAP_SGIS:
+   case GL_TEXTURE_COMPARE_MODE_ARB:
+   case GL_TEXTURE_COMPARE_FUNC_ARB:
+   case GL_DEPTH_TEXTURE_MODE_ARB:
+   case GL_TEXTURE_SRGB_DECODE_EXT:
+   case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      {
+         /* convert float param to int */
+         GLint p[4];
+         p[0] = (GLint) params[0];
+         p[1] = p[2] = p[3] = 0;
+         need_update = set_tex_parameteri(ctx, texObj, pname, p);
+      }
+      break;
+
+#if FEATURE_OES_draw_texture
+   case GL_TEXTURE_CROP_RECT_OES:
+      {
+         /* convert float params to int */
+         GLint iparams[4];
+         iparams[0] = (GLint) params[0];
+         iparams[1] = (GLint) params[1];
+         iparams[2] = (GLint) params[2];
+         iparams[3] = (GLint) params[3];
+         need_update = set_tex_parameteri(ctx, texObj, pname, iparams);
+      }
+      break;
+#endif
+
+   default:
+      /* this will generate an error if pname is illegal */
+      need_update = set_tex_parameterf(ctx, texObj, pname, params);
+   }
+
+   if (ctx->Driver.TexParameter && need_update) {
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
+{
+   GLboolean need_update;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_MIN_LOD:
+   case GL_TEXTURE_MAX_LOD:
+   case GL_TEXTURE_PRIORITY:
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+   case GL_TEXTURE_LOD_BIAS:
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+      {
+         GLfloat fparam[4];
+         fparam[0] = (GLfloat) param;
+         fparam[1] = fparam[2] = fparam[3] = 0.0F;
+         /* convert int param to float */
+         need_update = set_tex_parameterf(ctx, texObj, pname, fparam);
+      }
+      break;
+   default:
+      /* this will generate an error if pname is illegal */
+      {
+         GLint iparam[4];
+         iparam[0] = param;
+         iparam[1] = iparam[2] = iparam[3] = 0;
+         need_update = set_tex_parameteri(ctx, texObj, pname, iparam);
+      }
+   }
+
+   if (ctx->Driver.TexParameter && need_update) {
+      GLfloat fparam = (GLfloat) param;
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GLboolean need_update;
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      {
+         /* convert int params to float */
+         GLfloat fparams[4];
+         fparams[0] = INT_TO_FLOAT(params[0]);
+         fparams[1] = INT_TO_FLOAT(params[1]);
+         fparams[2] = INT_TO_FLOAT(params[2]);
+         fparams[3] = INT_TO_FLOAT(params[3]);
+         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);
+      }
+      break;
+   case GL_TEXTURE_MIN_LOD:
+   case GL_TEXTURE_MAX_LOD:
+   case GL_TEXTURE_PRIORITY:
+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+   case GL_TEXTURE_LOD_BIAS:
+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+      {
+         /* convert int param to float */
+         GLfloat fparams[4];
+         fparams[0] = (GLfloat) params[0];
+         fparams[1] = fparams[2] = fparams[3] = 0.0F;
+         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);
+      }
+      break;
+   default:
+      /* this will generate an error if pname is illegal */
+      need_update = set_tex_parameteri(ctx, texObj, pname, params);
+   }
+
+   if (ctx->Driver.TexParameter && need_update) {
+      GLfloat fparams[4];
+      fparams[0] = INT_TO_FLOAT(params[0]);
+      if (pname == GL_TEXTURE_BORDER_COLOR ||
+          pname == GL_TEXTURE_CROP_RECT_OES) {
+         fparams[1] = INT_TO_FLOAT(params[1]);
+         fparams[2] = INT_TO_FLOAT(params[2]);
+         fparams[3] = INT_TO_FLOAT(params[3]);
+      }
+      ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);
+   }
+}
+
+
+/**
+ * Set tex parameter to integer value(s).  Primarily intended to set
+ * integer-valued texture border color (for integer-valued textures).
+ * New in GL 3.0.
+ */
+void GLAPIENTRY
+_mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      /* set the integer-valued border color */
+      COPY_4V(texObj->Sampler.BorderColor.i, params);
+      break;
+   default:
+      _mesa_TexParameteriv(target, pname, params);
+      break;
+   }
+   /* XXX no driver hook for TexParameterIiv() yet */
+}
+
+
+/**
+ * Set tex parameter to unsigned integer value(s).  Primarily intended to set
+ * uint-valued texture border color (for integer-valued textures).
+ * New in GL 3.0
+ */
+void GLAPIENTRY
+_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_FALSE);
+   if (!texObj)
+      return;
+
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+      /* set the unsigned integer-valued border color */
+      COPY_4V(texObj->Sampler.BorderColor.ui, params);
+      break;
+   default:
+      _mesa_TexParameteriv(target, pname, (const GLint *) params);
+      break;
+   }
+   /* XXX no driver hook for TexParameterIuiv() yet */
+}
+
+
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params )
+{
+   GLint iparam;
+   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );
+   *params = (GLfloat) iparam;
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params )
+{
+   const struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   const struct gl_texture_image *img = NULL;
+   GLint maxLevels;
+   gl_format texFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetTexLevelParameteriv(current unit)");
+      return;
+   }
+
+   texUnit = _mesa_get_current_tex_unit(ctx);
+
+   /* this will catch bad target values */
+   maxLevels = _mesa_max_texture_levels(ctx, target);
+   if (maxLevels == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetTexLevelParameter[if]v(target=0x%x)", target);
+      return;
+   }
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
+      return;
+   }
+
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+
+   img = _mesa_select_tex_image(ctx, texObj, target, level);
+   if (!img || !img->TexFormat) {
+      /* undefined texture image */
+      if (pname == GL_TEXTURE_COMPONENTS)
+         *params = 1;
+      else
+         *params = 0;
+      return;
+   }
+
+   texFormat = img->TexFormat;
+
+   switch (pname) {
+      case GL_TEXTURE_WIDTH:
+         *params = img->Width;
+         break;
+      case GL_TEXTURE_HEIGHT:
+         *params = img->Height;
+         break;
+      case GL_TEXTURE_DEPTH:
+         *params = img->Depth;
+         break;
+      case GL_TEXTURE_INTERNAL_FORMAT:
+         if (_mesa_is_format_compressed(texFormat)) {
+            /* need to return the actual compressed format */
+            *params = _mesa_compressed_format_to_glenum(ctx, texFormat);
+         }
+         else {
+            /* return the user's requested internal format */
+            *params = img->InternalFormat;
+         }
+         break;
+      case GL_TEXTURE_BORDER:
+         *params = img->Border;
+         break;
+      case GL_TEXTURE_RED_SIZE:
+         if (img->_BaseFormat == GL_RED) {
+            *params = _mesa_get_format_bits(texFormat, pname);
+	    break;
+	 }
+	 /* FALLTHROUGH */
+      case GL_TEXTURE_GREEN_SIZE:
+         if (img->_BaseFormat == GL_RG) {
+            *params = _mesa_get_format_bits(texFormat, pname);
+	    break;
+	 }
+	 /* FALLTHROUGH */
+      case GL_TEXTURE_BLUE_SIZE:
+         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
+            *params = _mesa_get_format_bits(texFormat, pname);
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_ALPHA_SIZE:
+         if (img->_BaseFormat == GL_ALPHA ||
+             img->_BaseFormat == GL_LUMINANCE_ALPHA ||
+             img->_BaseFormat == GL_RGBA)
+            *params = _mesa_get_format_bits(texFormat, pname);
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_INTENSITY_SIZE:
+         if (img->_BaseFormat != GL_INTENSITY)
+            *params = 0;
+         else {
+            *params = _mesa_get_format_bits(texFormat, pname);
+            if (*params == 0) {
+               /* intensity probably stored as rgb texture */
+               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
+                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
+            }
+         }
+         break;
+      case GL_TEXTURE_LUMINANCE_SIZE:
+         if (img->_BaseFormat != GL_LUMINANCE &&
+             img->_BaseFormat != GL_LUMINANCE_ALPHA)
+            *params = 0;
+         else {
+            *params = _mesa_get_format_bits(texFormat, pname);
+            if (*params == 0) {
+               /* luminance probably stored as rgb texture */
+               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
+                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
+            }
+         }
+         break;
+      case GL_TEXTURE_INDEX_SIZE_EXT:
+         if (img->_BaseFormat == GL_COLOR_INDEX)
+            *params = _mesa_get_format_bits(texFormat, pname);
+         else
+            *params = 0;
+         break;
+      case GL_TEXTURE_DEPTH_SIZE_ARB:
+         if (ctx->Extensions.ARB_depth_texture)
+            *params = _mesa_get_format_bits(texFormat, pname);
+         else
+            goto invalid_pname;
+         break;
+      case GL_TEXTURE_STENCIL_SIZE_EXT:
+         if (ctx->Extensions.EXT_packed_depth_stencil ||
+             ctx->Extensions.ARB_framebuffer_object) {
+            *params = _mesa_get_format_bits(texFormat, pname);
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_SHARED_SIZE:
+         if (ctx->VersionMajor >= 3 ||
+             ctx->Extensions.EXT_texture_shared_exponent) {
+            *params = texFormat == MESA_FORMAT_RGB9_E5_FLOAT ? 5 : 0;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
+	 if (_mesa_is_format_compressed(texFormat) &&
+             !_mesa_is_proxy_texture(target)) {
+            *params = _mesa_format_image_size(texFormat, img->Width,
+                                              img->Height, img->Depth);
+	 }
+	 else {
+	    _mesa_error(ctx, GL_INVALID_OPERATION,
+			"glGetTexLevelParameter[if]v(pname)");
+	 }
+         break;
+      case GL_TEXTURE_COMPRESSED:
+         *params = (GLint) _mesa_is_format_compressed(texFormat);
+         break;
+
+      /* GL_ARB_texture_float */
+      case GL_TEXTURE_RED_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_GREEN_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_BLUE_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_BLUE_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_ALPHA_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_ALPHA_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_LUMINANCE_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_LUMINANCE_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_INTENSITY_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_INTENSITY_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+      case GL_TEXTURE_DEPTH_TYPE_ARB:
+         if (ctx->Extensions.ARB_texture_float) {
+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_DEPTH_SIZE) ?
+               _mesa_get_format_datatype(texFormat) : GL_NONE;
+         }
+         else {
+            goto invalid_pname;
+         }
+         break;
+
+      default:
+         goto invalid_pname;
+   }
+
+   /* no error if we get here */
+   return;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM,
+               "glGetTexLevelParameter[if]v(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   struct gl_texture_object *obj;
+   GLboolean error = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   obj = get_texobj(ctx, target, GL_TRUE);
+   if (!obj)
+      return;
+
+   _mesa_lock_texture(ctx, obj);
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+	 *params = ENUM_TO_FLOAT(obj->Sampler.MagFilter);
+	 break;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = ENUM_TO_FLOAT(obj->Sampler.MinFilter);
+         break;
+      case GL_TEXTURE_WRAP_S:
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapS);
+         break;
+      case GL_TEXTURE_WRAP_T:
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapT);
+         break;
+      case GL_TEXTURE_WRAP_R:
+         *params = ENUM_TO_FLOAT(obj->Sampler.WrapR);
+         break;
+      case GL_TEXTURE_BORDER_COLOR:
+         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))
+            _mesa_update_state_locked(ctx);
+         if(ctx->Color._ClampFragmentColor)
+         {
+            params[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);
+            params[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);
+            params[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);
+            params[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);
+         }
+         else
+         {
+            params[0] = obj->Sampler.BorderColor.f[0];
+            params[1] = obj->Sampler.BorderColor.f[1];
+            params[2] = obj->Sampler.BorderColor.f[2];
+            params[3] = obj->Sampler.BorderColor.f[3];
+         }
+         break;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = ENUM_TO_FLOAT(resident);
+         }
+         break;
+      case GL_TEXTURE_PRIORITY:
+         *params = obj->Priority;
+         break;
+      case GL_TEXTURE_MIN_LOD:
+         *params = obj->Sampler.MinLod;
+         break;
+      case GL_TEXTURE_MAX_LOD:
+         *params = obj->Sampler.MaxLod;
+         break;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = (GLfloat) obj->BaseLevel;
+         break;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = (GLfloat) obj->MaxLevel;
+         break;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = obj->Sampler.MaxAnisotropy;
+         }
+	 else
+	    error = GL_TRUE;
+         break;
+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+         if (ctx->Extensions.ARB_shadow_ambient) {
+            *params = obj->Sampler.CompareFailValue;
+         }
+	 else 
+	    error = GL_TRUE;
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+	 *params = (GLfloat) obj->GenerateMipmap;
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->Sampler.CompareMode;
+         }
+	 else 
+	    error = GL_TRUE;
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->Sampler.CompareFunc;
+         }
+	 else 
+	    error = GL_TRUE;
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLfloat) obj->Sampler.DepthMode;
+         }
+	 else 
+	    error = GL_TRUE;
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = obj->Sampler.LodBias;
+         }
+	 else 
+	    error = GL_TRUE;
+         break;
+#if FEATURE_OES_draw_texture
+      case GL_TEXTURE_CROP_RECT_OES:
+         params[0] = obj->CropRect[0];
+         params[1] = obj->CropRect[1];
+         params[2] = obj->CropRect[2];
+         params[3] = obj->CropRect[3];
+         break;
+#endif
+
+      case GL_TEXTURE_SWIZZLE_R_EXT:
+      case GL_TEXTURE_SWIZZLE_G_EXT:
+      case GL_TEXTURE_SWIZZLE_B_EXT:
+      case GL_TEXTURE_SWIZZLE_A_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+            *params = (GLfloat) obj->Swizzle[comp];
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp;
+            for (comp = 0; comp < 4; comp++) {
+               params[comp] = (GLfloat) obj->Swizzle[comp];
+            }
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+      if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {
+         *params = (GLfloat) obj->Sampler.CubeMapSeamless;
+      }
+      else {
+         error = GL_TRUE;
+      }
+
+      default:
+	 error = GL_TRUE;
+	 break;
+   }
+
+   if (error)
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
+		  pname);
+
+   _mesa_unlock_texture(ctx, obj);
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   struct gl_texture_object *obj;
+   GLboolean error = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+    obj = get_texobj(ctx, target, GL_TRUE);
+    if (!obj)
+       return;
+
+   _mesa_lock_texture(ctx, obj);
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+         *params = (GLint) obj->Sampler.MagFilter;
+         break;;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = (GLint) obj->Sampler.MinFilter;
+         break;;
+      case GL_TEXTURE_WRAP_S:
+         *params = (GLint) obj->Sampler.WrapS;
+         break;;
+      case GL_TEXTURE_WRAP_T:
+         *params = (GLint) obj->Sampler.WrapT;
+         break;;
+      case GL_TEXTURE_WRAP_R:
+         *params = (GLint) obj->Sampler.WrapR;
+         break;;
+      case GL_TEXTURE_BORDER_COLOR:
+         {
+            GLfloat b[4];
+            b[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);
+            b[1] = CLAMP(obj->Sampler.BorderColor.f[1], 0.0F, 1.0F);
+            b[2] = CLAMP(obj->Sampler.BorderColor.f[2], 0.0F, 1.0F);
+            b[3] = CLAMP(obj->Sampler.BorderColor.f[3], 0.0F, 1.0F);
+            params[0] = FLOAT_TO_INT(b[0]);
+            params[1] = FLOAT_TO_INT(b[1]);
+            params[2] = FLOAT_TO_INT(b[2]);
+            params[3] = FLOAT_TO_INT(b[3]);
+         }
+         break;;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = (GLint) resident;
+         }
+         break;;
+      case GL_TEXTURE_PRIORITY:
+         *params = FLOAT_TO_INT(obj->Priority);
+         break;;
+      case GL_TEXTURE_MIN_LOD:
+         *params = (GLint) obj->Sampler.MinLod;
+         break;;
+      case GL_TEXTURE_MAX_LOD:
+         *params = (GLint) obj->Sampler.MaxLod;
+         break;;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = obj->BaseLevel;
+         break;;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = obj->MaxLevel;
+         break;;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = (GLint) obj->Sampler.MaxAnisotropy;
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+         if (ctx->Extensions.ARB_shadow_ambient) {
+            *params = (GLint) FLOAT_TO_INT(obj->Sampler.CompareFailValue);
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+	 *params = (GLint) obj->GenerateMipmap;
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->Sampler.CompareMode;
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->Sampler.CompareFunc;
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLint) obj->Sampler.DepthMode;
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = (GLint) obj->Sampler.LodBias;
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+#if FEATURE_OES_draw_texture
+      case GL_TEXTURE_CROP_RECT_OES:
+         params[0] = obj->CropRect[0];
+         params[1] = obj->CropRect[1];
+         params[2] = obj->CropRect[2];
+         params[3] = obj->CropRect[3];
+         break;
+#endif
+      case GL_TEXTURE_SWIZZLE_R_EXT:
+      case GL_TEXTURE_SWIZZLE_G_EXT:
+      case GL_TEXTURE_SWIZZLE_B_EXT:
+      case GL_TEXTURE_SWIZZLE_A_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
+            *params = obj->Swizzle[comp];
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
+         if (ctx->Extensions.EXT_texture_swizzle) {
+            COPY_4V(params, obj->Swizzle);
+         }
+         else {
+            error = GL_TRUE;
+         }
+         break;
+
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {
+            *params = (GLint) obj->Sampler.CubeMapSeamless;
+         }
+         else {
+            error = GL_TRUE;
+         }
+
+      default:
+         ; /* silence warnings */
+   }
+
+   if (error)
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)",
+		  pname);
+
+   _mesa_unlock_texture(ctx, obj);
+}
+
+
+/** New in GL 3.0 */
+void GLAPIENTRY
+_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_TRUE);
+   
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      COPY_4V(params, texObj->Sampler.BorderColor.i);
+      break;
+   default:
+      _mesa_GetTexParameteriv(target, pname, params);
+   }
+}
+
+
+/** New in GL 3.0 */
+void GLAPIENTRY
+_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
+{
+   struct gl_texture_object *texObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   texObj = get_texobj(ctx, target, GL_TRUE);
+   
+   switch (pname) {
+   case GL_TEXTURE_BORDER_COLOR:
+      COPY_4V(params, texObj->Sampler.BorderColor.i);
+      break;
+   default:
+      {
+         GLint ip[4];
+         _mesa_GetTexParameteriv(target, pname, ip);
+         params[0] = ip[0];
+         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT || 
+             pname == GL_TEXTURE_CROP_RECT_OES) {
+            params[1] = ip[1];
+            params[2] = ip[2];
+            params[3] = ip[3];
+         }
+      }
+   }
+}
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index d94d7fe5d..16f9690e8 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -459,7 +459,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
          value[0] = (ctx->Fog.End == ctx->Fog.Start)
             ? 1.0f : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
          value[1] = ctx->Fog.End * -value[0];
-         value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);
+         value[2] = (GLfloat)(ctx->Fog.Density * M_LOG2E); /* M_LOG2E == 1/ln(2) */
          value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);
          return;
 
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index 56da010b3..e3d6cbb8e 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -201,6 +201,9 @@ update_samplers(struct st_context *st)
                = st_compare_func_to_pipe(msamp->CompareFunc);
          }
 
+         sampler->seamless_cube_map =
+               st->ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;
+
          st->state.num_samplers = su + 1;
 
          /*printf("%s su=%u non-null\n", __FUNCTION__, su);*/
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 0c5e1991c..ad8e6bb9e 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -1,598 +1,606 @@
-/**************************************************************************

- * 

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

- * Copyright (c) 2008 VMware, Inc.

- * 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/imports.h"

-#include "main/context.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "pipe/p_screen.h"

-

-#include "st_context.h"

-#include "st_extensions.h"

-

-

-static int _min(int a, int b)

-{

-   return (a < b) ? a : b;

-}

-

-static float _maxf(float a, float b)

-{

-   return (a > b) ? a : b;

-}

-

-static int _clamp(int a, int min, int max)

-{

-   if (a < min)

-      return min;

-   else if (a > max)

-      return max;

-   else

-      return a;

-}

-

-

-/**

- * Query driver to get implementation limits.

- * Note that we have to limit/clamp against Mesa's internal limits too.

- */

-void st_init_limits(struct st_context *st)

-{

-   struct pipe_screen *screen = st->pipe->screen;

-   struct gl_constants *c = &st->ctx->Const;

-   gl_shader_type sh;

-

-   c->MaxTextureLevels

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),

-            MAX_TEXTURE_LEVELS);

-

-   c->Max3DTextureLevels

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),

-            MAX_3D_TEXTURE_LEVELS);

-

-   c->MaxCubeTextureLevels

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),

-            MAX_CUBE_TEXTURE_LEVELS);

-

-   c->MaxTextureRectSize

-      = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);

-

-   c->MaxTextureImageUnits

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),

-            MAX_TEXTURE_IMAGE_UNITS);

-

-   c->MaxVertexTextureImageUnits

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),

-             MAX_VERTEX_TEXTURE_IMAGE_UNITS);

-

-   c->MaxCombinedTextureImageUnits

-      = _min(screen->get_param(screen, PIPE_CAP_MAX_COMBINED_SAMPLERS),

-             MAX_COMBINED_TEXTURE_IMAGE_UNITS);

-

-   c->MaxTextureCoordUnits

-      = _min(c->MaxTextureImageUnits, MAX_TEXTURE_COORD_UNITS);

-

-   c->MaxTextureUnits = _min(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);

-

-   c->MaxDrawBuffers

-      = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),

-              1, MAX_DRAW_BUFFERS);

-

-   c->MaxLineWidth

-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));

-   c->MaxLineWidthAA

-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));

-

-   c->MaxPointSize

-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));

-   c->MaxPointSizeAA

-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));

-   /* called after _mesa_create_context/_mesa_init_point, fix default user

-    * settable max point size up

-    */

-   st->ctx->Point.MaxSize = MAX2(c->MaxPointSize, c->MaxPointSizeAA);

-   /* these are not queryable. Note that GL basically mandates a 1.0 minimum

-    * for non-aa sizes, but we can go down to 0.0 for aa points.

-    */

-   c->MinPointSize = 1.0f;

-   c->MinPointSizeAA = 0.0f;

-

-   c->MaxTextureMaxAnisotropy

-      = _maxf(2.0f, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));

-

-   c->MaxTextureLodBias

-      = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);

-

-   c->MaxDrawBuffers

-      = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),

-              1, MAX_DRAW_BUFFERS);

-

-   /* Quads always follow GL provoking rules. */

-   c->QuadsFollowProvokingVertexConvention = GL_FALSE;

-

-   for (sh = 0; sh < MESA_SHADER_TYPES; ++sh) {

-      struct gl_shader_compiler_options *options =

-         &st->ctx->ShaderCompilerOptions[sh];

-      struct gl_program_constants *pc;

-

-      switch (sh) {

-      case PIPE_SHADER_FRAGMENT:

-         pc = &c->FragmentProgram;

-         break;

-      case PIPE_SHADER_VERTEX:

-         pc = &c->VertexProgram;

-         break;

-      case PIPE_SHADER_GEOMETRY:

-         pc = &c->GeometryProgram;

-         break;

-      default:

-         assert(0);

-         continue;

-      }

-

-      pc->MaxNativeInstructions    = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS);

-      pc->MaxNativeAluInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS);

-      pc->MaxNativeTexInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS);

-      pc->MaxNativeTexIndirections = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS);

-      pc->MaxNativeAttribs         = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INPUTS);

-      pc->MaxNativeTemps           = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEMPS);

-      pc->MaxNativeAddressRegs     = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS);

-      pc->MaxNativeParameters      = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONSTS);

-      pc->MaxUniformComponents     = 4 * MIN2(pc->MaxNativeParameters, MAX_UNIFORMS);

-      /* raise MaxParameters if native support is higher */

-      pc->MaxParameters            = MAX2(pc->MaxParameters, pc->MaxNativeParameters);

-

-      options->EmitNoNoise = TRUE;

-

-      /* TODO: make these more fine-grained if anyone needs it */

-      options->EmitNoIfs = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

-      options->EmitNoLoops = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

-      options->EmitNoFunctions = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

-      options->EmitNoMainReturn = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

-

-      options->EmitNoCont = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED);

-

-      options->EmitNoIndirectInput = !screen->get_shader_param(screen, sh,

-                                        PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR);

-      options->EmitNoIndirectOutput = !screen->get_shader_param(screen, sh,

-                                        PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR);

-      options->EmitNoIndirectTemp = !screen->get_shader_param(screen, sh,

-                                        PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR);

-      options->EmitNoIndirectUniform = !screen->get_shader_param(screen, sh,

-                                        PIPE_SHADER_CAP_INDIRECT_CONST_ADDR);

-

-      if (options->EmitNoLoops)

-         options->MaxUnrollIterations = MIN2(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS), 65536);

-   }

-

-   /* PIPE_CAP_MAX_FS_INPUTS specifies the number of COLORn + GENERICn inputs

-    * and is set in MaxNativeAttribs. It's always 2 colors + N generic

-    * attributes. The GLSL compiler never uses COLORn for varyings, so we

-    * subtract the 2 colors to get the maximum number of varyings (generic

-    * attributes) supported by a driver. */

-   c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_INPUTS) - 2;

-   c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);

-

-   /* XXX we'll need a better query here someday */

-   if (screen->get_param(screen, PIPE_CAP_GLSL)) {

-      c->GLSLVersion = 120;

-   }

-}

-

-

-/**

- * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine

- * which GL extensions are supported.

- * Quite a few extensions are always supported because they are standard

- * features or can be built on top of other gallium features.

- * Some fine tuning may still be needed.

- */

-void st_init_extensions(struct st_context *st)

-{

-   struct pipe_screen *screen = st->pipe->screen;

-   struct gl_context *ctx = st->ctx;

-

-   /*

-    * Extensions that are supported by all Gallium drivers:

-    */

-   ctx->Extensions.ARB_copy_buffer = GL_TRUE;

-   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;

-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

-   ctx->Extensions.ARB_fragment_program = GL_TRUE;

-   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;

-   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;

-   ctx->Extensions.ARB_multisample = GL_TRUE;

-   ctx->Extensions.ARB_sampler_objects = GL_TRUE;

-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */

-   ctx->Extensions.ARB_texture_compression = GL_TRUE;

-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

-   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;

-   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;

-   ctx->Extensions.ARB_vertex_program = GL_TRUE;

-   ctx->Extensions.ARB_window_pos = GL_TRUE;

-

-   ctx->Extensions.EXT_blend_color = GL_TRUE;

-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

-   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;

-   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;

-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;

-   ctx->Extensions.EXT_fog_coord = GL_TRUE;

-   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;

-   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;

-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

-   ctx->Extensions.EXT_point_parameters = GL_TRUE;

-   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;

-   ctx->Extensions.EXT_secondary_color = GL_TRUE;

-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;

-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

-   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;

-   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2)

-	   ctx->Extensions.EXT_texture_format_BGRA8888 = GL_TRUE;

-

-   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;

-

-   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;

-

-   ctx->Extensions.MESA_pack_invert = GL_TRUE;

-

-   ctx->Extensions.NV_blend_square = GL_TRUE;

-   ctx->Extensions.NV_texgen_reflection = GL_TRUE;

-   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;

-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

-#if 0

-   /* possibly could support the following two */

-   ctx->Extensions.NV_vertex_program = GL_TRUE;

-   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;

-#endif

-

-#if FEATURE_OES_EGL_image

-   ctx->Extensions.OES_EGL_image = GL_TRUE;

-#endif

-#if FEATURE_OES_draw_texture

-   ctx->Extensions.OES_draw_texture = GL_TRUE;

-#endif

-

-   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;

-

-   /*

-    * Extensions that depend on the driver/hardware:

-    */

-   if (screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS) > 0) {

-      ctx->Extensions.ARB_draw_buffers = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SWIZZLE) > 0) {

-      ctx->Extensions.EXT_texture_swizzle = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_GLSL)) {

-      ctx->Extensions.ARB_fragment_shader = GL_TRUE;

-      ctx->Extensions.ARB_vertex_shader = GL_TRUE;

-      ctx->Extensions.ARB_shader_objects = GL_TRUE;

-      ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

-      ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;

-      ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_REPEAT) > 0) {

-      ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_BLEND_EQUATION_SEPARATE)) {

-      ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {

-      ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;

-      ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES)) {

-      ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS) > 1) {

-      ctx->Extensions.ARB_multitexture = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TWO_SIDED_STENCIL)) {

-      ctx->Extensions.ATI_separate_stencil = GL_TRUE;

-      ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_ANISOTROPIC_FILTER)) {

-      ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_POINT_SPRITE)) {

-      ctx->Extensions.ARB_point_sprite = GL_TRUE;

-      /* GL_NV_point_sprite is not supported by gallium because we don't

-       * support the GL_POINT_SPRITE_R_MODE_NV option.

-       */

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) {

-      ctx->Extensions.ARB_occlusion_query = GL_TRUE;

-      ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;

-   }

-   if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) {

-     ctx->Extensions.EXT_timer_query = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SHADOW_MAP)) {

-      ctx->Extensions.ARB_depth_texture = GL_TRUE;

-      ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;

-      ctx->Extensions.ARB_shadow = GL_TRUE;

-      ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

-      /*ctx->Extensions.ARB_shadow_ambient = GL_TRUE;*/

-   }

-

-   /* GL_EXT_packed_depth_stencil requires both the ability to render to

-    * a depth/stencil buffer and texture from depth/stencil source.

-    */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_DEPTH_STENCIL) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

-   }

-   else if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

-                                        PIPE_TEXTURE_2D, 0,

-                                        PIPE_BIND_DEPTH_STENCIL) &&

-            screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

-                                        PIPE_TEXTURE_2D, 0,

-                                        PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

-   }

-

-   /* float support - assume nothing exclusively supports 64-bit floats */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW |

-                                   PIPE_BIND_RENDER_TARGET) &&

-      screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW |

-                                   PIPE_BIND_RENDER_TARGET)) {

-      ctx->Extensions.ARB_texture_float = GL_TRUE;

-   }

-

-   /* sRGB support */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) ||

-      screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

-      ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;

-      if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_RENDER_TARGET) ||

-          screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_RENDER_TARGET)) {

-         ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE;

-         ctx->Const.sRGBCapable = GL_TRUE;

-      }

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.ARB_texture_rg = GL_TRUE;

-   }

-

-   /* s3tc support */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       ctx->Mesa_DXTn) {

-      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;

-      ctx->Extensions.S3_s3tc = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM,

-				   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)

-       ) {

-     ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) &&

-       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_texture_snorm = GL_TRUE;

-   }

-

-   /* ycbcr support */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW) ||

-       screen->is_format_supported(screen, PIPE_FORMAT_YUYV, 

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;

-   }

-

-   /* GL_EXT_texture_array */

-   if (screen->get_param(screen, PIPE_CAP_ARRAY_TEXTURES)) {

-      ctx->Extensions.EXT_texture_array = GL_TRUE;

-      ctx->Extensions.MESA_texture_array = GL_TRUE;

-   }

-

-   /* GL_ARB_framebuffer_object */

-   if (ctx->Extensions.EXT_packed_depth_stencil) {

-      /* we support always support GL_EXT_framebuffer_blit */

-      ctx->Extensions.ARB_framebuffer_object = GL_TRUE;

-   }

-

-   if (st->pipe->render_condition) {

-      ctx->Extensions.NV_conditional_render = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_ENABLE)) {

-      ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC)) {

-      ctx->Extensions.ARB_draw_buffers_blend = GL_TRUE;

-   }

-

-   /* GL_ARB_half_float_vertex */

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

-                                   PIPE_BUFFER, 0,

-                                   PIPE_BIND_VERTEX_BUFFER)) {

-      ctx->Extensions.ARB_half_float_vertex = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FIXED,

-                                   PIPE_BUFFER, 0,

-                                   PIPE_BIND_VERTEX_BUFFER)) {

-      ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;

-   }

-

-   if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {

-#if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */

-      ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;

-#endif

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {

-      ctx->Extensions.NV_primitive_restart = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_DEPTH_CLAMP)) {

-      ctx->Extensions.ARB_depth_clamp = GL_TRUE;

-   }

-

-   /* This extension does not actually require support of floating point

-    * render targets, just clamping controls.

-    * Advertise this extension if either fragment color clamping is supported

-    * or no render targets having color values outside of the range [0, 1]

-    * are supported, in which case the fragment color clamping has no effect

-    * on rendering.

-    */

-   if (screen->get_param(screen, PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL) ||

-       (!screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET) &&

-        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET) &&

-        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET) &&

-        !screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET) &&

-        !screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET) &&

-        !screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,

-                                     PIPE_TEXTURE_2D, 0,

-                                     PIPE_BIND_RENDER_TARGET))) {

-      ctx->Extensions.ARB_color_buffer_float = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {

-      ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;

-   }

-

-   if (screen->get_param(screen, PIPE_CAP_TGSI_INSTANCEID)) {

-      ctx->Extensions.ARB_draw_instanced = GL_TRUE;

-   }

-   if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {

-      ctx->Extensions.ARB_instanced_arrays = GL_TRUE;

-   }

-

-   if (screen->fence_finish) {

-      ctx->Extensions.ARB_sync = GL_TRUE;

-   }

-

-   if (st->pipe->texture_barrier) {

-      ctx->Extensions.NV_texture_barrier = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE;

-   }

-

-   if (screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,

-                                   PIPE_TEXTURE_2D, 0,

-                                   PIPE_BIND_RENDER_TARGET |

-                                   PIPE_BIND_SAMPLER_VIEW)) {

-      ctx->Extensions.EXT_packed_float = GL_TRUE;

-   }

-}

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright (c) 2008 VMware, Inc.
+ * 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/imports.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
+
+#include "st_context.h"
+#include "st_extensions.h"
+
+
+static int _min(int a, int b)
+{
+   return (a < b) ? a : b;
+}
+
+static float _maxf(float a, float b)
+{
+   return (a > b) ? a : b;
+}
+
+static int _clamp(int a, int min, int max)
+{
+   if (a < min)
+      return min;
+   else if (a > max)
+      return max;
+   else
+      return a;
+}
+
+
+/**
+ * Query driver to get implementation limits.
+ * Note that we have to limit/clamp against Mesa's internal limits too.
+ */
+void st_init_limits(struct st_context *st)
+{
+   struct pipe_screen *screen = st->pipe->screen;
+   struct gl_constants *c = &st->ctx->Const;
+   gl_shader_type sh;
+
+   c->MaxTextureLevels
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),
+            MAX_TEXTURE_LEVELS);
+
+   c->Max3DTextureLevels
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),
+            MAX_3D_TEXTURE_LEVELS);
+
+   c->MaxCubeTextureLevels
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),
+            MAX_CUBE_TEXTURE_LEVELS);
+
+   c->MaxTextureRectSize
+      = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);
+
+   c->MaxTextureImageUnits
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),
+            MAX_TEXTURE_IMAGE_UNITS);
+
+   c->MaxVertexTextureImageUnits
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),
+             MAX_VERTEX_TEXTURE_IMAGE_UNITS);
+
+   c->MaxCombinedTextureImageUnits
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_COMBINED_SAMPLERS),
+             MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+
+   c->MaxTextureCoordUnits
+      = _min(c->MaxTextureImageUnits, MAX_TEXTURE_COORD_UNITS);
+
+   c->MaxTextureUnits = _min(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);
+
+   c->MaxDrawBuffers
+      = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
+              1, MAX_DRAW_BUFFERS);
+
+   c->MaxLineWidth
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
+   c->MaxLineWidthAA
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
+
+   c->MaxPointSize
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
+   c->MaxPointSizeAA
+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
+   /* called after _mesa_create_context/_mesa_init_point, fix default user
+    * settable max point size up
+    */
+   st->ctx->Point.MaxSize = MAX2(c->MaxPointSize, c->MaxPointSizeAA);
+   /* these are not queryable. Note that GL basically mandates a 1.0 minimum
+    * for non-aa sizes, but we can go down to 0.0 for aa points.
+    */
+   c->MinPointSize = 1.0f;
+   c->MinPointSizeAA = 0.0f;
+
+   c->MaxTextureMaxAnisotropy
+      = _maxf(2.0f, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
+
+   c->MaxTextureLodBias
+      = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);
+
+   c->MaxDrawBuffers
+      = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
+              1, MAX_DRAW_BUFFERS);
+
+   /* Quads always follow GL provoking rules. */
+   c->QuadsFollowProvokingVertexConvention = GL_FALSE;
+
+   for (sh = 0; sh < MESA_SHADER_TYPES; ++sh) {
+      struct gl_shader_compiler_options *options =
+         &st->ctx->ShaderCompilerOptions[sh];
+      struct gl_program_constants *pc;
+
+      switch (sh) {
+      case PIPE_SHADER_FRAGMENT:
+         pc = &c->FragmentProgram;
+         break;
+      case PIPE_SHADER_VERTEX:
+         pc = &c->VertexProgram;
+         break;
+      case PIPE_SHADER_GEOMETRY:
+         pc = &c->GeometryProgram;
+         break;
+      default:
+         assert(0);
+         continue;
+      }
+
+      pc->MaxNativeInstructions    = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS);
+      pc->MaxNativeAluInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS);
+      pc->MaxNativeTexInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS);
+      pc->MaxNativeTexIndirections = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS);
+      pc->MaxNativeAttribs         = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INPUTS);
+      pc->MaxNativeTemps           = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEMPS);
+      pc->MaxNativeAddressRegs     = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS);
+      pc->MaxNativeParameters      = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONSTS);
+      pc->MaxUniformComponents     = 4 * MIN2(pc->MaxNativeParameters, MAX_UNIFORMS);
+      /* raise MaxParameters if native support is higher */
+      pc->MaxParameters            = MAX2(pc->MaxParameters, pc->MaxNativeParameters);
+
+      options->EmitNoNoise = TRUE;
+
+      /* TODO: make these more fine-grained if anyone needs it */
+      options->EmitNoIfs = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
+      options->EmitNoLoops = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
+      options->EmitNoFunctions = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);
+      options->EmitNoMainReturn = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);
+
+      options->EmitNoCont = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED);
+
+      options->EmitNoIndirectInput = !screen->get_shader_param(screen, sh,
+                                        PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR);
+      options->EmitNoIndirectOutput = !screen->get_shader_param(screen, sh,
+                                        PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR);
+      options->EmitNoIndirectTemp = !screen->get_shader_param(screen, sh,
+                                        PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR);
+      options->EmitNoIndirectUniform = !screen->get_shader_param(screen, sh,
+                                        PIPE_SHADER_CAP_INDIRECT_CONST_ADDR);
+
+      if (options->EmitNoLoops)
+         options->MaxUnrollIterations = MIN2(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS), 65536);
+   }
+
+   /* PIPE_CAP_MAX_FS_INPUTS specifies the number of COLORn + GENERICn inputs
+    * and is set in MaxNativeAttribs. It's always 2 colors + N generic
+    * attributes. The GLSL compiler never uses COLORn for varyings, so we
+    * subtract the 2 colors to get the maximum number of varyings (generic
+    * attributes) supported by a driver. */
+   c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_INPUTS) - 2;
+   c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
+
+   /* XXX we'll need a better query here someday */
+   if (screen->get_param(screen, PIPE_CAP_GLSL)) {
+      c->GLSLVersion = 120;
+   }
+}
+
+
+/**
+ * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine
+ * which GL extensions are supported.
+ * Quite a few extensions are always supported because they are standard
+ * features or can be built on top of other gallium features.
+ * Some fine tuning may still be needed.
+ */
+void st_init_extensions(struct st_context *st)
+{
+   struct pipe_screen *screen = st->pipe->screen;
+   struct gl_context *ctx = st->ctx;
+
+   /*
+    * Extensions that are supported by all Gallium drivers:
+    */
+   ctx->Extensions.ARB_copy_buffer = GL_TRUE;
+   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
+   ctx->Extensions.ARB_fragment_program = GL_TRUE;
+   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
+   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
+   ctx->Extensions.ARB_multisample = GL_TRUE;
+   ctx->Extensions.ARB_sampler_objects = GL_TRUE;
+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */
+   ctx->Extensions.ARB_texture_compression = GL_TRUE;
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
+   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+   ctx->Extensions.ARB_vertex_program = GL_TRUE;
+   ctx->Extensions.ARB_window_pos = GL_TRUE;
+
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
+   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
+   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
+   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
+   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2)
+	   ctx->Extensions.EXT_texture_format_BGRA8888 = GL_TRUE;
+
+   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
+
+   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
+
+   ctx->Extensions.MESA_pack_invert = GL_TRUE;
+
+   ctx->Extensions.NV_blend_square = GL_TRUE;
+   ctx->Extensions.NV_texgen_reflection = GL_TRUE;
+   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+#if 0
+   /* possibly could support the following two */
+   ctx->Extensions.NV_vertex_program = GL_TRUE;
+   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
+#endif
+
+#if FEATURE_OES_EGL_image
+   ctx->Extensions.OES_EGL_image = GL_TRUE;
+#endif
+#if FEATURE_OES_draw_texture
+   ctx->Extensions.OES_draw_texture = GL_TRUE;
+#endif
+
+   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
+
+   /*
+    * Extensions that depend on the driver/hardware:
+    */
+   if (screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS) > 0) {
+      ctx->Extensions.ARB_draw_buffers = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SWIZZLE) > 0) {
+      ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_GLSL)) {
+      ctx->Extensions.ARB_fragment_shader = GL_TRUE;
+      ctx->Extensions.ARB_vertex_shader = GL_TRUE;
+      ctx->Extensions.ARB_shader_objects = GL_TRUE;
+      ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
+      ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
+      ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_REPEAT) > 0) {
+      ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_BLEND_EQUATION_SEPARATE)) {
+      ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {
+      ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
+      ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES)) {
+      ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS) > 1) {
+      ctx->Extensions.ARB_multitexture = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TWO_SIDED_STENCIL)) {
+      ctx->Extensions.ATI_separate_stencil = GL_TRUE;
+      ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_ANISOTROPIC_FILTER)) {
+      ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_POINT_SPRITE)) {
+      ctx->Extensions.ARB_point_sprite = GL_TRUE;
+      /* GL_NV_point_sprite is not supported by gallium because we don't
+       * support the GL_POINT_SPRITE_R_MODE_NV option.
+       */
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) {
+      ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+      ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
+   }
+   if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) {
+     ctx->Extensions.EXT_timer_query = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SHADOW_MAP)) {
+      ctx->Extensions.ARB_depth_texture = GL_TRUE;
+      ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
+      ctx->Extensions.ARB_shadow = GL_TRUE;
+      ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
+      /*ctx->Extensions.ARB_shadow_ambient = GL_TRUE;*/
+   }
+
+   /* GL_EXT_packed_depth_stencil requires both the ability to render to
+    * a depth/stencil buffer and texture from depth/stencil source.
+    */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_DEPTH_STENCIL) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
+   }
+   else if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
+                                        PIPE_TEXTURE_2D, 0,
+                                        PIPE_BIND_DEPTH_STENCIL) &&
+            screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
+                                        PIPE_TEXTURE_2D, 0,
+                                        PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
+   }
+
+   /* float support - assume nothing exclusively supports 64-bit floats */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW |
+                                   PIPE_BIND_RENDER_TARGET) &&
+      screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW |
+                                   PIPE_BIND_RENDER_TARGET)) {
+      ctx->Extensions.ARB_texture_float = GL_TRUE;
+   }
+
+   /* sRGB support */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) ||
+      screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
+      ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
+      if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_RENDER_TARGET) ||
+          screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_RENDER_TARGET)) {
+         ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE;
+         ctx->Const.sRGBCapable = GL_TRUE;
+      }
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.ARB_texture_rg = GL_TRUE;
+   }
+
+   /* s3tc support */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       ctx->Mesa_DXTn) {
+      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
+      ctx->Extensions.S3_s3tc = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM,
+				   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)
+       ) {
+     ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) &&
+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_texture_snorm = GL_TRUE;
+   }
+
+   /* ycbcr support */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW) ||
+       screen->is_format_supported(screen, PIPE_FORMAT_YUYV, 
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
+   }
+
+   /* GL_EXT_texture_array */
+   if (screen->get_param(screen, PIPE_CAP_ARRAY_TEXTURES)) {
+      ctx->Extensions.EXT_texture_array = GL_TRUE;
+      ctx->Extensions.MESA_texture_array = GL_TRUE;
+   }
+
+   /* GL_ARB_framebuffer_object */
+   if (ctx->Extensions.EXT_packed_depth_stencil) {
+      /* we support always support GL_EXT_framebuffer_blit */
+      ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
+   }
+
+   if (st->pipe->render_condition) {
+      ctx->Extensions.NV_conditional_render = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_ENABLE)) {
+      ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC)) {
+      ctx->Extensions.ARB_draw_buffers_blend = GL_TRUE;
+   }
+
+   /* GL_ARB_half_float_vertex */
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,
+                                   PIPE_BUFFER, 0,
+                                   PIPE_BIND_VERTEX_BUFFER)) {
+      ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FIXED,
+                                   PIPE_BUFFER, 0,
+                                   PIPE_BIND_VERTEX_BUFFER)) {
+      ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;
+   }
+
+   if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
+#if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */
+      ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
+#endif
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {
+      ctx->Extensions.NV_primitive_restart = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_DEPTH_CLAMP)) {
+      ctx->Extensions.ARB_depth_clamp = GL_TRUE;
+   }
+
+   /* This extension does not actually require support of floating point
+    * render targets, just clamping controls.
+    * Advertise this extension if either fragment color clamping is supported
+    * or no render targets having color values outside of the range [0, 1]
+    * are supported, in which case the fragment color clamping has no effect
+    * on rendering.
+    */
+   if (screen->get_param(screen, PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL) ||
+       (!screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET) &&
+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET) &&
+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET) &&
+        !screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET) &&
+        !screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET) &&
+        !screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,
+                                     PIPE_TEXTURE_2D, 0,
+                                     PIPE_BIND_RENDER_TARGET))) {
+      ctx->Extensions.ARB_color_buffer_float = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {
+      ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_TGSI_INSTANCEID)) {
+      ctx->Extensions.ARB_draw_instanced = GL_TRUE;
+   }
+   if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {
+      ctx->Extensions.ARB_instanced_arrays = GL_TRUE;
+   }
+
+   if (screen->fence_finish) {
+      ctx->Extensions.ARB_sync = GL_TRUE;
+   }
+
+   if (st->pipe->texture_barrier) {
+      ctx->Extensions.NV_texture_barrier = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE;
+   }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_RENDER_TARGET |
+                                   PIPE_BIND_SAMPLER_VIEW)) {
+      ctx->Extensions.EXT_packed_float = GL_TRUE;
+   }
+
+   if (screen->get_param(screen, PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE)) {
+      ctx->Extensions.ARB_seamless_cube_map = GL_TRUE;
+      ctx->Extensions.AMD_seamless_cubemap_per_texture = GL_TRUE;
+   }
+   else if (screen->get_param(screen, PIPE_CAP_SEAMLESS_CUBE_MAP)) {
+      ctx->Extensions.ARB_seamless_cube_map = GL_TRUE;
+   }
+}
diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c
index ba2f84160..31553cb5d 100644
--- a/mkfontscale/mkfontscale.c
+++ b/mkfontscale/mkfontscale.c
@@ -940,10 +940,8 @@ doDirectory(char *dirname_given, int numEncodings, ListPtr encodingsToDo)
             }
         }
     done:
-        if(have_face) {
+        if(have_face)
             FT_Done_Face(face);
-            have_face = 0;
-        }
         deepDestroyList(xlfd);
         xlfd = NULL;
         free(filename);