svn merge ^/branches/released .

31 files changed, 1085 insertions, 540 deletions

diff --git a/mesalib/common.py b/mesalib/common.py
index 157873f66..089a4ee02 100644
--- a/mesalib/common.py
+++ b/mesalib/common.py
@@ -83,7 +83,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,

 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))

 	opts.Add(EnumOption('platform', 'target platform', host_platform,

-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos5', 'freebsd8')))

+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos', 'freebsd8')))

 	opts.Add('toolchain', 'compiler toolchain', default_toolchain)

 	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))

 	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index fc3c853d4..7c75a7101 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -39,6 +39,8 @@ 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:

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index 4d9d4562c..fc1a34135 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -70,6 +70,7 @@ public:
    virtual ir_visitor_status visit_leave(ir_swizzle *ir);

 

    virtual ir_visitor_status visit_enter(ir_assignment *ir);

+   virtual ir_visitor_status visit_enter(ir_call *ir);

 

    static void validate_ir(ir_instruction *ir, void *data);

 

@@ -173,6 +174,19 @@ ir_validate::visit_enter(ir_function *ir)
 

    this->validate_ir(ir, this->data);

 

+   /* Verify that all of the things stored in the list of signatures are,

+    * in fact, function signatures.

+    */

+   foreach_list(node, &ir->signatures) {

+      ir_instruction *sig = (ir_instruction *) node;

+

+      if (sig->ir_type != ir_type_function_signature) {

+	 printf("Non-signature in signature list of function `%s'\n",

+		ir->name);

+	 abort();

+      }

+   }

+

    return visit_continue;

 }

 

@@ -198,6 +212,12 @@ ir_validate::visit_enter(ir_function_signature *ir)
       abort();

    }

 

+   if (ir->return_type == NULL) {

+      printf("Function signature %p for function %s has NULL return type.\n",

+	     ir, ir->function_name());

+      abort();

+   }

+

    this->validate_ir(ir, this->data);

 

    return visit_continue;

@@ -488,6 +508,19 @@ ir_validate::visit_enter(ir_assignment *ir)
    return visit_continue;

 }

 

+ir_visitor_status

+ir_validate::visit_enter(ir_call *ir)

+{

+   ir_function_signature *const callee = ir->get_callee();

+

+   if (callee->ir_type != ir_type_function_signature) {

+      printf("IR called by ir_call is not ir_function_signature!\n");

+      abort();

+   }

+

+   return visit_continue;

+}

+

 void

 ir_validate::validate_ir(ir_instruction *ir, void *data)

 {

diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index bc8758438..76687b6be 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -99,9 +99,15 @@ public:
        * details that may be missing.

        */

       ir_function *f = linked->symbols->get_function(name);

-      if (f == NULL)

+      if (f == NULL) {

 	 f = new(linked) ir_function(name);

 

+	 /* Add the new function to the linked IR.

+	  */

+	 linked->symbols->add_function(f);

+	 linked->ir->push_head(f);

+      }

+

       ir_function_signature *linked_sig =

 	 f->exact_matching_signature(&callee->parameters);

       if (linked_sig == NULL) {

diff --git a/mesalib/src/glsl/opt_function_inlining.cpp b/mesalib/src/glsl/opt_function_inlining.cpp
index 2e7831dcb..3cc405b95 100644
--- a/mesalib/src/glsl/opt_function_inlining.cpp
+++ b/mesalib/src/glsl/opt_function_inlining.cpp
@@ -1,425 +1,422 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_function_inlining.cpp
- *
- * Replaces calls to functions with the body of the function.
- */
-
-#include <inttypes.h>
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_function_inlining.h"
-#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-#include "program/hash_table.h"
-
-static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref);
-
-class ir_function_inlining_visitor : public ir_hierarchical_visitor {
-public:
-   ir_function_inlining_visitor()
-   {
-      progress = false;
-   }
-
-   virtual ~ir_function_inlining_visitor()
-   {
-      /* empty */
-   }
-
-   virtual ir_visitor_status visit_enter(ir_expression *);
-   virtual ir_visitor_status visit_enter(ir_call *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
-   virtual ir_visitor_status visit_enter(ir_return *);
-   virtual ir_visitor_status visit_enter(ir_texture *);
-   virtual ir_visitor_status visit_enter(ir_swizzle *);
-
-   bool progress;
-};
-
-
-bool
-automatic_inlining_predicate(ir_instruction *ir)
-{
-   ir_call *call = ir->as_call();
-
-   if (call && can_inline(call))
-      return true;
-
-   return false;
-}
-
-bool
-do_function_inlining(exec_list *instructions)
-{
-   ir_function_inlining_visitor v;
-
-   do_expression_flattening(instructions, automatic_inlining_predicate);
-
-   v.run(instructions);
-
-   return v.progress;
-}
-
-static void
-replace_return_with_assignment(ir_instruction *ir, void *data)
-{
-   void *ctx = ralloc_parent(ir);
-   ir_variable *retval = (ir_variable *)data;
-   ir_return *ret = ir->as_return();
-
-   if (ret) {
-      if (ret->value) {
-	 ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);
-	 ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));
-      } else {
-	 /* un-valued return has to be the last return, or we shouldn't
-	  * have reached here. (see can_inline()).
-	  */
-	 assert(ret->next->is_tail_sentinel());
-	 ret->remove();
-      }
-   }
-}
-
-ir_rvalue *
-ir_call::generate_inline(ir_instruction *next_ir)
-{
-   void *ctx = ralloc_parent(this);
-   ir_variable **parameters;
-   int num_parameters;
-   int i;
-   ir_variable *retval = NULL;
-   struct hash_table *ht;
-
-   ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
-
-   num_parameters = 0;
-   foreach_iter(exec_list_iterator, iter_sig, this->callee->parameters)
-      num_parameters++;
-
-   parameters = new ir_variable *[num_parameters];
-
-   /* Generate storage for the return value. */
-   if (this->callee->return_type) {
-      retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",
-				    ir_var_auto);
-      next_ir->insert_before(retval);
-   }
-
-   /* Generate the declarations for the parameters to our inlined code,
-    * and set up the mapping of real function body variables to ours.
-    */
-   i = 0;
-   exec_list_iterator sig_param_iter = this->callee->parameters.iterator();
-   exec_list_iterator param_iter = this->actual_parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();
-      ir_rvalue *param = (ir_rvalue *) param_iter.get();
-
-      /* Generate a new variable for the parameter. */
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
-	 /* For samplers, we want the inlined sampler references
-	  * referencing the passed in sampler variable, since that
-	  * will have the location information, which an assignment of
-	  * a sampler wouldn't.  Fix it up below.
-	  */
-	 parameters[i] = NULL;
-      } else {
-	 parameters[i] = sig_param->clone(ctx, ht);
-	 parameters[i]->mode = ir_var_auto;
-
-	 /* Remove the read-only decoration becuase we're going to write
-	  * directly to this variable.  If the cloned variable is left
-	  * read-only and the inlined function is inside a loop, the loop
-	  * analysis code will get confused.
-	  */
-	 parameters[i]->read_only = false;
-	 next_ir->insert_before(parameters[i]);
-      }
-
-      /* Move the actual param into our param variable if it's an 'in' type. */
-      if (parameters[i] && (sig_param->mode == ir_var_in ||
-			    sig_param->mode == ir_var_const_in ||
-			    sig_param->mode == ir_var_inout)) {
-	 ir_assignment *assign;
-
-	 assign = new(ctx) ir_assignment(new(ctx) ir_dereference_variable(parameters[i]),
-					 param, NULL);
-	 next_ir->insert_before(assign);
-      }
-
-      sig_param_iter.next();
-      param_iter.next();
-   }
-
-   exec_list new_instructions;
-
-   /* Generate the inlined body of the function to a new list */
-   foreach_iter(exec_list_iterator, iter, callee->body) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_instruction *new_ir = ir->clone(ctx, ht);
-
-      new_instructions.push_tail(new_ir);
-      visit_tree(new_ir, replace_return_with_assignment, retval);
-   }
-
-   /* If any samplers were passed in, replace any deref of the sampler
-    * with a deref of the sampler argument.
-    */
-   param_iter = this->actual_parameters.iterator();
-   sig_param_iter = this->callee->parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_instruction *const param = (ir_instruction *) param_iter.get();
-      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();
-
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
-	 ir_dereference *deref = param->as_dereference();
-
-	 assert(deref);
-	 do_sampler_replacement(&new_instructions, sig_param, deref);
-      }
-      param_iter.next();
-      sig_param_iter.next();
-   }
-
-   /* Now push those new instructions in. */
-   foreach_iter(exec_list_iterator, iter, new_instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      next_ir->insert_before(ir);
-   }
-
-   /* Copy back the value of any 'out' parameters from the function body
-    * variables to our own.
-    */
-   i = 0;
-   param_iter = this->actual_parameters.iterator();
-   sig_param_iter = this->callee->parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_instruction *const param = (ir_instruction *) param_iter.get();
-      const ir_variable *const sig_param = (ir_variable *) sig_param_iter.get();
-
-      /* Move our param variable into the actual param if it's an 'out' type. */
-      if (parameters[i] && (sig_param->mode == ir_var_out ||
-			    sig_param->mode == ir_var_inout)) {
-	 ir_assignment *assign;
-
-	 assign = new(ctx) ir_assignment(param->clone(ctx, NULL)->as_rvalue(),
-					 new(ctx) ir_dereference_variable(parameters[i]),
-					 NULL);
-	 next_ir->insert_before(assign);
-      }
-
-      param_iter.next();
-      sig_param_iter.next();
-   }
-
-   delete [] parameters;
-
-   hash_table_dtor(ht);
-
-   if (retval)
-      return new(ctx) ir_dereference_variable(retval);
-   else
-      return NULL;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_expression *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_return *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_texture *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_swizzle *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_call *ir)
-{
-   if (can_inline(ir)) {
-      /* If the call was part of some tree, then it should have been
-       * flattened out or we shouldn't have seen it because of a
-       * visit_continue_with_parent in this visitor.
-       */
-      assert(ir == base_ir);
-
-      (void) ir->generate_inline(ir);
-      ir->remove();
-      this->progress = true;
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_assignment *ir)
-{
-   ir_call *call = ir->rhs->as_call();
-   if (!call || !can_inline(call))
-      return visit_continue;
-
-   /* generates the parameter setup, function body, and returns the return
-    * value of the function
-    */
-   ir_rvalue *rhs = call->generate_inline(ir);
-   assert(rhs);
-
-   ir->rhs = rhs;
-   this->progress = true;
-
-   return visit_continue;
-}
-
-/**
- * Replaces references to the "sampler" variable with a clone of "deref."
- *
- * From the spec, samplers can appear in the tree as function
- * (non-out) parameters and as the result of array indexing and
- * structure field selection.  In our builtin implementation, they
- * also appear in the sampler field of an ir_tex instruction.
- */
-
-class ir_sampler_replacement_visitor : public ir_hierarchical_visitor {
-public:
-   ir_sampler_replacement_visitor(ir_variable *sampler, ir_dereference *deref)
-   {
-      this->sampler = sampler;
-      this->deref = deref;
-   }
-
-   virtual ~ir_sampler_replacement_visitor()
-   {
-   }
-
-   virtual ir_visitor_status visit_leave(ir_call *);
-   virtual ir_visitor_status visit_leave(ir_dereference_array *);
-   virtual ir_visitor_status visit_leave(ir_dereference_record *);
-   virtual ir_visitor_status visit_leave(ir_texture *);
-
-   void replace_deref(ir_dereference **deref);
-   void replace_rvalue(ir_rvalue **rvalue);
-
-   ir_variable *sampler;
-   ir_dereference *deref;
-};
-
-void
-ir_sampler_replacement_visitor::replace_deref(ir_dereference **deref)
-{
-   ir_dereference_variable *deref_var = (*deref)->as_dereference_variable();
-   if (deref_var && deref_var->var == this->sampler) {
-      *deref = this->deref->clone(ralloc_parent(*deref), NULL);
-   }
-}
-
-void
-ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)
-{
-   if (!*rvalue)
-      return;
-
-   ir_dereference *deref = (*rvalue)->as_dereference();
-
-   if (!deref)
-      return;
-
-   replace_deref(&deref);
-   *rvalue = deref;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)
-{
-   replace_deref(&ir->sampler);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_array *ir)
-{
-   replace_rvalue(&ir->array);
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_record *ir)
-{
-   replace_rvalue(&ir->record);
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_call *ir)
-{
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param = (ir_rvalue *)iter.get();
-      ir_rvalue *new_param = param;
-      replace_rvalue(&new_param);
-
-      if (new_param != param) {
-	 param->replace_with(new_param);
-      }
-   }
-   return visit_continue;
-}
-
-static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref)
-{
-   ir_sampler_replacement_visitor v(sampler, deref);
-
-   visit_list_elements(&v, instructions);
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_function_inlining.cpp

+ *

+ * Replaces calls to functions with the body of the function.

+ */

+

+#include <inttypes.h>

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_function_inlining.h"

+#include "ir_expression_flattening.h"

+#include "glsl_types.h"

+#include "program/hash_table.h"

+

+static void

+do_sampler_replacement(exec_list *instructions,

+		       ir_variable *sampler,

+		       ir_dereference *deref);

+

+class ir_function_inlining_visitor : public ir_hierarchical_visitor {

+public:

+   ir_function_inlining_visitor()

+   {

+      progress = false;

+   }

+

+   virtual ~ir_function_inlining_visitor()

+   {

+      /* empty */

+   }

+

+   virtual ir_visitor_status visit_enter(ir_expression *);

+   virtual ir_visitor_status visit_enter(ir_call *);

+   virtual ir_visitor_status visit_enter(ir_assignment *);

+   virtual ir_visitor_status visit_enter(ir_return *);

+   virtual ir_visitor_status visit_enter(ir_texture *);

+   virtual ir_visitor_status visit_enter(ir_swizzle *);

+

+   bool progress;

+};

+

+

+bool

+automatic_inlining_predicate(ir_instruction *ir)

+{

+   ir_call *call = ir->as_call();

+

+   if (call && can_inline(call))

+      return true;

+

+   return false;

+}

+

+bool

+do_function_inlining(exec_list *instructions)

+{

+   ir_function_inlining_visitor v;

+

+   do_expression_flattening(instructions, automatic_inlining_predicate);

+

+   v.run(instructions);

+

+   return v.progress;

+}

+

+static void

+replace_return_with_assignment(ir_instruction *ir, void *data)

+{

+   void *ctx = ralloc_parent(ir);

+   ir_variable *retval = (ir_variable *)data;

+   ir_return *ret = ir->as_return();

+

+   if (ret) {

+      if (ret->value) {

+	 ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);

+	 ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));

+      } else {

+	 /* un-valued return has to be the last return, or we shouldn't

+	  * have reached here. (see can_inline()).

+	  */

+	 assert(ret->next->is_tail_sentinel());

+	 ret->remove();

+      }

+   }

+}

+

+ir_rvalue *

+ir_call::generate_inline(ir_instruction *next_ir)

+{

+   void *ctx = ralloc_parent(this);

+   ir_variable **parameters;

+   int num_parameters;

+   int i;

+   ir_variable *retval = NULL;

+   struct hash_table *ht;

+

+   ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);

+

+   num_parameters = 0;

+   foreach_iter(exec_list_iterator, iter_sig, this->callee->parameters)

+      num_parameters++;

+

+   parameters = new ir_variable *[num_parameters];

+

+   /* Generate storage for the return value. */

+   if (!this->callee->return_type->is_void()) {

+      retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",

+				    ir_var_auto);

+      next_ir->insert_before(retval);

+   }

+

+   /* Generate the declarations for the parameters to our inlined code,

+    * and set up the mapping of real function body variables to ours.

+    */

+   i = 0;

+   exec_list_iterator sig_param_iter = this->callee->parameters.iterator();

+   exec_list_iterator param_iter = this->actual_parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();

+      ir_rvalue *param = (ir_rvalue *) param_iter.get();

+

+      /* Generate a new variable for the parameter. */

+      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {

+	 /* For samplers, we want the inlined sampler references

+	  * referencing the passed in sampler variable, since that

+	  * will have the location information, which an assignment of

+	  * a sampler wouldn't.  Fix it up below.

+	  */

+	 parameters[i] = NULL;

+      } else {

+	 parameters[i] = sig_param->clone(ctx, ht);

+	 parameters[i]->mode = ir_var_auto;

+

+	 /* Remove the read-only decoration becuase we're going to write

+	  * directly to this variable.  If the cloned variable is left

+	  * read-only and the inlined function is inside a loop, the loop

+	  * analysis code will get confused.

+	  */

+	 parameters[i]->read_only = false;

+	 next_ir->insert_before(parameters[i]);

+      }

+

+      /* Move the actual param into our param variable if it's an 'in' type. */

+      if (parameters[i] && (sig_param->mode == ir_var_in ||

+			    sig_param->mode == ir_var_const_in ||

+			    sig_param->mode == ir_var_inout)) {

+	 ir_assignment *assign;

+

+	 assign = new(ctx) ir_assignment(new(ctx) ir_dereference_variable(parameters[i]),

+					 param, NULL);

+	 next_ir->insert_before(assign);

+      }

+

+      sig_param_iter.next();

+      param_iter.next();

+   }

+

+   exec_list new_instructions;

+

+   /* Generate the inlined body of the function to a new list */

+   foreach_iter(exec_list_iterator, iter, callee->body) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_instruction *new_ir = ir->clone(ctx, ht);

+

+      new_instructions.push_tail(new_ir);

+      visit_tree(new_ir, replace_return_with_assignment, retval);

+   }

+

+   /* If any samplers were passed in, replace any deref of the sampler

+    * with a deref of the sampler argument.

+    */

+   param_iter = this->actual_parameters.iterator();

+   sig_param_iter = this->callee->parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_instruction *const param = (ir_instruction *) param_iter.get();

+      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();

+

+      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {

+	 ir_dereference *deref = param->as_dereference();

+

+	 assert(deref);

+	 do_sampler_replacement(&new_instructions, sig_param, deref);

+      }

+      param_iter.next();

+      sig_param_iter.next();

+   }

+

+   /* Now push those new instructions in. */

+   next_ir->insert_before(&new_instructions);

+

+   /* Copy back the value of any 'out' parameters from the function body

+    * variables to our own.

+    */

+   i = 0;

+   param_iter = this->actual_parameters.iterator();

+   sig_param_iter = this->callee->parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_instruction *const param = (ir_instruction *) param_iter.get();

+      const ir_variable *const sig_param = (ir_variable *) sig_param_iter.get();

+

+      /* Move our param variable into the actual param if it's an 'out' type. */

+      if (parameters[i] && (sig_param->mode == ir_var_out ||

+			    sig_param->mode == ir_var_inout)) {

+	 ir_assignment *assign;

+

+	 assign = new(ctx) ir_assignment(param->clone(ctx, NULL)->as_rvalue(),

+					 new(ctx) ir_dereference_variable(parameters[i]),

+					 NULL);

+	 next_ir->insert_before(assign);

+      }

+

+      param_iter.next();

+      sig_param_iter.next();

+   }

+

+   delete [] parameters;

+

+   hash_table_dtor(ht);

+

+   if (retval)

+      return new(ctx) ir_dereference_variable(retval);

+   else

+      return NULL;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_expression *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_return *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_texture *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_swizzle *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_call *ir)

+{

+   if (can_inline(ir)) {

+      /* If the call was part of some tree, then it should have been

+       * flattened out or we shouldn't have seen it because of a

+       * visit_continue_with_parent in this visitor.

+       */

+      assert(ir == base_ir);

+

+      (void) ir->generate_inline(ir);

+      ir->remove();

+      this->progress = true;

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_assignment *ir)

+{

+   ir_call *call = ir->rhs->as_call();

+   if (!call || !can_inline(call))

+      return visit_continue;

+

+   /* generates the parameter setup, function body, and returns the return

+    * value of the function

+    */

+   ir_rvalue *rhs = call->generate_inline(ir);

+   assert(rhs);

+

+   ir->rhs = rhs;

+   this->progress = true;

+

+   return visit_continue;

+}

+

+/**

+ * Replaces references to the "sampler" variable with a clone of "deref."

+ *

+ * From the spec, samplers can appear in the tree as function

+ * (non-out) parameters and as the result of array indexing and

+ * structure field selection.  In our builtin implementation, they

+ * also appear in the sampler field of an ir_tex instruction.

+ */

+

+class ir_sampler_replacement_visitor : public ir_hierarchical_visitor {

+public:

+   ir_sampler_replacement_visitor(ir_variable *sampler, ir_dereference *deref)

+   {

+      this->sampler = sampler;

+      this->deref = deref;

+   }

+

+   virtual ~ir_sampler_replacement_visitor()

+   {

+   }

+

+   virtual ir_visitor_status visit_leave(ir_call *);

+   virtual ir_visitor_status visit_leave(ir_dereference_array *);

+   virtual ir_visitor_status visit_leave(ir_dereference_record *);

+   virtual ir_visitor_status visit_leave(ir_texture *);

+

+   void replace_deref(ir_dereference **deref);

+   void replace_rvalue(ir_rvalue **rvalue);

+

+   ir_variable *sampler;

+   ir_dereference *deref;

+};

+

+void

+ir_sampler_replacement_visitor::replace_deref(ir_dereference **deref)

+{

+   ir_dereference_variable *deref_var = (*deref)->as_dereference_variable();

+   if (deref_var && deref_var->var == this->sampler) {

+      *deref = this->deref->clone(ralloc_parent(*deref), NULL);

+   }

+}

+

+void

+ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)

+{

+   if (!*rvalue)

+      return;

+

+   ir_dereference *deref = (*rvalue)->as_dereference();

+

+   if (!deref)

+      return;

+

+   replace_deref(&deref);

+   *rvalue = deref;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)

+{

+   replace_deref(&ir->sampler);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_dereference_array *ir)

+{

+   replace_rvalue(&ir->array);

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_dereference_record *ir)

+{

+   replace_rvalue(&ir->record);

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_call *ir)

+{

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_rvalue *param = (ir_rvalue *)iter.get();

+      ir_rvalue *new_param = param;

+      replace_rvalue(&new_param);

+

+      if (new_param != param) {

+	 param->replace_with(new_param);

+      }

+   }

+   return visit_continue;

+}

+

+static void

+do_sampler_replacement(exec_list *instructions,

+		       ir_variable *sampler,

+		       ir_dereference *deref)

+{

+   ir_sampler_replacement_visitor v(sampler, deref);

+

+   visit_list_elements(&v, instructions);

+}

diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index dbd6ebe9d..410eacba7 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -197,6 +197,7 @@ statetracker_sources = [
     'state_tracker/st_cb_queryobj.c',

     'state_tracker/st_cb_rasterpos.c',

     'state_tracker/st_cb_readpixels.c',

+    'state_tracker/st_cb_syncobj.c',

     'state_tracker/st_cb_strings.c',

     'state_tracker/st_cb_texture.c',

     'state_tracker/st_cb_viewport.c',

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index a4aa9847a..6de0ca696 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -181,6 +181,7 @@ static const struct extension extension_table[] = {
    { "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             },

@@ -258,6 +259,7 @@ static const struct extension extension_table[] = {
    { "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             },

@@ -448,6 +450,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
 #if FEATURE_ATI_fragment_shader

    ctx->Extensions.ATI_fragment_shader = GL_TRUE;

 #endif

+   ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

    ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;

    ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

    ctx->Extensions.ATI_separate_stencil = GL_TRUE;

@@ -483,6 +486,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

    ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

    ctx->Extensions.EXT_texture_array = GL_TRUE;

+   ctx->Extensions.EXT_texture_compression_latc = 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;

diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 1d7bdad24..e2541bdf6 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -927,6 +927,42 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      0, 0, 0, 0, 0,

      4, 4, 16                     /* 16 bytes per 4x4 block */

    },

+   {

+     MESA_FORMAT_L_LATC1,

+     "MESA_FORMAT_L_LATC1",

+     GL_LUMINANCE,

+     GL_UNSIGNED_NORMALIZED,

+     0, 0, 0, 0,

+     4, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_L_LATC1,

+     "MESA_FORMAT_SIGNED_L_LATC1",

+     GL_LUMINANCE,

+     GL_SIGNED_NORMALIZED,

+     0, 0, 0, 0,

+     4, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_LA_LATC2,

+     "MESA_FORMAT_LA_LATC2",

+     GL_LUMINANCE_ALPHA,

+     GL_UNSIGNED_NORMALIZED,

+     0, 0, 0, 4,

+     4, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_LA_LATC2,

+     "MESA_FORMAT_SIGNED_LA_LATC2",

+     GL_LUMINANCE_ALPHA,

+     GL_SIGNED_NORMALIZED,

+     0, 0, 0, 4,

+     4, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

 };

 

 

@@ -1570,6 +1606,10 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_SIGNED_RED_RGTC1:

    case MESA_FORMAT_RG_RGTC2:

    case MESA_FORMAT_SIGNED_RG_RGTC2:

+   case MESA_FORMAT_L_LATC1:

+   case MESA_FORMAT_SIGNED_L_LATC1:

+   case MESA_FORMAT_LA_LATC2:

+   case MESA_FORMAT_SIGNED_LA_LATC2:

       /* XXX generate error instead? */

       *datatype = GL_UNSIGNED_BYTE;

       *comps = 0;

diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index b32829145..81ba76ce0 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -185,6 +185,14 @@ typedef enum
    MESA_FORMAT_RG_RGTC2,

    MESA_FORMAT_SIGNED_RG_RGTC2,

    /*@}*/

+

+   /*@{*/

+   MESA_FORMAT_L_LATC1,

+   MESA_FORMAT_SIGNED_L_LATC1,

+   MESA_FORMAT_LA_LATC2,

+   MESA_FORMAT_SIGNED_LA_LATC2,

+   /*@}*/

+

    MESA_FORMAT_COUNT

 } gl_format;

 

diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h
index 5ca44deb0..dc78ccbf6 100644
--- a/mesalib/src/mesa/main/glheader.h
+++ b/mesalib/src/mesa/main/glheader.h
@@ -121,6 +121,10 @@ typedef void *GLeglImageOES;
 #define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD

 #endif

 

+#ifndef GL_ATI_texture_compression_3dc

+#define GL_ATI_texture_compression_3dc 1

+#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837

+#endif

 

 

 /**

diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 444f21ed5..466fc617a 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -743,6 +743,11 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_SIGNED_RED_RGTC1:

       case GL_COMPRESSED_RG_RGTC2:

       case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

       /* signed, normalized texture formats */

       case GL_RGBA_SNORM:

       case GL_RGBA8_SNORM:

@@ -1025,6 +1030,13 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
    case GL_COMPRESSED_RG_RGTC2:

    case GL_COMPRESSED_SIGNED_RG_RGTC2:

       return ctx->Extensions.ARB_texture_compression_rgtc;

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      return ctx->Extensions.EXT_texture_compression_latc;

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      return ctx->Extensions.ATI_texture_compression_3dc;

    default:

       return GL_FALSE;

    }

diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 453d7f29b..b12399ee6 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -1764,8 +1764,13 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
       } else if (srcImage->_BaseFormat == GL_RGBA) {

          convertFormat = MESA_FORMAT_RGBA8888;

          components = 4;

-      }

-      else {

+      } else if (srcImage->_BaseFormat == GL_LUMINANCE) {

+         convertFormat = MESA_FORMAT_L8;

+         components = 1;

+      } else if (srcImage->_BaseFormat == GL_LUMINANCE_ALPHA) {

+         convertFormat = MESA_FORMAT_AL88;

+         components = 2;

+      } else {

          _mesa_problem(ctx, "bad srcImage->_BaseFormat in _mesa_generate_mipmaps");

          return;

       }

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 2862f88da..4e530a268 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2802,6 +2802,7 @@ struct gl_extensions
    GLboolean EXT_texture_object;

    GLboolean EXT_texture3D;

    GLboolean EXT_texture_array;

+   GLboolean EXT_texture_compression_latc;

    GLboolean EXT_texture_compression_s3tc;

    GLboolean EXT_texture_env_add;

    GLboolean EXT_texture_env_combine;

@@ -2827,6 +2828,7 @@ struct gl_extensions
    GLboolean APPLE_vertex_array_object;

    GLboolean APPLE_object_purgeable;

    GLboolean ATI_envmap_bumpmap;

+   GLboolean ATI_texture_compression_3dc;

    GLboolean ATI_texture_mirror_once;

    GLboolean ATI_texture_env_combine3;

    GLboolean ATI_fragment_shader;

diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index 9891946df..59603e81e 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -173,6 +173,16 @@ _mesa_glenum_to_compressed_format(GLenum format)
    case GL_COMPRESSED_SIGNED_RG_RGTC2:

       return MESA_FORMAT_SIGNED_RG_RGTC2;

 

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      return MESA_FORMAT_L_LATC1;

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      return MESA_FORMAT_SIGNED_L_LATC1;

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      return MESA_FORMAT_LA_LATC2;

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      return MESA_FORMAT_SIGNED_LA_LATC2;

+

    default:

       return MESA_FORMAT_NONE;

    }

@@ -229,6 +239,15 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
    case MESA_FORMAT_SIGNED_RG_RGTC2:

       return GL_COMPRESSED_SIGNED_RG_RGTC2;

 

+   case MESA_FORMAT_L_LATC1:

+      return GL_COMPRESSED_LUMINANCE_LATC1_EXT;

+   case MESA_FORMAT_SIGNED_L_LATC1:

+      return GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT;

+   case MESA_FORMAT_LA_LATC2:

+      return GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;

+   case MESA_FORMAT_SIGNED_LA_LATC2:

+      return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT;

+

    default:

       _mesa_problem(ctx, "Unexpected mesa texture format in"

                     " _mesa_compressed_format_to_glenum()");

diff --git a/mesalib/src/mesa/main/texcompress_rgtc.c b/mesalib/src/mesa/main/texcompress_rgtc.c
index b5dd56dce..60146d09b 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.c
+++ b/mesalib/src/mesa/main/texcompress_rgtc.c
@@ -98,7 +98,8 @@ _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
    GLubyte srcpixels[4][4];

    GLubyte *blkaddr;

    GLint dstRowDiff;

-   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1);

+   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1 ||

+          dstFormat == MESA_FORMAT_L_LATC1);

    ASSERT(dstXoffset % 4 == 0);

    ASSERT(dstYoffset % 4 == 0);

    ASSERT(dstZoffset % 4 == 0);

@@ -153,7 +154,8 @@ _mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
    GLbyte srcpixels[4][4];

    GLbyte *blkaddr;

    GLint dstRowDiff;

-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1);

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||

+          dstFormat == MESA_FORMAT_SIGNED_L_LATC1);

    ASSERT(dstXoffset % 4 == 0);

    ASSERT(dstYoffset % 4 == 0);

    ASSERT(dstZoffset % 4 == 0);

@@ -208,7 +210,8 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
    GLubyte *blkaddr;

    GLint dstRowDiff;

 

-   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2);

+   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2 ||

+          dstFormat == MESA_FORMAT_LA_LATC2);

    ASSERT(dstXoffset % 4 == 0);

    ASSERT(dstYoffset % 4 == 0);

    ASSERT(dstZoffset % 4 == 0);

@@ -269,7 +272,8 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
    GLbyte *blkaddr;

    GLint dstRowDiff;

 

-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2);

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2 ||

+          dstFormat == MESA_FORMAT_SIGNED_LA_LATC2);

    ASSERT(dstXoffset % 4 == 0);

    ASSERT(dstYoffset % 4 == 0);

    ASSERT(dstZoffset % 4 == 0);

@@ -374,6 +378,62 @@ _mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
    texel[ACOMP] = 1.0;

 }

 

+void

+_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+                       i, j, &red, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = UBYTE_TO_FLOAT(red);

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+                       i, j, &red, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red, green;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+                     i, j, &red, 2);

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,

+                     i, j, &green, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = UBYTE_TO_FLOAT(red);

+   texel[ACOMP] = UBYTE_TO_FLOAT(green);

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,

+                                       GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red, green;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+                     i, j, &red, 2);

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,

+                     i, j, &green, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX(green);

+}

+

 #define TAG(x) unsigned_##x

 

 #define TYPE GLubyte

diff --git a/mesalib/src/mesa/main/texcompress_rgtc.h b/mesalib/src/mesa/main/texcompress_rgtc.h
index 424edc458..a64ef9968 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.h
+++ b/mesalib/src/mesa/main/texcompress_rgtc.h
@@ -1,60 +1,77 @@
-/*
- * Copyright (C) 2011 Red Hat Inc.
- *
- * 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.
- */
-
-#ifndef TEXCOMPRESS_RGTC_H
-#define TEXCOMPRESS_RGTC_H
-
-#include "glheader.h"
-#include "mfeatures.h"
-#include "texstore.h"
-
-struct gl_texture_image;
-
-extern GLboolean
-_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);
-
-extern void
-_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
-					GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
-				       GLint i, GLint j, GLint k, GLfloat *texel);
-#endif
+/*

+ * Copyright (C) 2011 Red Hat Inc.

+ *

+ * 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.

+ */

+

+#ifndef TEXCOMPRESS_RGTC_H

+#define TEXCOMPRESS_RGTC_H

+

+#include "glheader.h"

+#include "mfeatures.h"

+#include "texstore.h"

+

+struct gl_texture_image;

+

+extern GLboolean

+_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);

+

+extern void

+_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,

+					GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,

+				       GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,

+                                       GLint i, GLint j, GLint k, GLfloat *texel);

+

+#endif

diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index 8666076ab..33f8dbba2 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -786,6 +786,34 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       NULL,

       NULL

    },

+   {

+      MESA_FORMAT_L_LATC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_l_latc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_L_LATC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_l_latc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_LA_LATC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_la_latc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_LA_LATC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_la_latc2,

+      NULL,

+      NULL

+   },

 };

 

 

diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 8040fac7d..80518200b 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -621,6 +621,35 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       }

    }

 

+   if (ctx->Extensions.EXT_texture_compression_latc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_L_LATC1);

+            break;

+         case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L_LATC1);

+            break;

+         case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);

+            break;

+         case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_LA_LATC2);

+            break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_texture_compression_3dc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);

+            break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

    _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");

    return MESA_FORMAT_NONE;

 }

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 164dcba5f..f4d7a4212 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -509,6 +509,28 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
       }

    }

 

+   if (ctx->Extensions.EXT_texture_compression_latc) {

+      switch (internalFormat) {

+      case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+         return GL_LUMINANCE;

+      case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+         return GL_LUMINANCE_ALPHA;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_texture_compression_3dc) {

+      switch (internalFormat) {

+      case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+         return GL_LUMINANCE_ALPHA;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

    return -1; /* error */

 }

 

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index d091311c1..749956a1f 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -4135,7 +4135,14 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { MESA_FORMAT_RED_RGTC1, _mesa_texstore_red_rgtc1 },

    { MESA_FORMAT_SIGNED_RED_RGTC1, _mesa_texstore_signed_red_rgtc1 },

    { MESA_FORMAT_RG_RGTC2, _mesa_texstore_rg_rgtc2 },

-   { MESA_FORMAT_SIGNED_RG_RGTC2, _mesa_texstore_signed_rg_rgtc2 }

+   { MESA_FORMAT_SIGNED_RG_RGTC2, _mesa_texstore_signed_rg_rgtc2 },

+

+   /* Re-use the R/RG texstore functions.

+    * The code is generic enough to handle LATC too. */

+   { MESA_FORMAT_L_LATC1, _mesa_texstore_red_rgtc1 },

+   { MESA_FORMAT_SIGNED_L_LATC1, _mesa_texstore_signed_red_rgtc1 },

+   { MESA_FORMAT_LA_LATC2, _mesa_texstore_rg_rgtc2 },

+   { MESA_FORMAT_SIGNED_LA_LATC2, _mesa_texstore_signed_rg_rgtc2 }

 };

 

 

diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index e1598869c..b76f63de4 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -215,6 +215,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_queryobj.c \

 	state_tracker/st_cb_rasterpos.c \

 	state_tracker/st_cb_readpixels.c \

+	state_tracker/st_cb_syncobj.c \

 	state_tracker/st_cb_strings.c \

 	state_tracker/st_cb_texture.c \

 	state_tracker/st_cb_viewport.c \

diff --git a/mesalib/src/mesa/state_tracker/st_cb_flush.c b/mesalib/src/mesa/state_tracker/st_cb_flush.c
index 31189f360..01496ed07 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_flush.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_flush.c
@@ -103,7 +103,8 @@ void st_finish( struct st_context *st )
    st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence);

 

    if(fence) {

-      st->pipe->screen->fence_finish(st->pipe->screen, fence, 0);

+      st->pipe->screen->fence_finish(st->pipe->screen, fence, 0,

+                                     PIPE_TIMEOUT_INFINITE);

       st->pipe->screen->fence_reference(st->pipe->screen, &fence, NULL);

    }

 }

diff --git a/mesalib/src/mesa/state_tracker/st_cb_syncobj.c b/mesalib/src/mesa/state_tracker/st_cb_syncobj.c
new file mode 100644
index 000000000..85aad08cc
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_syncobj.c
@@ -0,0 +1,122 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Marek Olšák <maraeo@gmail.com>
+ * 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 AUTHORS 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.
+ *
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Marek Olšák <maraeo@gmail.com>
+  */
+
+#include "main/glheader.h"
+#include "main/macros.h"
+#include "pipe/p_context.h"
+#include "pipe/p_screen.h"
+#include "st_context.h"
+#include "st_cb_syncobj.h"
+
+struct st_sync_object {
+   struct gl_sync_object b;
+
+   struct pipe_fence_handle *fence;
+};
+
+
+static struct gl_sync_object * st_new_sync_object(struct gl_context *ctx,
+                                                  GLenum type)
+{
+   if (type == GL_SYNC_FENCE)
+      return (struct gl_sync_object*)CALLOC_STRUCT(st_sync_object);
+   else
+      return NULL;
+}
+
+static void st_delete_sync_object(struct gl_context *ctx,
+                                  struct gl_sync_object *obj)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   screen->fence_reference(screen, &so->fence, NULL);
+   FREE(so);
+}
+
+static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj,
+                          GLenum condition, GLbitfield flags)
+{
+   struct pipe_context *pipe = st_context(ctx)->pipe;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   assert(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0);
+   assert(so->fence == NULL);
+
+   pipe->flush(pipe, 0, &so->fence);
+}
+
+static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   if (so->fence && screen->fence_signalled(screen, so->fence, 0) == 0) {
+      screen->fence_reference(screen, &so->fence, NULL);
+      so->b.StatusFlag = GL_TRUE;
+   }
+}
+
+static void st_client_wait_sync(struct gl_context *ctx,
+                                struct gl_sync_object *obj,
+                                GLbitfield flags, GLuint64 timeout)
+{
+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
+   struct st_sync_object *so = (struct st_sync_object*)obj;
+
+   /* We don't care about GL_SYNC_FLUSH_COMMANDS_BIT, because flush is
+    * already called when creating a fence. */
+
+   if (so->fence &&
+       screen->fence_finish(screen, so->fence, 0, timeout) == 0) {
+      screen->fence_reference(screen, &so->fence, NULL);
+      so->b.StatusFlag = GL_TRUE;
+   }
+}
+
+static void st_server_wait_sync(struct gl_context *ctx,
+                                struct gl_sync_object *obj,
+                                GLbitfield flags, GLuint64 timeout)
+{
+   /* NO-OP.
+    * Neither Gallium nor DRM interfaces support blocking on the GPU. */
+}
+
+void st_init_syncobj_functions(struct dd_function_table *functions)
+{
+   functions->NewSyncObject = st_new_sync_object;
+   functions->FenceSync = st_fence_sync;
+   functions->DeleteSyncObject = st_delete_sync_object;
+   functions->CheckSync = st_check_sync;
+   functions->ClientWaitSync = st_client_wait_sync;
+   functions->ServerWaitSync = st_server_wait_sync;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_syncobj.h b/mesalib/src/mesa/state_tracker/st_cb_syncobj.h
new file mode 100644
index 000000000..c25468478
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_syncobj.h
@@ -0,0 +1,38 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Marek Olšák <maraeo@gmail.com>
+ * 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 AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#ifndef ST_CB_SYNCOBJ_H
+#define ST_CB_SYNCOBJ_H
+
+
+struct dd_function_table;
+
+extern void
+st_init_syncobj_functions(struct dd_function_table *functions);
+
+
+#endif /* ST_CB_SYNCOBJ_H */
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index 8f3a7415d..c1b4cde77 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -51,6 +51,7 @@
 #include "st_cb_texture.h"

 #include "st_cb_xformfb.h"

 #include "st_cb_flush.h"

+#include "st_cb_syncobj.h"

 #include "st_cb_strings.h"

 #include "st_cb_viewport.h"

 #include "st_atom.h"

@@ -292,6 +293,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_viewport_functions(functions);

 

    st_init_xformfb_functions(functions);

+   st_init_syncobj_functions(functions);

 

    functions->UpdateState = st_invalidate_state;

 }

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index 12142b84e..2f4027bc4 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -429,7 +429,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
          vbuffer[attr].buffer_offset = 0;

 

          /* Track user vertex buffers. */

-         pipe_resource_reference(&st->user_vb[attr], vbuffer->buffer);

+         pipe_resource_reference(&st->user_vb[attr], vbuffer[attr].buffer);

          st->user_vb_stride[attr] = stride;

          st->num_user_vbs = MAX2(st->num_user_vbs, attr+1);

       }

@@ -632,10 +632,8 @@ st_draw_vbo(struct gl_context *ctx,
    struct pipe_index_buffer ibuffer;

    struct pipe_draw_info info;

    unsigned i, num_instances = 1;

-   GLboolean new_array = GL_TRUE;

-   /* Fix this (Bug 34378):

    GLboolean new_array =

-         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;*/

+         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;

 

    /* Mesa core state should have been validated already */

    assert(ctx->NewState == 0x0);

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 511a252f0..32cbcaec1 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -432,6 +432,27 @@ void st_init_extensions(struct st_context *st)
      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, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      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, 0)) {

+      ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

+   }

+

    /* ycbcr support */

    if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

                                    PIPE_TEXTURE_2D, 0,

@@ -497,4 +518,8 @@ void st_init_extensions(struct st_context *st)
    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;

+   }

 }

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 1adfdf72c..5ac4b9f25 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -249,6 +249,16 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
       return PIPE_FORMAT_RGTC2_UNORM;

    case MESA_FORMAT_SIGNED_RG_RGTC2:

       return PIPE_FORMAT_RGTC2_SNORM;

+

+   case MESA_FORMAT_L_LATC1:

+      return PIPE_FORMAT_LATC1_UNORM;

+   case MESA_FORMAT_SIGNED_L_LATC1:

+      return PIPE_FORMAT_LATC1_SNORM;

+   case MESA_FORMAT_LA_LATC2:

+      return PIPE_FORMAT_LATC2_UNORM;

+   case MESA_FORMAT_SIGNED_LA_LATC2:

+      return PIPE_FORMAT_LATC2_SNORM;

+

    default:

       assert(0);

       return PIPE_FORMAT_NONE;

@@ -397,6 +407,15 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_RGTC2_SNORM:

       return MESA_FORMAT_SIGNED_RG_RGTC2;

 

+   case PIPE_FORMAT_LATC1_UNORM:

+      return MESA_FORMAT_L_LATC1;

+   case PIPE_FORMAT_LATC1_SNORM:

+      return MESA_FORMAT_SIGNED_L_LATC1;

+   case PIPE_FORMAT_LATC2_UNORM:

+      return MESA_FORMAT_LA_LATC2;

+   case PIPE_FORMAT_LATC2_SNORM:

+      return MESA_FORMAT_SIGNED_LA_LATC2;

+

    default:

       assert(0);

       return MESA_FORMAT_NONE;

@@ -612,7 +631,6 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
    case GL_LUMINANCE:

    case GL_LUMINANCE4:

    case GL_LUMINANCE8:

-   case GL_COMPRESSED_LUMINANCE:

       if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, target,

                                        sample_count, bindings, geom_flags ))

          return PIPE_FORMAT_L8_UNORM;

@@ -630,7 +648,6 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
    case GL_LUMINANCE_ALPHA:

    case GL_LUMINANCE6_ALPHA2:

    case GL_LUMINANCE8_ALPHA8:

-   case GL_COMPRESSED_LUMINANCE_ALPHA:

       if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,

                                        sample_count, bindings, geom_flags ))

          return PIPE_FORMAT_L8A8_UNORM;

@@ -901,6 +918,39 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
 	      return PIPE_FORMAT_RGTC2_SNORM;

       return PIPE_FORMAT_NONE;

 

+   case GL_COMPRESSED_LUMINANCE:

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

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

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_LATC1_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_UNORM, target,

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_L8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM, target,

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_LATC1_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_LUMINANCE_ALPHA:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

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

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_LATC2_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_L8A8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM, target,

+                                      sample_count, bindings, geom_flags))

+              return PIPE_FORMAT_LATC2_SNORM;

+      return PIPE_FORMAT_NONE;

+

    /* signed/unsigned integer formats.

     * XXX Mesa only has formats for RGBA signed/unsigned integer formats.

     * If/when new formats are added this code should be updated.

diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index 7a61998e2..34a2e9ebd 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -204,12 +204,10 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum target,
       _mesa_is_format_compressed(texObj->Image[face][baseLevel]->TexFormat);

 

    if (compressed) {

-      if (texObj->Image[face][baseLevel]->TexFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||

-	  texObj->Image[face][baseLevel]->TexFormat == MESA_FORMAT_SIGNED_RG_RGTC2)

-         datatype = GL_FLOAT;

-      else

-         datatype = GL_UNSIGNED_BYTE;

-      

+      GLenum type =

+         _mesa_get_format_datatype(texObj->Image[face][baseLevel]->TexFormat);

+

+      datatype = type == GL_UNSIGNED_NORMALIZED ? GL_UNSIGNED_BYTE : GL_FLOAT;

       comps = 4;

    }

    else {

diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 503f5b732..1d2b635e7 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -2918,51 +2918,51 @@ shadow_compare4(GLenum function, GLfloat coord,
 

    switch (function) {

    case GL_LEQUAL:

-      if (depth00 <= coord)  luminance -= d;

-      if (depth01 <= coord)  luminance -= d;

-      if (depth10 <= coord)  luminance -= d;

-      if (depth11 <= coord)  luminance -= d;

+      if (coord > depth00)  luminance -= d;

+      if (coord > depth01)  luminance -= d;

+      if (coord > depth10)  luminance -= d;

+      if (coord > depth11)  luminance -= d;

       return luminance;

    case GL_GEQUAL:

-      if (depth00 >= coord)  luminance -= d;

-      if (depth01 >= coord)  luminance -= d;

-      if (depth10 >= coord)  luminance -= d;

-      if (depth11 >= coord)  luminance -= d;

+      if (coord < depth00)  luminance -= d;

+      if (coord < depth01)  luminance -= d;

+      if (coord < depth10)  luminance -= d;

+      if (coord < depth11)  luminance -= d;

       return luminance;

    case GL_LESS:

-      if (depth00 < coord)  luminance -= d;

-      if (depth01 < coord)  luminance -= d;

-      if (depth10 < coord)  luminance -= d;

-      if (depth11 < coord)  luminance -= d;

+      if (coord >= depth00)  luminance -= d;

+      if (coord >= depth01)  luminance -= d;

+      if (coord >= depth10)  luminance -= d;

+      if (coord >= depth11)  luminance -= d;

       return luminance;

    case GL_GREATER:

-      if (depth00 > coord)  luminance -= d;

-      if (depth01 > coord)  luminance -= d;

-      if (depth10 > coord)  luminance -= d;

-      if (depth11 > coord)  luminance -= d;

+      if (coord <= depth00)  luminance -= d;

+      if (coord <= depth01)  luminance -= d;

+      if (coord <= depth10)  luminance -= d;

+      if (coord <= depth11)  luminance -= d;

       return luminance;

    case GL_EQUAL:

-      if (depth00 == coord)  luminance -= d;

-      if (depth01 == coord)  luminance -= d;

-      if (depth10 == coord)  luminance -= d;

-      if (depth11 == coord)  luminance -= d;

+      if (coord != depth00)  luminance -= d;

+      if (coord != depth01)  luminance -= d;

+      if (coord != depth10)  luminance -= d;

+      if (coord != depth11)  luminance -= d;

       return luminance;

    case GL_NOTEQUAL:

-      if (depth00 != coord)  luminance -= d;

-      if (depth01 != coord)  luminance -= d;

-      if (depth10 != coord)  luminance -= d;

-      if (depth11 != coord)  luminance -= d;

+      if (coord == depth00)  luminance -= d;

+      if (coord == depth01)  luminance -= d;

+      if (coord == depth10)  luminance -= d;

+      if (coord == depth11)  luminance -= d;

       return luminance;

    case GL_ALWAYS:

-      return 0.0;

+      return 1.0F;

    case GL_NEVER:

       return ambient;

    case GL_NONE:

       /* ordinary bilinear filtering */

       return lerp_2d(wi, wj, depth00, depth10, depth01, depth11);

    default:

-      _mesa_problem(NULL, "Bad compare func in sample_depth_texture");

-      return 0.0F;

+      _mesa_problem(NULL, "Bad compare func in sample_compare4");

+      return ambient;

    }

 }

 

@@ -3030,7 +3030,7 @@ sample_depth_texture( struct gl_context *ctx,
    if (tObj->MagFilter == GL_NEAREST) {

       GLuint i;

       for (i = 0; i < n; i++) {

-         GLfloat depthSample;

+         GLfloat depthSample, depthRef;

          GLint col, row, slice;

 

          nearest_texcoord(tObj, level, texcoords[i], &col, &row, &slice);

@@ -3043,8 +3043,9 @@ sample_depth_texture( struct gl_context *ctx,
             depthSample = tObj->BorderColor.f[0];

          }

 

-         result = shadow_compare(function, texcoords[i][compare_coord],

-                                 depthSample, ambient);

+         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);

+

+         result = shadow_compare(function, depthRef, depthSample, ambient);

 

          switch (tObj->DepthMode) {

          case GL_LUMINANCE:

@@ -3068,7 +3069,7 @@ sample_depth_texture( struct gl_context *ctx,
       GLuint i;

       ASSERT(tObj->MagFilter == GL_LINEAR);

       for (i = 0; i < n; i++) {

-         GLfloat depth00, depth01, depth10, depth11;

+         GLfloat depth00, depth01, depth10, depth11, depthRef;

          GLint i0, i1, j0, j1;

          GLint slice;

          GLfloat wi, wj;

@@ -3134,7 +3135,9 @@ sample_depth_texture( struct gl_context *ctx,
             }

          }

 

-         result = shadow_compare4(function, texcoords[i][compare_coord],

+         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);

+

+         result = shadow_compare4(function, depthRef,

                                   depth00, depth01, depth10, depth11,

                                   ambient, wi, wj);

 

diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 78aba9039..37656c23a 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -461,6 +461,14 @@ recalculate_input_bindings(struct gl_context *ctx)
 	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];

          const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);

       }

+

+      /* There is no need to make _NEW_ARRAY dirty here for the TnL program,

+       * because it already takes care of invalidating the state necessary

+       * to revalidate vertex arrays. Not marking the state as dirty also

+       * improves performance (quite significantly in some apps).

+       */

+      if (!ctx->VertexProgram._MaintainTnlProgram)

+         ctx->NewState |= _NEW_ARRAY;

       break;

 

    case VP_NV:

@@ -486,6 +494,8 @@ recalculate_input_bindings(struct gl_context *ctx)
 	 inputs[i] = &vbo->generic_currval[i - VERT_ATTRIB_GENERIC0];

          const_inputs |= 1 << i;

       }

+

+      ctx->NewState |= _NEW_ARRAY;

       break;

 

    case VP_ARB:

@@ -521,8 +531,9 @@ recalculate_input_bindings(struct gl_context *ctx)
 	    inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];

             const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);

          }

-

       }

+

+      ctx->NewState |= _NEW_ARRAY;

       break;

    }