svn merge ^/branches/released .

12 files changed, 491 insertions, 423 deletions

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index 8059bb472..b63307f53 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -204,7 +204,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

 

 builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o

-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

+	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

 

 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

 	@echo Regenerating builtin_function.cpp...

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index b8a812d94..344d76b57 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -603,7 +603,8 @@ shift_result_type(const struct glsl_type *type_a,
  */

 ir_rvalue *

 validate_assignment(struct _mesa_glsl_parse_state *state,

-		    const glsl_type *lhs_type, ir_rvalue *rhs)

+		    const glsl_type *lhs_type, ir_rvalue *rhs,

+		    bool is_initializer)

 {

    /* If there is already some error in the RHS, just return it.  Anything

     * else will lead to an avalanche of error message back to the user.

@@ -617,12 +618,13 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
       return rhs;

 

    /* If the array element types are the same and the size of the LHS is zero,

-    * the assignment is okay.

+    * the assignment is okay for initializers embedded in variable

+    * declarations.

     *

     * Note: Whole-array assignments are not permitted in GLSL 1.10, but this

     * is handled by ir_dereference::is_lvalue.

     */

-   if (lhs_type->is_array() && rhs->type->is_array()

+   if (is_initializer && lhs_type->is_array() && rhs->type->is_array()

        && (lhs_type->element_type() == rhs->type->element_type())

        && (lhs_type->array_size() == 0)) {

       return rhs;

@@ -639,7 +641,7 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
 

 ir_rvalue *

 do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,

-	      ir_rvalue *lhs, ir_rvalue *rhs,

+	      ir_rvalue *lhs, ir_rvalue *rhs, bool is_initializer,

 	      YYLTYPE lhs_loc)

 {

    void *ctx = state;

@@ -665,7 +667,8 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
       }

    }

 

-   ir_rvalue *new_rhs = validate_assignment(state, lhs->type, rhs);

+   ir_rvalue *new_rhs =

+      validate_assignment(state, lhs->type, rhs, is_initializer);

    if (new_rhs == NULL) {

       _mesa_glsl_error(& lhs_loc, state, "type mismatch");

    } else {

@@ -918,7 +921,7 @@ ast_expression::hir(exec_list *instructions,
       op[0] = this->subexpressions[0]->hir(instructions, state);

       op[1] = this->subexpressions[1]->hir(instructions, state);

 

-      result = do_assignment(instructions, state, op[0], op[1],

+      result = do_assignment(instructions, state, op[0], op[1], false,

 			     this->subexpressions[0]->get_location());

       error_emitted = result->type->is_error();

       type = result->type;

@@ -1245,7 +1248,7 @@ ast_expression::hir(exec_list *instructions,
 						   op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = (op[0]->type->is_error());

@@ -1271,7 +1274,7 @@ ast_expression::hir(exec_list *instructions,
 					op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = type->is_error();

@@ -1287,7 +1290,7 @@ ast_expression::hir(exec_list *instructions,
       ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

                                                    type, op[0], op[1]);

       result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

-                             temp_rhs,

+                             temp_rhs, false,

                              this->subexpressions[0]->get_location());

       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

       break;

@@ -1303,7 +1306,7 @@ ast_expression::hir(exec_list *instructions,
       ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

                                                    type, op[0], op[1]);

       result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

-                             temp_rhs,

+                             temp_rhs, false,

                              this->subexpressions[0]->get_location());

       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

       break;

@@ -1419,7 +1422,7 @@ ast_expression::hir(exec_list *instructions,
 					op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = op[0]->type->is_error();

@@ -1448,7 +1451,7 @@ ast_expression::hir(exec_list *instructions,
       result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));

 

       (void)do_assignment(instructions, state,

-			  op[0]->clone(ctx, NULL), temp_rhs,

+			  op[0]->clone(ctx, NULL), temp_rhs, false,

 			  this->subexpressions[0]->get_location());

 

       type = result->type;

@@ -2234,7 +2237,7 @@ process_initializer(ir_variable *var, ast_declaration *decl,
     */

    if (type->qualifier.flags.q.constant

        || type->qualifier.flags.q.uniform) {

-      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);

+      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs, true);

       if (new_rhs != NULL) {

 	 rhs = new_rhs;

 

@@ -2276,7 +2279,7 @@ process_initializer(ir_variable *var, ast_declaration *decl,
       const glsl_type *initializer_type;

       if (!type->qualifier.flags.q.uniform) {

 	 result = do_assignment(initializer_instructions, state,

-				lhs, rhs,

+				lhs, rhs, true,

 				type->get_location());

 	 initializer_type = result->type;

       } else

diff --git a/mesalib/src/glsl/glsl_symbol_table.cpp b/mesalib/src/glsl/glsl_symbol_table.cpp
index 9714384eb..fa6458df5 100644
--- a/mesalib/src/glsl/glsl_symbol_table.cpp
+++ b/mesalib/src/glsl/glsl_symbol_table.cpp
@@ -1,168 +1,169 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (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 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 SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "glsl_symbol_table.h"
-
-class symbol_table_entry {
-public:
-   /* Callers of this ralloc-based new need not call delete. It's
-    * easier to just ralloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *entry = ralloc_size(ctx, size);
-      assert(entry != NULL);
-      return entry;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just ralloc_free. */
-   static void operator delete(void *entry, void *ctx)
-   {
-      ralloc_free(entry);
-   }
-   static void operator delete(void *entry)
-   {
-      ralloc_free(entry);
-   }
-
-   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}
-   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}
-   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}
-
-   ir_variable *v;
-   ir_function *f;
-   const glsl_type *t;
-};
-
-glsl_symbol_table::glsl_symbol_table()
-{
-   this->language_version = 120;
-   this->table = _mesa_symbol_table_ctor();
-   this->mem_ctx = ralloc_context(NULL);
-}
-
-glsl_symbol_table::~glsl_symbol_table()
-{
-   _mesa_symbol_table_dtor(table);
-   ralloc_free(mem_ctx);
-}
-
-void glsl_symbol_table::push_scope()
-{
-   _mesa_symbol_table_push_scope(table);
-}
-
-void glsl_symbol_table::pop_scope()
-{
-   _mesa_symbol_table_pop_scope(table);
-}
-
-bool glsl_symbol_table::name_declared_this_scope(const char *name)
-{
-   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;
-}
-
-bool glsl_symbol_table::add_variable(ir_variable *v)
-{
-   if (this->language_version == 110) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(v->name);
-      if (name_declared_this_scope(v->name)) {
-	 /* If there's already an existing function (not a constructor!) in
-	  * the current scope, just update the existing entry to include 'v'.
-	  */
-	 if (existing->v == NULL && existing->t == NULL) {
-	    existing->v = v;
-	    return true;
-	 }
-      } else {
-	 /* If not declared at this scope, add a new entry.  But if an existing
-	  * entry includes a function, propagate that to this block - otherwise
-	  * the new variable declaration would shadow the function.
-	  */
-	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-	 if (existing != NULL)
-	    entry->f = existing->f;
-	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);
-	 assert(added == 0);
-	 (void)added;
-	 return true;
-      }
-      return false;
-   }
-
-   /* 1.20+ rules: */
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);
-   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_function(ir_function *f)
-{
-   if (this->language_version == 110 && name_declared_this_scope(f->name)) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(f->name);
-      if ((existing->f == NULL) && (existing->t == NULL)) {
-	 existing->f = f;
-	 return true;
-      }
-   }
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;
-}
-
-void glsl_symbol_table::add_global_function(ir_function *f)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);
-   assert(added == 0);
-}
-
-ir_variable *glsl_symbol_table::get_variable(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->v : NULL;
-}
-
-const glsl_type *glsl_symbol_table::get_type(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->t : NULL;
-}
-
-ir_function *glsl_symbol_table::get_function(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->f : NULL;
-}
-
-symbol_table_entry *glsl_symbol_table::get_entry(const char *name)
-{
-   return (symbol_table_entry *)
-      _mesa_symbol_table_find_symbol(table, -1, name);
-}
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (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 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 SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#include "glsl_symbol_table.h"

+

+class symbol_table_entry {

+public:

+   /* Callers of this ralloc-based new need not call delete. It's

+    * easier to just ralloc_free 'ctx' (or any of its ancestors). */

+   static void* operator new(size_t size, void *ctx)

+   {

+      void *entry = ralloc_size(ctx, size);

+      assert(entry != NULL);

+      return entry;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just ralloc_free. */

+   static void operator delete(void *entry, void *ctx)

+   {

+      ralloc_free(entry);

+   }

+   static void operator delete(void *entry)

+   {

+      ralloc_free(entry);

+   }

+

+   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}

+   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}

+   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}

+

+   ir_variable *v;

+   ir_function *f;

+   const glsl_type *t;

+};

+

+glsl_symbol_table::glsl_symbol_table()

+{

+   this->language_version = 120;

+   this->table = _mesa_symbol_table_ctor();

+   this->mem_ctx = ralloc_context(NULL);

+}

+

+glsl_symbol_table::~glsl_symbol_table()

+{

+   _mesa_symbol_table_dtor(table);

+   ralloc_free(mem_ctx);

+}

+

+void glsl_symbol_table::push_scope()

+{

+   _mesa_symbol_table_push_scope(table);

+}

+

+void glsl_symbol_table::pop_scope()

+{

+   _mesa_symbol_table_pop_scope(table);

+}

+

+bool glsl_symbol_table::name_declared_this_scope(const char *name)

+{

+   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;

+}

+

+bool glsl_symbol_table::add_variable(ir_variable *v)

+{

+   if (this->language_version == 110) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(v->name);

+      if (name_declared_this_scope(v->name)) {

+	 /* If there's already an existing function (not a constructor!) in

+	  * the current scope, just update the existing entry to include 'v'.

+	  */

+	 if (existing->v == NULL && existing->t == NULL) {

+	    existing->v = v;

+	    return true;

+	 }

+      } else {

+	 /* If not declared at this scope, add a new entry.  But if an existing

+	  * entry includes a function, propagate that to this block - otherwise

+	  * the new variable declaration would shadow the function.

+	  */

+	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+	 if (existing != NULL)

+	    entry->f = existing->f;

+	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);

+	 assert(added == 0);

+	 (void)added;

+	 return true;

+      }

+      return false;

+   }

+

+   /* 1.20+ rules: */

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);

+   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_function(ir_function *f)

+{

+   if (this->language_version == 110 && name_declared_this_scope(f->name)) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(f->name);

+      if ((existing->f == NULL) && (existing->t == NULL)) {

+	 existing->f = f;

+	 return true;

+      }

+   }

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;

+}

+

+void glsl_symbol_table::add_global_function(ir_function *f)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);

+   assert(added == 0);

+   (void)added;

+}

+

+ir_variable *glsl_symbol_table::get_variable(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->v : NULL;

+}

+

+const glsl_type *glsl_symbol_table::get_type(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->t : NULL;

+}

+

+ir_function *glsl_symbol_table::get_function(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->f : NULL;

+}

+

+symbol_table_entry *glsl_symbol_table::get_entry(const char *name)

+{

+   return (symbol_table_entry *)

+      _mesa_symbol_table_find_symbol(table, -1, name);

+}

diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index ceb989110..7ee07f3c6 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1157,7 +1157,7 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
    this->sampler = sampler;

    this->type = type;

 

-   assert(sampler->type->sampler_type == type->base_type);

+   assert(sampler->type->sampler_type == (int) type->base_type);

    if (sampler->type->sampler_shadow)

       assert(type->vector_elements == 4 || type->vector_elements == 1);

    else

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 2eb8a18c9..eaba09dcf 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -43,7 +43,7 @@ endef
 

 define mesa-cxx-c

 	@mkdir -p $(dir $@)

-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS)

+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)

 endef

 

 $(MESA_OBJ_DIR)/%.o: %.c

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index ea8262086..6de672e92 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -56,6 +56,10 @@ struct extension {
 

    /** Set of API's in which the extension exists, as a bitset. */

    uint8_t api_set;

+

+   /** Year the extension was proposed or approved.  Used to sort the 

+    * extension string chronologically. */

+   uint16_t year;

 };

 

 

@@ -73,229 +77,229 @@ struct extension {
  */

 static const struct extension extension_table[] = {

    /* ARB Extensions */

-   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL             },

-   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL             },

-   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL             },

-   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL             },

-   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL             },

-   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL             },

-   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL             },

-   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL             },

-   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL             },

-   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL             },

-   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL             },

-   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL             },

-   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL             },

-   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL             },

-   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL             },

-   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL             },

-   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL             },

-   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL             },

-   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL             },

-   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL             },

-   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL             },

-   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL             },

-   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL             },

-   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL             },

-   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL             },

-   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL             },

-   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL             },

-   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL             },

-   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL             },

-   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL             },

-   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL             },

-   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL             },

-   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL             },

-   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL             },

-   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL             },

-   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL             },

-   { "GL_ARB_sync",                                o(ARB_sync),                                GL             },

-   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL             },

-   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL             },

-   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL             },

-   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL             },

-   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL             },

-   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL             },

-   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL             },

-   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL             },

-   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL             },

-   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL             },

-   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL             },

-   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL             },

-   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL             },

-   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL             },

-   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL             },

-   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL             },

-   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL             },

-   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL             },

-   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL             },

-   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL             },

-   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL             },

-   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL             },

-   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL             },

-   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL             },

-   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL             },

-   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL             },

+   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },

+   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },

+   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },

+   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },

+   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },

+   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },

+   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },

+   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },

+   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },

+   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },

+   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },

+   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },

+   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },

+   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },

+   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },

+   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },

+   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },

+   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },

+   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },

+   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },

+   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },

+   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },

+   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },

+   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },

+   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },

+   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },

+   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },

+   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },

+   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },

+   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },

+   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },

+   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },

+   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },

+   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },

+   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },

+   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },

+   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },

+   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },

+   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },

+   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },

+   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },

+   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },

+   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },

+   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },

+   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },

+   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },

+   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },

+   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },

+   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },

+   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },

+   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },

+   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },

+   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },

+   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },

 

    /* EXT extensions */

-   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL             },

-   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL             },

-   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL             },

-   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL             },

-   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL             },

-   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL             },

-   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2 },

-   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL             },

-   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL             },

-   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL             },

-   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL             },

-   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL             },

-   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL             },

-   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL             },

-   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL             },

-   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL             },

-   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL             },

-   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL             },

-   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL             },

-   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL             },

-   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL             },

-   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL             },

-   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2 },

-   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL             },

-   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL             },

-   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL             },

-   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL             },

-   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL             },

-   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL             },

-   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL             },

-   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL             },

-   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL             },

-   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL             },

-   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL             },

-   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL             },

-   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL             },

-   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL             },

-   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL             },

-   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL             },

-   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL             },

-   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL             },

-   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL             },

-   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2 },

-   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL             },

-   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL             },

-   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL             },

-   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL             },

-   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL             },

-   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL             },

-   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL             },

-   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL             },

-   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2 },

-   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2 },

-   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL             },

-   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1       },

-   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL             },

-   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL             },

-   { "GL_EXT_texture",                             o(EXT_texture),                             GL             },

-   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL             },

-   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL             },

-   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL             },

-   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL             },

-   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL             },

-   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2 },

-   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL             },

-   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL             },

-   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL             },

-   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL             },

-   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL             },

+   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },

+   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },

+   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },

+   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },

+   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },

+   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },

+   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },

+   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },

+   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },

+   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },

+   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },

+   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },

+   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },

+   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },

+   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },

+   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },

+   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },

+   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },

+   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },

+   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },

+   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },

+   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },

+   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },

+   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },

+   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },

+   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },

+   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },

+   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },

+   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },

+   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },

+   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },

+   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },

+   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },

+   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },

+   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },

+   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },

+   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },

+   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },

+   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },

+   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },

+   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },

+   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },

+   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },

+   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },

+   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },

+   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },

+   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },

+   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },

+   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },

+   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },

+   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },

+   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },

+   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },

+   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },

+   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },

+   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },

+   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },

 

    /* OES extensions */

-   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1       },

-   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1       },

-   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1       },

-   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE                },

-   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE                },

-   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2 },

+   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },

+   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },

+   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },

+   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },

+   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },

 #if FEATURE_OES_draw_texture

-   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2 },

+   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },

 #endif

 #if FEATURE_OES_EGL_image

    /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */

-   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2 },

-#endif

-   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2 },

-   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1       },

-   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1       },

-   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2 },

-   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1       },

-   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2 },

-   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1       },

-   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1       },

-   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1       },

-   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2 },

-   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE                },

-   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE                },

-   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1       },

-   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2 },

-   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1       },

-   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1       },

-   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1       },

-   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2 },

+   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },

+#endif

+   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },

+   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },

+   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },

+   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },

+   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },

+   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },

+   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },

+   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },

+   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },

+   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },

+   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },

+   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },

+   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },

 

    /* Vendor extensions */

-   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL             },

-   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL             },

-   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL             },

-   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL             },

-   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL             },

-   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL             },

-   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL             },

-   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL             },

-   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL             },

-   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL             },

-   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL             },

-   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL             },

-   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL             },

-   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL             },

-   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL             },

-   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL             },

-   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL             },

-   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL             },

-   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL             },

-   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL             },

-   { "GL_MESA_texture_signed_rgba",                o(MESA_texture_signed_rgba),                GL             },

-   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL             },

-   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL             },

-   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL             },

-   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL             },

-   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL             },

-   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL             },

-   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL             },

-   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL             },

-   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL             },

-   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL             },

-   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL             },

-   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL             },

-   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL             },

-   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL             },

-   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL             },

-   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL             },

-   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL             },

-   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL             },

-   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL             },

-   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL             },

-   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL             },

-   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL             },

-   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL             },

-   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL             },

-

-   { 0, 0, 0 },

+   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },

+   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },

+   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },

+   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },

+   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },

+   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },

+   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },

+   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },

+   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },

+   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },

+   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },

+   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },

+   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },

+   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },

+   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },

+   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },

+   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },

+   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },

+   { "GL_MESA_texture_signed_rgba",                o(MESA_texture_signed_rgba),                GL,             2009 },

+   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },

+   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL,             2009 },

+   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },

+   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },

+   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },

+   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },

+   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },

+   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },

+   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },

+   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },

+   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },

+   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },

+   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },

+   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },

+   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },

+   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },

+   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },

+   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },

+   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },

+   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },

+   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },

+   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },

+   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },

+

+   { 0, 0, 0, 0 },

 };

 

 

@@ -823,6 +827,34 @@ _mesa_init_extensions( struct gl_context *ctx )
 }

 

 

+typedef unsigned short extension_index;

+

+

+/**

+ * Compare two entries of the extensions table.  Sorts first by year,

+ * then by name.

+ *

+ * Arguments are indices into extension_table.

+ */

+static int

+extension_compare(const void *p1, const void *p2)

+{

+   extension_index i1 = * (const extension_index *) p1;

+   extension_index i2 = * (const extension_index *) p2;

+   const struct extension *e1 = &extension_table[i1];

+   const struct extension *e2 = &extension_table[i2];

+   int res;

+

+   res = (int)e1->year - (int)e2->year;

+

+   if (res == 0) {

+      res = strcmp(e1->name, e2->name);

+   }

+

+   return res;

+}

+

+

 /**

  * Construct the GL_EXTENSIONS string.  Called the first time that

  * glGetString(GL_EXTENSIONS) is called.

@@ -834,15 +866,23 @@ _mesa_make_extension_string(struct gl_context *ctx)
    char *exts = 0;

    /* Length of extension string. */

    size_t length = 0;

+   /* Number of extensions */

+   unsigned count;

+   /* Indices of the extensions sorted by year */

+   extension_index *extension_indices;

    /* String of extra extensions. */

    char *extra_extensions = get_extension_override(ctx);

    GLboolean *base = (GLboolean *) &ctx->Extensions;

    const struct extension *i;

+   unsigned j;

+

 

    /* Compute length of the extension string. */

+   count = 0;

    for (i = extension_table; i->name != 0; ++i) {

       if (base[i->offset] && (i->api_set & (1 << ctx->API))) {

 	 length += strlen(i->name) + 1; /* +1 for space */

+	 ++count;

       }

    }

    if (extra_extensions != NULL)

@@ -854,13 +894,35 @@ _mesa_make_extension_string(struct gl_context *ctx)
       return NULL;

    }

 

-   /* Build the extension string.*/

+   extension_indices = malloc(count * sizeof extension_indices);

+   if (extension_indices == NULL) {

+      free(exts);

+      free(extra_extensions);

+      return NULL;

+   }

+

+   /* Sort extensions in chronological order because certain old applications (e.g.,

+    * Quake3 demo) store the extension list in a static size buffer so chronologically

+    * order ensure that the extensions that such applications expect will fit into

+    * that buffer.

+    */

+   j = 0;

    for (i = extension_table; i->name != 0; ++i) {

       if (base[i->offset] && (i->api_set & (1 << ctx->API))) {

-         strcat(exts, i->name);

-         strcat(exts, " ");

+         extension_indices[j++] = i - extension_table;

       }

    }

+   assert(j == count);

+   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);

+

+   /* Build the extension string.*/

+   for (j = 0; j < count; ++j) {

+      i = &extension_table[extension_indices[j]];

+      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));

+      strcat(exts, i->name);

+      strcat(exts, " ");

+   }

+   free(extension_indices);

    if (extra_extensions != 0) {

       strcat(exts, extra_extensions);

       free(extra_extensions);

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 51589aaa8..c6678b85c 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -85,7 +85,7 @@
 typedef GLuint64 GLbitfield64;

 

 /** Set a single bit */

-#define BITFIELD64_BIT(b)      (1ULL << (b))

+#define BITFIELD64_BIT(b)      ((GLbitfield64)1 << (b))

 

 

 /**

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index c1fc05c44..fa45cfb17 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -39,6 +39,7 @@
 #include "macros.h"

 #include "teximage.h"

 #include "texobj.h"

+#include "texstate.h"

 #include "mtypes.h"

 #include "program/prog_instruction.h"

 

@@ -1013,11 +1014,9 @@ void GLAPIENTRY
 _mesa_BindTexture( GLenum target, GLuint texName )

 {

    GET_CURRENT_CONTEXT(ctx);

-   const GLuint unit = ctx->Texture.CurrentUnit;

-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

-   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_texture_object *newTexObj = NULL;

    GLint targetIndex;

-   GLboolean early_out = GL_FALSE;

    ASSERT_OUTSIDE_BEGIN_END(ctx);

 

    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

@@ -1030,13 +1029,13 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       return;

    }

    assert(targetIndex < NUM_TEXTURE_TARGETS);

-   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];

 

    /*

     * Get pointer to new texture object (newTexObj)

     */

    if (texName == 0) {

-      newTexObj = defaultTexObj;

+      /* Use a default texture object */

+      newTexObj = ctx->Shared->DefaultTex[targetIndex];

    }

    else {

       /* non-default texture object */

@@ -1071,15 +1070,18 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 

    assert(valid_texture_object(newTexObj));

 

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

-   if ((ctx->Shared->RefCount == 1)

-       && (newTexObj == texUnit->CurrentTex[targetIndex])) {

-      early_out = GL_TRUE;

-   }

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

-

-   if (early_out) {

-      return;

+   /* Check if this texture is only used by this context and is already bound.

+    * If so, just return.

+    */

+   {

+      GLboolean early_out;

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      early_out = ((ctx->Shared->RefCount == 1)

+                   && (newTexObj == texUnit->CurrentTex[targetIndex]));

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+      if (early_out) {

+         return;

+      }

    }

 

    /* flush before changing binding */

diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index 6c97787e8..e0bffc7c6 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -811,7 +811,7 @@ _mesa_combine_programs(struct gl_context *ctx,
       /* Connect color outputs of fprogA to color inputs of fprogB, via a

        * new temporary register.

        */

-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&

+      if ((progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) &&

           (progB_inputsRead & FRAG_BIT_COL0)) {

          GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,

                                                   firstTemp);

@@ -834,7 +834,7 @@ _mesa_combine_programs(struct gl_context *ctx,
 

       /* compute combined program's InputsRead */

       inputsB = progB_inputsRead;

-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {

+      if (progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {

          inputsB &= ~(1 << FRAG_ATTRIB_COL0);

       }

       newProg->InputsRead = progA->InputsRead | inputsB;

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
index 98be6ab75..e0a1cba2b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -187,7 +187,7 @@ get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)
    inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;

    ic++;

    fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);

-   fp->Base.OutputsWritten = (1 << FRAG_RESULT_COLOR);

+   fp->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);

    fp->Base.SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */

 

    if (key->scaleAndBias) {

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 5c95eddd0..2909d9d95 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -213,9 +213,9 @@ st_make_drawpix_z_stencil_program(struct st_context *st,
    p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;

    p->OutputsWritten = 0;

    if (write_depth)

-      p->OutputsWritten |= (1 << FRAG_RESULT_DEPTH);

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_DEPTH);

    if (write_stencil)

-      p->OutputsWritten |= (1 << FRAG_RESULT_STENCIL);

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_STENCIL);

 

    p->SamplersUsed =  0x1;  /* sampler 0 (bit 0) is used */

    if (write_stencil)

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index e5c26c563..1efc58799 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -798,7 +798,7 @@ st_translate_geometry_program(struct st_context *st,
     * mapping and the semantic information for each output.

     */

    for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {

-      if (stgp->Base.Base.OutputsWritten & (1 << attr)) {

+      if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {

          GLuint slot;

 

          slot = gs_num_outputs;