libfontenc libXinerama mesa git update 4 feb 2011

20 files changed, 1523 insertions, 1371 deletions

diff --git a/libXinerama/configure.ac b/libXinerama/configure.ac
index 6aabd774f..04dfc9d1b 100644
--- a/libXinerama/configure.ac
+++ b/libXinerama/configure.ac
@@ -1,53 +1,54 @@
-dnl  Copyright 2005 Red Hat, Inc.
-dnl 
-dnl  Permission to use, copy, modify, distribute, and sell this software and its
-dnl  documentation for any purpose is hereby granted without fee, provided that
-dnl  the above copyright notice appear in all copies and that both that
-dnl  copyright notice and this permission notice appear in supporting
-dnl  documentation, and that the name of Red Hat not be used in
-dnl  advertising or publicity pertaining to distribution of the software without
-dnl  specific, written prior permission.  Red Hat makes no
-dnl  representations about the suitability of this software for any purpose.  It
-dnl  is provided "as is" without express or implied warranty.
-dnl 
-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl  PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
+#  Copyright 2005 Red Hat, Inc.
+#
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+#
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
-
 AC_INIT([libXinerama], [1.1.1],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        [libXinerama])
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXinerama])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Initialize libtool
+AC_PROG_LIBTOOL
+
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
           [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
 
-# Check for dependencies
+# Obtain compiler/linker options for depedencies
 PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
 
-dnl Allow checking code with lint, sparse, etc.
+# Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
 LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
 		  
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
-	   src/Makefile
-	   man/Makefile
-           xinerama.pc])
+AC_CONFIG_FILES([Makefile
+		src/Makefile
+		man/Makefile
+		xinerama.pc])
+AC_OUTPUT
diff --git a/libfontenc/configure.ac b/libfontenc/configure.ac
index 749f750b7..8409df8b5 100644
--- a/libfontenc/configure.ac
+++ b/libfontenc/configure.ac
@@ -1,65 +1,64 @@
-

-dnl  Copyright 2005 Red Hat, Inc.

-dnl 

-dnl  Permission to use, copy, modify, distribute, and sell this software and its

-dnl  documentation for any purpose is hereby granted without fee, provided that

-dnl  the above copyright notice appear in all copies and that both that

-dnl  copyright notice and this permission notice appear in supporting

-dnl  documentation, and that the name of Red Hat not be used in

-dnl  advertising or publicity pertaining to distribution of the software without

-dnl  specific, written prior permission.  Red Hat makes no

-dnl  representations about the suitability of this software for any purpose.  It

-dnl  is provided "as is" without express or implied warranty.

-dnl 

-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-dnl  PERFORMANCE OF THIS SOFTWARE.

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.60])

-

-AC_INIT([libfontenc], [1.1.0],

-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

-        [libfontenc])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-# Require xorg-macros: XORG_DEFAULT_OPTIONS

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.3)

-XORG_DEFAULT_OPTIONS

-AC_CONFIG_HEADERS(config.h)

-

-# Check for progs

-AC_PROG_LIBTOOL

-

-# Require X.Org's font util macros 1.1 or later for XORG_FONTROOTDIR

-m4_ifndef([XORG_FONT_MACROS_VERSION],

-	  [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])

-XORG_FONT_MACROS_VERSION(1.1)

-

-XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])

-

-# zlib

-AC_CHECK_HEADER([zlib.h], [],

-                AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))

-AC_CHECK_LIB(z, gzclose, [],

-             AC_MSG_FAILURE([zlib is required to compile libfontenc]))

-

-# Check for dependencies

-PKG_CHECK_MODULES(FONTENC, xproto)

-

-dnl Allow checking code with lint, sparse, etc.

-XORG_WITH_LINT

-LINT_FLAGS="${LINT_FLAGS} ${FONTENC_CFLAGS}"

-		  

-

-AC_OUTPUT([Makefile

-	   src/Makefile

-           fontenc.pc])

+#  Copyright 2005 Red Hat, Inc.
+#
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+#
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([libfontenc], [1.1.0],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libfontenc])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+# Require X.Org macros 1.8 or later
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
+# Require X.Org's font util macros 1.1 or later for XORG_FONTROOTDIR
+m4_ifndef([XORG_FONT_MACROS_VERSION],
+	  [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.1)
+XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
+
+# zlib
+AC_CHECK_HEADER([zlib.h], [],
+                AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))
+AC_CHECK_LIB(z, gzclose, [],
+             AC_MSG_FAILURE([zlib is required to compile libfontenc]))
+
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(FONTENC, xproto)
+
+# Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+LINT_FLAGS="${LINT_FLAGS} ${FONTENC_CFLAGS}"
+
+AC_CONFIG_FILES([Makefile
+		src/Makefile
+		fontenc.pc])
+AC_OUTPUT
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 42d6968ce..035152677 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -657,7 +657,7 @@ struct __DRIlegacyExtensionRec {
  * conjunction with the core extension.
  */
 #define __DRI_SWRAST "DRI_SWRast"
-#define __DRI_SWRAST_VERSION 1
+#define __DRI_SWRAST_VERSION 2
 
 struct __DRIswrastExtensionRec {
     __DRIextension base;
@@ -670,6 +670,13 @@ struct __DRIswrastExtensionRec {
     __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
 					const __DRIconfig *config,
 					void *loaderPrivate);
+
+   /* Since version 2 */
+   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
+                                           int api,
+                                           const __DRIconfig *config,
+                                           __DRIcontext *shared,
+                                           void *data);
 };
 
 /**
diff --git a/mesalib/src/glsl/ast_expr.cpp b/mesalib/src/glsl/ast_expr.cpp
index c45d60757..974beb9f6 100644
--- a/mesalib/src/glsl/ast_expr.cpp
+++ b/mesalib/src/glsl/ast_expr.cpp
@@ -1,96 +1,98 @@
-/*

- * 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 <cstdio>

-#include <cassert>

-#include "ast.h"

-

-const char *

-ast_expression::operator_string(enum ast_operators op)

-{

-   static const char *const operators[] = {

-      "=",

-      "+",

-      "-",

-      "+",

-      "-",

-      "*",

-      "/",

-      "%",

-      "<<",

-      ">>",

-      "<",

-      ">",

-      "<=",

-      ">=",

-      "==",

-      "!=",

-      "&",

-      "^",

-      "|",

-      "~",

-      "&&",

-      "^^",

-      "||",

-      "!",

-

-      "*=",

-      "/=",

-      "%=",

-      "+=",

-      "-=",

-      "<<=",

-      ">>=",

-      "&=",

-      "^=",

-      "|=",

-

-      "?:",

-

-      "++",

-      "--",

-      "++",

-      "--",

-      ".",

-   };

-

-   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));

-

-   return operators[op];

-}

-

-

-ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,

-				       ast_expression *ex1) :

-   ast_expression(oper, ex0, ex1, NULL)

-{

-   assert((oper >= ast_plus) && (oper <= ast_logic_not));

-}

-

-

-void

-ast_expression_bin::print(void) const

-{

-   subexpressions[0]->print();

-   printf("%s ", operator_string(oper));

-   subexpressions[1]->print();

-}

+/*
+ * 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 <cstdio>
+#include <cassert>
+#include "ast.h"
+
+using std::printf;
+
+const char *
+ast_expression::operator_string(enum ast_operators op)
+{
+   static const char *const operators[] = {
+      "=",
+      "+",
+      "-",
+      "+",
+      "-",
+      "*",
+      "/",
+      "%",
+      "<<",
+      ">>",
+      "<",
+      ">",
+      "<=",
+      ">=",
+      "==",
+      "!=",
+      "&",
+      "^",
+      "|",
+      "~",
+      "&&",
+      "^^",
+      "||",
+      "!",
+
+      "*=",
+      "/=",
+      "%=",
+      "+=",
+      "-=",
+      "<<=",
+      ">>=",
+      "&=",
+      "^=",
+      "|=",
+
+      "?:",
+
+      "++",
+      "--",
+      "++",
+      "--",
+      ".",
+   };
+
+   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));
+
+   return operators[op];
+}
+
+
+ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,
+				       ast_expression *ex1) :
+   ast_expression(oper, ex0, ex1, NULL)
+{
+   assert((oper >= ast_plus) && (oper <= ast_logic_not));
+}
+
+
+void
+ast_expression_bin::print(void) const
+{
+   subexpressions[0]->print();
+   printf("%s ", operator_string(oper));
+   subexpressions[1]->print();
+}
diff --git a/mesalib/src/glsl/ast_type.cpp b/mesalib/src/glsl/ast_type.cpp
index d14077473..5ddfeec87 100644
--- a/mesalib/src/glsl/ast_type.cpp
+++ b/mesalib/src/glsl/ast_type.cpp
@@ -27,6 +27,8 @@ extern "C" {
 #include "program/symbol_table.h"
 }
 
+using std::printf;
+
 void
 ast_type_specifier::print(void) const
 {
diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp
index 3c33127b5..995f284fa 100644
--- a/mesalib/src/glsl/hir_field_selection.cpp
+++ b/mesalib/src/glsl/hir_field_selection.cpp
@@ -27,6 +27,8 @@
 #include "ast.h"
 #include "glsl_types.h"
 
+using std::strcmp;
+
 ir_rvalue *
 _mesa_ast_field_selection_to_hir(const ast_expression *expr,
 				 exec_list *instructions,
diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index 82ccc722f..be76945a2 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -25,6 +25,9 @@
 #include "glsl_types.h"
 #include "glsl_parser_extras.h"
 
+using std::printf;
+using std::strncmp;
+
 static void print_type(const glsl_type *t);
 
 void
diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index 44d7549ea..b0dd6c21f 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -39,6 +39,9 @@
 #include "program/hash_table.h"
 #include "glsl_types.h"
 
+using std::abort;
+using std::printf;
+
 class ir_validate : public ir_hierarchical_visitor {
 public:
    ir_validate()
diff --git a/mesalib/src/glsl/lower_mat_op_to_vec.cpp b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
index 8cbbfa713..bdc53a1f8 100644
--- a/mesalib/src/glsl/lower_mat_op_to_vec.cpp
+++ b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
@@ -35,6 +35,9 @@
 #include "ir_expression_flattening.h"
 #include "glsl_types.h"
 
+using std::abort;
+using std::printf;
+
 class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {
 public:
    ir_mat_op_to_vec_visitor()
diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index e1f68892f..1fff71753 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -41,6 +41,8 @@
 #include "ir_optimization.h"
 #include "glsl_types.h"
 
+using std::memset;
+
 class acp_entry : public exec_node
 {
 public:
diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp
index fedae851f..1f51da6e4 100644
--- a/mesalib/src/glsl/opt_constant_variable.cpp
+++ b/mesalib/src/glsl/opt_constant_variable.cpp
@@ -1,198 +1,201 @@
-/*

- * 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_constant_variable.cpp

- *

- * Marks variables assigned a single constant value over the course

- * of the program as constant.

- *

- * The goal here is to trigger further constant folding and then dead

- * code elimination.  This is common with vector/matrix constructors

- * and calls to builtin functions.

- */

-

-#include "ir.h"

-#include "ir_visitor.h"

-#include "ir_optimization.h"

-#include "glsl_types.h"

-

-struct assignment_entry {

-   exec_node link;

-   int assignment_count;

-   ir_variable *var;

-   ir_constant *constval;

-   bool our_scope;

-};

-

-class ir_constant_variable_visitor : public ir_hierarchical_visitor {

-public:

-   virtual ir_visitor_status visit_enter(ir_dereference_variable *);

-   virtual ir_visitor_status visit(ir_variable *);

-   virtual ir_visitor_status visit_enter(ir_assignment *);

-   virtual ir_visitor_status visit_enter(ir_call *);

-

-   exec_list list;

-};

-

-static struct assignment_entry *

-get_assignment_entry(ir_variable *var, exec_list *list)

-{

-   struct assignment_entry *entry;

-

-   foreach_list_typed(struct assignment_entry, entry, link, list) {

-      if (entry->var == var)

-	 return entry;

-   }

-

-   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));

-   entry->var = var;

-   list->push_head(&entry->link);

-   return entry;

-}

-

-ir_visitor_status

-ir_constant_variable_visitor::visit(ir_variable *ir)

-{

-   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);

-   entry->our_scope = true;

-   return visit_continue;

-}

-

-/* Skip derefs of variables so that we can detect declarations. */

-ir_visitor_status

-ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)

-{

-   (void)ir;

-   return visit_continue_with_parent;

-}

-

-ir_visitor_status

-ir_constant_variable_visitor::visit_enter(ir_assignment *ir)

-{

-   ir_constant *constval;

-   struct assignment_entry *entry;

-

-   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);

-   assert(entry);

-   entry->assignment_count++;

-

-   /* If it's already constant, don't do the work. */

-   if (entry->var->constant_value)

-      return visit_continue;

-

-   /* OK, now find if we actually have all the right conditions for

-    * this to be a constant value assigned to the var.

-    */

-   if (ir->condition) {

-      constval = ir->condition->constant_expression_value();

-      if (!constval || !constval->value.b[0])

-	 return visit_continue;

-   }

-

-   ir_variable *var = ir->whole_variable_written();

-   if (!var)

-      return visit_continue;

-

-   constval = ir->rhs->constant_expression_value();

-   if (!constval)

-      return visit_continue;

-

-   /* Mark this entry as having a constant assignment (if the

-    * assignment count doesn't go >1).  do_constant_variable will fix

-    * up the variable with the constant value later.

-    */

-   entry->constval = constval;

-

-   return visit_continue;

-}

-

-ir_visitor_status

-ir_constant_variable_visitor::visit_enter(ir_call *ir)

-{

-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

-   foreach_iter(exec_list_iterator, iter, *ir) {

-      ir_rvalue *param_rval = (ir_rvalue *)iter.get();

-      ir_variable *param = (ir_variable *)sig_iter.get();

-

-      if (param->mode == ir_var_out ||

-	  param->mode == ir_var_inout) {

-	 ir_variable *var = param_rval->variable_referenced();

-	 struct assignment_entry *entry;

-

-	 assert(var);

-	 entry = get_assignment_entry(var, &this->list);

-	 entry->assignment_count++;

-      }

-      sig_iter.next();

-   }

-   return visit_continue;

-}

-

-/**

- * Does a copy propagation pass on the code present in the instruction stream.

- */

-bool

-do_constant_variable(exec_list *instructions)

-{

-   bool progress = false;

-   ir_constant_variable_visitor v;

-

-   v.run(instructions);

-

-   while (!v.list.is_empty()) {

-

-      struct assignment_entry *entry;

-      entry = exec_node_data(struct assignment_entry, v.list.head, link);

-

-      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {

-	 entry->var->constant_value = entry->constval;

-	 progress = true;

-      }

-      entry->link.remove();

-      free(entry);

-   }

-

-   return progress;

-}

-

-bool

-do_constant_variable_unlinked(exec_list *instructions)

-{

-   bool progress = false;

-

-   foreach_iter(exec_list_iterator, iter, *instructions) {

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

-      ir_function *f = ir->as_function();

-      if (f) {

-	 foreach_iter(exec_list_iterator, sigiter, *f) {

-	    ir_function_signature *sig =

-	       (ir_function_signature *) sigiter.get();

-	    if (do_constant_variable(&sig->body))

-	       progress = true;

-	 }

-      }

-   }

-

-   return progress;

-}

+/*
+ * 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_constant_variable.cpp
+ *
+ * Marks variables assigned a single constant value over the course
+ * of the program as constant.
+ *
+ * The goal here is to trigger further constant folding and then dead
+ * code elimination.  This is common with vector/matrix constructors
+ * and calls to builtin functions.
+ */
+
+#include "ir.h"
+#include "ir_visitor.h"
+#include "ir_optimization.h"
+#include "glsl_types.h"
+
+using std::calloc;
+using std::free;
+
+struct assignment_entry {
+   exec_node link;
+   int assignment_count;
+   ir_variable *var;
+   ir_constant *constval;
+   bool our_scope;
+};
+
+class ir_constant_variable_visitor : public ir_hierarchical_visitor {
+public:
+   virtual ir_visitor_status visit_enter(ir_dereference_variable *);
+   virtual ir_visitor_status visit(ir_variable *);
+   virtual ir_visitor_status visit_enter(ir_assignment *);
+   virtual ir_visitor_status visit_enter(ir_call *);
+
+   exec_list list;
+};
+
+static struct assignment_entry *
+get_assignment_entry(ir_variable *var, exec_list *list)
+{
+   struct assignment_entry *entry;
+
+   foreach_list_typed(struct assignment_entry, entry, link, list) {
+      if (entry->var == var)
+	 return entry;
+   }
+
+   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));
+   entry->var = var;
+   list->push_head(&entry->link);
+   return entry;
+}
+
+ir_visitor_status
+ir_constant_variable_visitor::visit(ir_variable *ir)
+{
+   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);
+   entry->our_scope = true;
+   return visit_continue;
+}
+
+/* Skip derefs of variables so that we can detect declarations. */
+ir_visitor_status
+ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)
+{
+   (void)ir;
+   return visit_continue_with_parent;
+}
+
+ir_visitor_status
+ir_constant_variable_visitor::visit_enter(ir_assignment *ir)
+{
+   ir_constant *constval;
+   struct assignment_entry *entry;
+
+   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);
+   assert(entry);
+   entry->assignment_count++;
+
+   /* If it's already constant, don't do the work. */
+   if (entry->var->constant_value)
+      return visit_continue;
+
+   /* OK, now find if we actually have all the right conditions for
+    * this to be a constant value assigned to the var.
+    */
+   if (ir->condition) {
+      constval = ir->condition->constant_expression_value();
+      if (!constval || !constval->value.b[0])
+	 return visit_continue;
+   }
+
+   ir_variable *var = ir->whole_variable_written();
+   if (!var)
+      return visit_continue;
+
+   constval = ir->rhs->constant_expression_value();
+   if (!constval)
+      return visit_continue;
+
+   /* Mark this entry as having a constant assignment (if the
+    * assignment count doesn't go >1).  do_constant_variable will fix
+    * up the variable with the constant value later.
+    */
+   entry->constval = constval;
+
+   return visit_continue;
+}
+
+ir_visitor_status
+ir_constant_variable_visitor::visit_enter(ir_call *ir)
+{
+   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
+   foreach_iter(exec_list_iterator, iter, *ir) {
+      ir_rvalue *param_rval = (ir_rvalue *)iter.get();
+      ir_variable *param = (ir_variable *)sig_iter.get();
+
+      if (param->mode == ir_var_out ||
+	  param->mode == ir_var_inout) {
+	 ir_variable *var = param_rval->variable_referenced();
+	 struct assignment_entry *entry;
+
+	 assert(var);
+	 entry = get_assignment_entry(var, &this->list);
+	 entry->assignment_count++;
+      }
+      sig_iter.next();
+   }
+   return visit_continue;
+}
+
+/**
+ * Does a copy propagation pass on the code present in the instruction stream.
+ */
+bool
+do_constant_variable(exec_list *instructions)
+{
+   bool progress = false;
+   ir_constant_variable_visitor v;
+
+   v.run(instructions);
+
+   while (!v.list.is_empty()) {
+
+      struct assignment_entry *entry;
+      entry = exec_node_data(struct assignment_entry, v.list.head, link);
+
+      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {
+	 entry->var->constant_value = entry->constval;
+	 progress = true;
+      }
+      entry->link.remove();
+      free(entry);
+   }
+
+   return progress;
+}
+
+bool
+do_constant_variable_unlinked(exec_list *instructions)
+{
+   bool progress = false;
+
+   foreach_iter(exec_list_iterator, iter, *instructions) {
+      ir_instruction *ir = (ir_instruction *)iter.get();
+      ir_function *f = ir->as_function();
+      if (f) {
+	 foreach_iter(exec_list_iterator, sigiter, *f) {
+	    ir_function_signature *sig =
+	       (ir_function_signature *) sigiter.get();
+	    if (do_constant_variable(&sig->body))
+	       progress = true;
+	 }
+      }
+   }
+
+   return progress;
+}
diff --git a/mesalib/src/glsl/opt_dead_code.cpp b/mesalib/src/glsl/opt_dead_code.cpp
index 492ba73a1..f47b9613e 100644
--- a/mesalib/src/glsl/opt_dead_code.cpp
+++ b/mesalib/src/glsl/opt_dead_code.cpp
@@ -1,142 +1,144 @@
-/*

- * 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_dead_code.cpp

- *

- * Eliminates dead assignments and variable declarations from the code.

- */

-

-#include "ir.h"

-#include "ir_visitor.h"

-#include "ir_variable_refcount.h"

-#include "glsl_types.h"

-

-static bool debug = false;

-

-/**

- * Do a dead code pass over instructions and everything that instructions

- * references.

- *

- * Note that this will remove assignments to globals, so it is not suitable

- * for usage on an unlinked instruction stream.

- */

-bool

-do_dead_code(exec_list *instructions)

-{

-   ir_variable_refcount_visitor v;

-   bool progress = false;

-

-   v.run(instructions);

-

-   foreach_iter(exec_list_iterator, iter, v.variable_list) {

-      variable_entry *entry = (variable_entry *)iter.get();

-

-      /* Since each assignment is a reference, the refereneced count must be

-       * greater than or equal to the assignment count.  If they are equal,

-       * then all of the references are assignments, and the variable is

-       * dead.

-       *

-       * Note that if the variable is neither assigned nor referenced, both

-       * counts will be zero and will be caught by the equality test.

-       */

-      assert(entry->referenced_count >= entry->assigned_count);

-

-      if (debug) {

-	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",

-		entry->var->name, (void *) entry->var,

-		entry->referenced_count, entry->assigned_count,

-		entry->declaration ? "" : "not ");

-      }

-

-      if ((entry->referenced_count > entry->assigned_count)

-	  || !entry->declaration)

-	 continue;

-

-      if (entry->assign) {

-	 /* Remove a single dead assignment to the variable we found.

-	  * Don't do so if it's a shader output, though.

-	  */

-	 if (entry->var->mode != ir_var_out &&

-	     entry->var->mode != ir_var_inout &&

-	     !ir_has_call(entry->assign)) {

-	    entry->assign->remove();

-	    progress = true;

-

-	    if (debug) {

-	       printf("Removed assignment to %s@%p\n",

-		      entry->var->name, (void *) entry->var);

-	    }

-	 }

-      } else {

-	 /* If there are no assignments or references to the variable left,

-	  * then we can remove its declaration.

-	  */

-

-	 /* uniform initializers are precious, and could get used by another

-	  * stage.

-	  */

-	 if (entry->var->mode == ir_var_uniform &&

-	     entry->var->constant_value)

-	    continue;

-

-	 entry->var->remove();

-	 progress = true;

-

-	 if (debug) {

-	    printf("Removed declaration of %s@%p\n",

-		   entry->var->name, (void *) entry->var);

-	 }

-      }

-   }

-

-   return progress;

-}

-

-/**

- * Does a dead code pass on the functions present in the instruction stream.

- *

- * This is suitable for use while the program is not linked, as it will

- * ignore variable declarations (and the assignments to them) for variables

- * with global scope.

- */

-bool

-do_dead_code_unlinked(exec_list *instructions)

-{

-   bool progress = false;

-

-   foreach_iter(exec_list_iterator, iter, *instructions) {

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

-      ir_function *f = ir->as_function();

-      if (f) {

-	 foreach_iter(exec_list_iterator, sigiter, *f) {

-	    ir_function_signature *sig =

-	       (ir_function_signature *) sigiter.get();

-	    if (do_dead_code(&sig->body))

-	       progress = true;

-	 }

-      }

-   }

-

-   return progress;

-}

+/*
+ * 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_dead_code.cpp
+ *
+ * Eliminates dead assignments and variable declarations from the code.
+ */
+
+#include "ir.h"
+#include "ir_visitor.h"
+#include "ir_variable_refcount.h"
+#include "glsl_types.h"
+
+using std::printf;
+
+static bool debug = false;
+
+/**
+ * Do a dead code pass over instructions and everything that instructions
+ * references.
+ *
+ * Note that this will remove assignments to globals, so it is not suitable
+ * for usage on an unlinked instruction stream.
+ */
+bool
+do_dead_code(exec_list *instructions)
+{
+   ir_variable_refcount_visitor v;
+   bool progress = false;
+
+   v.run(instructions);
+
+   foreach_iter(exec_list_iterator, iter, v.variable_list) {
+      variable_entry *entry = (variable_entry *)iter.get();
+
+      /* Since each assignment is a reference, the refereneced count must be
+       * greater than or equal to the assignment count.  If they are equal,
+       * then all of the references are assignments, and the variable is
+       * dead.
+       *
+       * Note that if the variable is neither assigned nor referenced, both
+       * counts will be zero and will be caught by the equality test.
+       */
+      assert(entry->referenced_count >= entry->assigned_count);
+
+      if (debug) {
+	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",
+		entry->var->name, (void *) entry->var,
+		entry->referenced_count, entry->assigned_count,
+		entry->declaration ? "" : "not ");
+      }
+
+      if ((entry->referenced_count > entry->assigned_count)
+	  || !entry->declaration)
+	 continue;
+
+      if (entry->assign) {
+	 /* Remove a single dead assignment to the variable we found.
+	  * Don't do so if it's a shader output, though.
+	  */
+	 if (entry->var->mode != ir_var_out &&
+	     entry->var->mode != ir_var_inout &&
+	     !ir_has_call(entry->assign)) {
+	    entry->assign->remove();
+	    progress = true;
+
+	    if (debug) {
+	       printf("Removed assignment to %s@%p\n",
+		      entry->var->name, (void *) entry->var);
+	    }
+	 }
+      } else {
+	 /* If there are no assignments or references to the variable left,
+	  * then we can remove its declaration.
+	  */
+
+	 /* uniform initializers are precious, and could get used by another
+	  * stage.
+	  */
+	 if (entry->var->mode == ir_var_uniform &&
+	     entry->var->constant_value)
+	    continue;
+
+	 entry->var->remove();
+	 progress = true;
+
+	 if (debug) {
+	    printf("Removed declaration of %s@%p\n",
+		   entry->var->name, (void *) entry->var);
+	 }
+      }
+   }
+
+   return progress;
+}
+
+/**
+ * Does a dead code pass on the functions present in the instruction stream.
+ *
+ * This is suitable for use while the program is not linked, as it will
+ * ignore variable declarations (and the assignments to them) for variables
+ * with global scope.
+ */
+bool
+do_dead_code_unlinked(exec_list *instructions)
+{
+   bool progress = false;
+
+   foreach_iter(exec_list_iterator, iter, *instructions) {
+      ir_instruction *ir = (ir_instruction *)iter.get();
+      ir_function *f = ir->as_function();
+      if (f) {
+	 foreach_iter(exec_list_iterator, sigiter, *f) {
+	    ir_function_signature *sig =
+	       (ir_function_signature *) sigiter.get();
+	    if (do_dead_code(&sig->body))
+	       progress = true;
+	 }
+      }
+   }
+
+   return progress;
+}
diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp
index 2610b6981..88dcdc251 100644
--- a/mesalib/src/glsl/opt_dead_code_local.cpp
+++ b/mesalib/src/glsl/opt_dead_code_local.cpp
@@ -38,6 +38,8 @@
 #include "ir_optimization.h"
 #include "glsl_types.h"
 
+using std::printf;
+
 static bool debug = false;
 
 class assignment_entry : public exec_node
diff --git a/mesalib/src/glsl/opt_dead_functions.cpp b/mesalib/src/glsl/opt_dead_functions.cpp
index ceb79080a..d72eb6115 100644
--- a/mesalib/src/glsl/opt_dead_functions.cpp
+++ b/mesalib/src/glsl/opt_dead_functions.cpp
@@ -32,6 +32,8 @@
  #include "ir_expression_flattening.h"
  #include "glsl_types.h"
 
+ using std::strcmp;
+
  class signature_entry : public exec_node
  {
  public:
diff --git a/mesalib/src/glsl/opt_structure_splitting.cpp b/mesalib/src/glsl/opt_structure_splitting.cpp
index 014407c0b..8686da06a 100644
--- a/mesalib/src/glsl/opt_structure_splitting.cpp
+++ b/mesalib/src/glsl/opt_structure_splitting.cpp
@@ -38,6 +38,9 @@
 #include "ir_rvalue_visitor.h"
 #include "glsl_types.h"
 
+using std::printf;
+using std::strcmp;
+
 static bool debug = false;
 
 // XXX using variable_entry2 here to avoid collision (MSVC multiply-defined
diff --git a/mesalib/src/glsl/opt_swizzle_swizzle.cpp b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
index e23655240..8d0e1051d 100644
--- a/mesalib/src/glsl/opt_swizzle_swizzle.cpp
+++ b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
@@ -1,93 +1,95 @@
-/*

- * 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_swizzle_swizzle.cpp

- *

- * Eliminates the second swizzle in a swizzle chain.

- */

-

-#include "ir.h"

-#include "ir_visitor.h"

-#include "ir_optimization.h"

-#include "glsl_types.h"

-

-class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {

-public:

-   ir_swizzle_swizzle_visitor()

-   {

-      progress = false;

-   }

-

-   virtual ir_visitor_status visit_enter(ir_swizzle *);

-

-   bool progress;

-};

-

-ir_visitor_status

-ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)

-{

-   int mask2[4];

-

-   ir_swizzle *swiz2 = ir->val->as_swizzle();

-   if (!swiz2)

-      return visit_continue;

-

-   memset(&mask2, 0, sizeof(mask2));

-   if (swiz2->mask.num_components >= 1)

-      mask2[0] = swiz2->mask.x;

-   if (swiz2->mask.num_components >= 2)

-      mask2[1] = swiz2->mask.y;

-   if (swiz2->mask.num_components >= 3)

-      mask2[2] = swiz2->mask.z;

-   if (swiz2->mask.num_components >= 4)

-      mask2[3] = swiz2->mask.w;

-

-   if (ir->mask.num_components >= 1)

-      ir->mask.x = mask2[ir->mask.x];

-   if (ir->mask.num_components >= 2)

-      ir->mask.y = mask2[ir->mask.y];

-   if (ir->mask.num_components >= 3)

-      ir->mask.z = mask2[ir->mask.z];

-   if (ir->mask.num_components >= 4)

-      ir->mask.w = mask2[ir->mask.w];

-

-   ir->val = swiz2->val;

-

-   this->progress = true;

-

-   return visit_continue;

-}

-

-/**

- * Does a copy propagation pass on the code present in the instruction stream.

- */

-bool

-do_swizzle_swizzle(exec_list *instructions)

-{

-   ir_swizzle_swizzle_visitor v;

-

-   v.run(instructions);

-

-   return v.progress;

-}

+/*
+ * 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_swizzle_swizzle.cpp
+ *
+ * Eliminates the second swizzle in a swizzle chain.
+ */
+
+#include "ir.h"
+#include "ir_visitor.h"
+#include "ir_optimization.h"
+#include "glsl_types.h"
+
+using std::memset;
+
+class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {
+public:
+   ir_swizzle_swizzle_visitor()
+   {
+      progress = false;
+   }
+
+   virtual ir_visitor_status visit_enter(ir_swizzle *);
+
+   bool progress;
+};
+
+ir_visitor_status
+ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)
+{
+   int mask2[4];
+
+   ir_swizzle *swiz2 = ir->val->as_swizzle();
+   if (!swiz2)
+      return visit_continue;
+
+   memset(&mask2, 0, sizeof(mask2));
+   if (swiz2->mask.num_components >= 1)
+      mask2[0] = swiz2->mask.x;
+   if (swiz2->mask.num_components >= 2)
+      mask2[1] = swiz2->mask.y;
+   if (swiz2->mask.num_components >= 3)
+      mask2[2] = swiz2->mask.z;
+   if (swiz2->mask.num_components >= 4)
+      mask2[3] = swiz2->mask.w;
+
+   if (ir->mask.num_components >= 1)
+      ir->mask.x = mask2[ir->mask.x];
+   if (ir->mask.num_components >= 2)
+      ir->mask.y = mask2[ir->mask.y];
+   if (ir->mask.num_components >= 3)
+      ir->mask.z = mask2[ir->mask.z];
+   if (ir->mask.num_components >= 4)
+      ir->mask.w = mask2[ir->mask.w];
+
+   ir->val = swiz2->val;
+
+   this->progress = true;
+
+   return visit_continue;
+}
+
+/**
+ * Does a copy propagation pass on the code present in the instruction stream.
+ */
+bool
+do_swizzle_swizzle(exec_list *instructions)
+{
+   ir_swizzle_swizzle_visitor v;
+
+   v.run(instructions);
+
+   return v.progress;
+}
diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp
index 1ef940f9c..a85ba8234 100644
--- a/mesalib/src/glsl/opt_tree_grafting.cpp
+++ b/mesalib/src/glsl/opt_tree_grafting.cpp
@@ -54,6 +54,8 @@
 #include "ir_optimization.h"
 #include "glsl_types.h"
 
+using std::printf;
+
 static bool debug = false;
 
 class ir_tree_grafting_visitor : public ir_hierarchical_visitor {
diff --git a/mesalib/src/glsl/ralloc.c b/mesalib/src/glsl/ralloc.c
index 3ba5d86cd..6a5eac6b9 100644
--- a/mesalib/src/glsl/ralloc.c
+++ b/mesalib/src/glsl/ralloc.c
@@ -403,6 +403,8 @@ printf_length(const char *fmt, va_list untouched_args)
 #endif
    assert(size >= 0);
 
+   va_end(args);
+
    return size;
 }
 
diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.c b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
index 1529c23b1..1bdb6d893 100644
--- a/mesalib/src/mesa/drivers/dri/common/drisw_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
@@ -121,6 +121,48 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     return pcp;
 }
 
+static __DRIcontext *
+driCreateNewContextForAPI(__DRIscreen *psp, int api,
+                          const __DRIconfig *config,
+                          __DRIcontext *shared, void *data)
+{
+    __DRIcontext *pcp;
+    void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
+    gl_api mesa_api;
+
+    switch (api) {
+    case __DRI_API_OPENGL:
+            mesa_api = API_OPENGL;
+            break;
+    case __DRI_API_GLES:
+            mesa_api = API_OPENGLES;
+            break;
+    case __DRI_API_GLES2:
+            mesa_api = API_OPENGLES2;
+            break;
+    default:
+            return NULL;
+    }
+
+    pcp = CALLOC_STRUCT(__DRIcontextRec);
+    if (!pcp)
+        return NULL;
+
+    pcp->loaderPrivate = data;
+
+    pcp->driScreenPriv = psp;
+    pcp->driDrawablePriv = NULL;
+    pcp->driReadablePriv = NULL;
+
+    if (!driDriverAPI.CreateContext(mesa_api,
+                            &config->modes, pcp, shareCtx)) {
+        FREE(pcp);
+        return NULL;
+    }
+
+    return pcp;
+}
+
 static void
 driDestroyContext(__DRIcontext *pcp)
 {
@@ -269,5 +311,6 @@ const __DRIcoreExtension driCoreExtension = {
 const __DRIswrastExtension driSWRastExtension = {
     { __DRI_SWRAST, __DRI_SWRAST_VERSION },
     driCreateNewScreen,
-    driCreateNewDrawable
+    driCreateNewDrawable,
+    driCreateNewContextForAPI
 };
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 3ac32b1b4..144b187c1 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -1,739 +1,806 @@
-/*

- * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>

- *

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

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- *

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

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

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

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

- */

-

-/*

- * DRI software rasterizer

- *

- * This is the mesa swrast module packaged into a DRI driver structure.

- *

- * The front-buffer is allocated by the loader. The loader provides read/write

- * callbacks for access to the front-buffer. The driver uses a scratch row for

- * front-buffer rendering to avoid repeated calls to the loader.

- *

- * The back-buffer is allocated by the driver and is private.

- */

-

-#include "main/context.h"

-#include "main/extensions.h"

-#include "main/formats.h"

-#include "main/framebuffer.h"

-#include "main/imports.h"

-#include "main/renderbuffer.h"

-#include "swrast/swrast.h"

-#include "swrast_setup/swrast_setup.h"

-#include "tnl/tnl.h"

-#include "tnl/t_context.h"

-#include "tnl/t_pipeline.h"

-#include "vbo/vbo.h"

-#include "drivers/common/driverfuncs.h"

-#include "drivers/common/meta.h"

-#include "utils.h"

-

-#include "main/teximage.h"

-#include "main/texformat.h"

-#include "main/texstate.h"

-

-#include "swrast_priv.h"

-

-

-/**

- * Screen and config-related functions

- */

-

-static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,

-				GLint texture_format, __DRIdrawable *dPriv)

-{

-    struct dri_context *dri_ctx;

-    int x, y, w, h;

-    __DRIscreen *sPriv = dPriv->driScreenPriv;

-    struct gl_texture_unit *texUnit;

-    struct gl_texture_object *texObj;

-    struct gl_texture_image *texImage;

-    uint32_t internalFormat;

-    gl_format texFormat;

-

-    dri_ctx = pDRICtx->driverPrivate;

-

-    internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);

-

-    texUnit = _mesa_get_current_tex_unit(&dri_ctx->Base);

-    texObj = _mesa_select_tex_object(&dri_ctx->Base, texUnit, target);

-    texImage = _mesa_get_tex_image(&dri_ctx->Base, texObj, target, 0);

-

-    _mesa_lock_texture(&dri_ctx->Base, texObj);

-

-    sPriv->swrast_loader->getDrawableInfo(dPriv, &x, &y, &w, &h, dPriv->loaderPrivate);

-

-    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)

-	texFormat = MESA_FORMAT_XRGB8888;

-    else

-	texFormat = MESA_FORMAT_ARGB8888;

-

-    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,

-			       w, h, 1, 0, internalFormat, texFormat);

-

-    sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,

-				   dPriv->loaderPrivate);

-

-    _mesa_unlock_texture(&dri_ctx->Base, texObj);

-}

-

-static void swrastSetTexBuffer(__DRIcontext *pDRICtx, GLint target,

-			       __DRIdrawable *dPriv)

-{

-    swrastSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);

-}

-

-static const __DRItexBufferExtension swrastTexBufferExtension = {

-    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },

-    swrastSetTexBuffer,

-    swrastSetTexBuffer2,

-};

-

-static const __DRIextension *dri_screen_extensions[] = {

-    &swrastTexBufferExtension.base,

-    NULL

-};

-

-static __DRIconfig **

-swrastFillInModes(__DRIscreen *psp,

-		  unsigned pixel_bits, unsigned depth_bits,

-		  unsigned stencil_bits, GLboolean have_back_buffer)

-{

-    __DRIconfig **configs;

-    unsigned depth_buffer_factor;

-    unsigned back_buffer_factor;

-    GLenum fb_format;

-    GLenum fb_type;

-

-    /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't

-     * support pageflipping at all.

-     */

-    static const GLenum back_buffer_modes[] = {

-	GLX_NONE, GLX_SWAP_UNDEFINED_OML

-    };

-

-    uint8_t depth_bits_array[4];

-    uint8_t stencil_bits_array[4];

-    uint8_t msaa_samples_array[1];

-

-    depth_bits_array[0] = 0;

-    depth_bits_array[1] = 0;

-    depth_bits_array[2] = depth_bits;

-    depth_bits_array[3] = depth_bits;

-

-    /* Just like with the accumulation buffer, always provide some modes

-     * with a stencil buffer.

-     */

-    stencil_bits_array[0] = 0;

-    stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;

-    stencil_bits_array[2] = 0;

-    stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits;

-

-    msaa_samples_array[0] = 0;

-

-    depth_buffer_factor = 4;

-    back_buffer_factor = 2;

-

-    switch (pixel_bits) {

-    case 8:

-	fb_format = GL_RGB;

-	fb_type = GL_UNSIGNED_BYTE_2_3_3_REV;

-	break;

-    case 16:

-	fb_format = GL_RGB;

-	fb_type = GL_UNSIGNED_SHORT_5_6_5;

-	break;

-    case 24:

-	fb_format = GL_BGR;

-	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

-	break;

-    case 32:

-	fb_format = GL_BGRA;

-	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

-	break;

-    default:

-	fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__,

-		pixel_bits);

-	return NULL;

-    }

-

-    configs = driCreateConfigs(fb_format, fb_type,

-			       depth_bits_array, stencil_bits_array,

-			       depth_buffer_factor, back_buffer_modes,

-			       back_buffer_factor, msaa_samples_array, 1,

-			       GL_TRUE);

-    if (configs == NULL) {

-	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,

-		__LINE__);

-	return NULL;

-    }

-

-    return configs;

-}

-

-static const __DRIconfig **

-dri_init_screen(__DRIscreen * psp)

-{

-    __DRIconfig **configs8, **configs16, **configs24, **configs32;

-

-    TRACE;

-

-    psp->extensions = dri_screen_extensions;

-

-    configs8  = swrastFillInModes(psp,  8,  8, 0, 1);

-    configs16 = swrastFillInModes(psp, 16, 16, 0, 1);

-    configs24 = swrastFillInModes(psp, 24, 24, 8, 1);

-    configs32 = swrastFillInModes(psp, 32, 24, 8, 1);

-

-    configs16 = driConcatConfigs(configs8, configs16);

-    configs24 = driConcatConfigs(configs16, configs24);

-    configs32 = driConcatConfigs(configs24, configs32);

-

-    return (const __DRIconfig **)configs32;

-}

-

-static void

-dri_destroy_screen(__DRIscreen * sPriv)

-{

-    TRACE;

-}

-

-

-/**

- * Framebuffer and renderbuffer-related functions.

- */

-

-static GLuint

-choose_pixel_format(const struct gl_config *v)

-{

-    int depth = v->rgbBits;

-

-    if (depth == 32

-	&& v->redMask   == 0xff0000

-	&& v->greenMask == 0x00ff00

-	&& v->blueMask  == 0x0000ff)

-	return PF_A8R8G8B8;

-    else if (depth == 24

-	     && v->redMask   == 0xff0000

-	     && v->greenMask == 0x00ff00

-	     && v->blueMask  == 0x0000ff)

-	return PF_X8R8G8B8;

-    else if (depth == 16

-	     && v->redMask   == 0xf800

-	     && v->greenMask == 0x07e0

-	     && v->blueMask  == 0x001f)

-	return PF_R5G6B5;

-    else if (depth == 8

-	     && v->redMask   == 0x07

-	     && v->greenMask == 0x38

-	     && v->blueMask  == 0xc0)

-	return PF_R3G3B2;

-

-    _mesa_problem( NULL, "unexpected format in %s", __FUNCTION__ );

-    return 0;

-}

-

-static void

-swrast_delete_renderbuffer(struct gl_renderbuffer *rb)

-{

-    TRACE;

-

-    free(rb->Data);

-    free(rb);

-}

-

-/* see bytes_per_line in libGL */

-static INLINE int

-bytes_per_line(unsigned pitch_bits, unsigned mul)

-{

-   unsigned mask = mul - 1;

-

-   return ((pitch_bits + mask) & ~mask) / 8;

-}

-

-static GLboolean

-swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

-			   GLenum internalFormat, GLuint width, GLuint height)

-{

-    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);

-

-    TRACE;

-

-    rb->Data = NULL;

-    rb->Width = width;

-    rb->Height = height;

-

-    xrb->pitch = bytes_per_line(width * xrb->bpp, 32);

-

-    return GL_TRUE;

-}

-

-static GLboolean

-swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

-			  GLenum internalFormat, GLuint width, GLuint height)

-{

-    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);

-

-    TRACE;

-

-    free(rb->Data);

-

-    swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);

-

-    rb->Data = malloc(height * xrb->pitch);

-

-    return GL_TRUE;

-}

-

-static struct swrast_renderbuffer *

-swrast_new_renderbuffer(const struct gl_config *visual, GLboolean front)

-{

-    struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);

-    GLuint pixel_format;

-

-    TRACE;

-

-    if (!xrb)

-	return NULL;

-

-    _mesa_init_renderbuffer(&xrb->Base, 0);

-

-    pixel_format = choose_pixel_format(visual);

-

-    xrb->Base.Delete = swrast_delete_renderbuffer;

-    if (front) {

-	xrb->Base.AllocStorage = swrast_alloc_front_storage;

-	swrast_set_span_funcs_front(xrb, pixel_format);

-    }

-    else {

-	xrb->Base.AllocStorage = swrast_alloc_back_storage;

-	swrast_set_span_funcs_back(xrb, pixel_format);

-    }

-

-    switch (pixel_format) {

-    case PF_A8R8G8B8:

-	xrb->Base.Format = MESA_FORMAT_ARGB8888;

-	xrb->Base.InternalFormat = GL_RGBA;

-	xrb->Base._BaseFormat = GL_RGBA;

-	xrb->Base.DataType = GL_UNSIGNED_BYTE;

-	xrb->bpp = 32;

-	break;

-    case PF_X8R8G8B8:

-	xrb->Base.Format = MESA_FORMAT_ARGB8888; /* XXX */

-	xrb->Base.InternalFormat = GL_RGB;

-	xrb->Base._BaseFormat = GL_RGB;

-	xrb->Base.DataType = GL_UNSIGNED_BYTE;

-	xrb->bpp = 32;

-	break;

-    case PF_R5G6B5:

-	xrb->Base.Format = MESA_FORMAT_RGB565;

-	xrb->Base.InternalFormat = GL_RGB;

-	xrb->Base._BaseFormat = GL_RGB;

-	xrb->Base.DataType = GL_UNSIGNED_BYTE;

-	xrb->bpp = 16;

-	break;

-    case PF_R3G3B2:

-	xrb->Base.Format = MESA_FORMAT_RGB332;

-	xrb->Base.InternalFormat = GL_RGB;

-	xrb->Base._BaseFormat = GL_RGB;

-	xrb->Base.DataType = GL_UNSIGNED_BYTE;

-	xrb->bpp = 8;

-	break;

-    default:

-	return NULL;

-    }

-

-    return xrb;

-}

-

-static GLboolean

-dri_create_buffer(__DRIscreen * sPriv,

-		  __DRIdrawable * dPriv,

-		  const struct gl_config * visual, GLboolean isPixmap)

-{

-    struct dri_drawable *drawable = NULL;

-    struct gl_framebuffer *fb;

-    struct swrast_renderbuffer *frontrb, *backrb;

-

-    TRACE;

-

-    drawable = CALLOC_STRUCT(dri_drawable);

-    if (drawable == NULL)

-	goto drawable_fail;

-

-    dPriv->driverPrivate = drawable;

-    drawable->dPriv = dPriv;

-

-    drawable->row = malloc(MAX_WIDTH * 4);

-    if (drawable->row == NULL)

-	goto drawable_fail;

-

-    fb = &drawable->Base;

-

-    /* basic framebuffer setup */

-    _mesa_initialize_window_framebuffer(fb, visual);

-

-    /* add front renderbuffer */

-    frontrb = swrast_new_renderbuffer(visual, GL_TRUE);

-    _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontrb->Base);

-

-    /* add back renderbuffer */

-    if (visual->doubleBufferMode) {

-	backrb = swrast_new_renderbuffer(visual, GL_FALSE);

-	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backrb->Base);

-    }

-

-    /* add software renderbuffers */

-    _mesa_add_soft_renderbuffers(fb,

-				 GL_FALSE, /* color */

-				 visual->haveDepthBuffer,

-				 visual->haveStencilBuffer,

-				 visual->haveAccumBuffer,

-				 GL_FALSE, /* alpha */

-				 GL_FALSE /* aux bufs */);

-

-    return GL_TRUE;

-

-drawable_fail:

-

-    if (drawable)

-	free(drawable->row);

-

-    FREE(drawable);

-

-    return GL_FALSE;

-}

-

-static void

-dri_destroy_buffer(__DRIdrawable * dPriv)

-{

-    TRACE;

-

-    if (dPriv) {

-	struct dri_drawable *drawable = dri_drawable(dPriv);

-	struct gl_framebuffer *fb;

-

-	free(drawable->row);

-

-	fb = &drawable->Base;

-

-	fb->DeletePending = GL_TRUE;

-	_mesa_reference_framebuffer(&fb, NULL);

-    }

-}

-

-static void

-dri_swap_buffers(__DRIdrawable * dPriv)

-{

-    __DRIscreen *sPriv = dPriv->driScreenPriv;

-

-    GET_CURRENT_CONTEXT(ctx);

-

-    struct dri_drawable *drawable = dri_drawable(dPriv);

-    struct gl_framebuffer *fb;

-    struct swrast_renderbuffer *frontrb, *backrb;

-

-    TRACE;

-

-    fb = &drawable->Base;

-

-    frontrb =

-	swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);

-    backrb =

-	swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);

-

-    /* check for signle-buffered */

-    if (backrb == NULL)

-	return;

-

-    /* check if swapping currently bound buffer */

-    if (ctx && ctx->DrawBuffer == fb) {

-	/* flush pending rendering */

-	_mesa_notifySwapBuffers(ctx);

-    }

-

-    sPriv->swrast_loader->putImage(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,

-				   0, 0,

-				   frontrb->Base.Width,

-				   frontrb->Base.Height,

-				   backrb->Base.Data,

-				   dPriv->loaderPrivate);

-}

-

-

-/**

- * General device driver functions.

- */

-

-static void

-get_window_size( struct gl_framebuffer *fb, GLsizei *w, GLsizei *h )

-{

-    __DRIdrawable *dPriv = swrast_drawable(fb)->dPriv;

-    __DRIscreen *sPriv = dPriv->driScreenPriv;

-    int x, y;

-

-    sPriv->swrast_loader->getDrawableInfo(dPriv,

-					  &x, &y, w, h,

-					  dPriv->loaderPrivate);

-}

-

-static void

-swrast_check_and_update_window_size( struct gl_context *ctx, struct gl_framebuffer *fb )

-{

-    GLsizei width, height;

-

-    get_window_size(fb, &width, &height);

-    if (fb->Width != width || fb->Height != height) {

-	_mesa_resize_framebuffer(ctx, fb, width, height);

-    }

-}

-

-static const GLubyte *

-get_string(struct gl_context *ctx, GLenum pname)

-{

-    (void) ctx;

-    switch (pname) {

-	case GL_VENDOR:

-	    return (const GLubyte *) "Mesa Project";

-	case GL_RENDERER:

-	    return (const GLubyte *) "Software Rasterizer";

-	default:

-	    return NULL;

-    }

-}

-

-static void

-update_state( struct gl_context *ctx, GLuint new_state )

-{

-    /* not much to do here - pass it on */

-    _swrast_InvalidateState( ctx, new_state );

-    _swsetup_InvalidateState( ctx, new_state );

-    _vbo_InvalidateState( ctx, new_state );

-    _tnl_InvalidateState( ctx, new_state );

-}

-

-static void

-viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)

-{

-    struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;

-    struct gl_framebuffer *read = ctx->WinSysReadBuffer;

-

-    swrast_check_and_update_window_size(ctx, draw);

-    swrast_check_and_update_window_size(ctx, read);

-}

-

-static gl_format swrastChooseTextureFormat(struct gl_context * ctx,

-					   GLint internalFormat,

-					   GLenum format,

-					   GLenum type)

-{

-    if (internalFormat == GL_RGB)

-	return MESA_FORMAT_XRGB8888;

-    return _mesa_choose_tex_format(ctx, internalFormat, format, type);

-}

-

-static void

-swrast_init_driver_functions(struct dd_function_table *driver)

-{

-    driver->GetString = get_string;

-    driver->UpdateState = update_state;

-    driver->GetBufferSize = NULL;

-    driver->Viewport = viewport;

-    driver->ChooseTextureFormat = swrastChooseTextureFormat;

-}

-

-

-/**

- * Context-related functions.

- */

-

-static GLboolean

-dri_create_context(gl_api api,

-		   const struct gl_config * visual,

-		   __DRIcontext * cPriv, void *sharedContextPrivate)

-{

-    struct dri_context *ctx = NULL;

-    struct dri_context *share = (struct dri_context *)sharedContextPrivate;

-    struct gl_context *mesaCtx = NULL;

-    struct gl_context *sharedCtx = NULL;

-    struct dd_function_table functions;

-

-    TRACE;

-

-    ctx = CALLOC_STRUCT(dri_context);

-    if (ctx == NULL)

-	goto context_fail;

-

-    cPriv->driverPrivate = ctx;

-    ctx->cPriv = cPriv;

-

-    /* build table of device driver functions */

-    _mesa_init_driver_functions(&functions);

-    swrast_init_driver_functions(&functions);

-

-    if (share) {

-	sharedCtx = &share->Base;

-    }

-

-    mesaCtx = &ctx->Base;

-

-    /* basic context setup */

-    if (!_mesa_initialize_context(mesaCtx, visual, sharedCtx, &functions, (void *) cPriv)) {

-	goto context_fail;

-    }

-

-    /* do bounds checking to prevent segfaults and server crashes! */

-    mesaCtx->Const.CheckArrayBounds = GL_TRUE;

-

-    /* create module contexts */

-    _swrast_CreateContext( mesaCtx );

-    _vbo_CreateContext( mesaCtx );

-    _tnl_CreateContext( mesaCtx );

-    _swsetup_CreateContext( mesaCtx );

-    _swsetup_Wakeup( mesaCtx );

-

-    /* use default TCL pipeline */

-    {

-       TNLcontext *tnl = TNL_CONTEXT(mesaCtx);

-       tnl->Driver.RunPipeline = _tnl_run_pipeline;

-    }

-

-    _mesa_enable_sw_extensions(mesaCtx);

-    _mesa_enable_1_3_extensions(mesaCtx);

-    _mesa_enable_1_4_extensions(mesaCtx);

-    _mesa_enable_1_5_extensions(mesaCtx);

-    _mesa_enable_2_0_extensions(mesaCtx);

-    _mesa_enable_2_1_extensions(mesaCtx);

-

-    _mesa_meta_init(mesaCtx);

-

-    driInitExtensions( mesaCtx, NULL, GL_FALSE );

-

-    return GL_TRUE;

-

-context_fail:

-

-    FREE(ctx);

-

-    return GL_FALSE;

-}

-

-static void

-dri_destroy_context(__DRIcontext * cPriv)

-{

-    TRACE;

-

-    if (cPriv) {

-	struct dri_context *ctx = dri_context(cPriv);

-	struct gl_context *mesaCtx;

-

-	mesaCtx = &ctx->Base;

-

-        _mesa_meta_free(mesaCtx);

-	_swsetup_DestroyContext( mesaCtx );

-	_swrast_DestroyContext( mesaCtx );

-	_tnl_DestroyContext( mesaCtx );

-	_vbo_DestroyContext( mesaCtx );

-	_mesa_destroy_context( mesaCtx );

-    }

-}

-

-static GLboolean

-dri_make_current(__DRIcontext * cPriv,

-		 __DRIdrawable * driDrawPriv,

-		 __DRIdrawable * driReadPriv)

-{

-    struct gl_context *mesaCtx;

-    struct gl_framebuffer *mesaDraw;

-    struct gl_framebuffer *mesaRead;

-    TRACE;

-

-    if (cPriv) {

-	struct dri_context *ctx = dri_context(cPriv);

-	struct dri_drawable *draw;

-	struct dri_drawable *read;

-

-	if (!driDrawPriv || !driReadPriv)

-	    return GL_FALSE;

-

-	draw = dri_drawable(driDrawPriv);

-	read = dri_drawable(driReadPriv);

-	mesaCtx = &ctx->Base;

-	mesaDraw = &draw->Base;

-	mesaRead = &read->Base;

-

-	/* check for same context and buffer */

-	if (mesaCtx == _mesa_get_current_context()

-	    && mesaCtx->DrawBuffer == mesaDraw

-	    && mesaCtx->ReadBuffer == mesaRead) {

-	    return GL_TRUE;

-	}

-

-	_glapi_check_multithread();

-

-	swrast_check_and_update_window_size(mesaCtx, mesaDraw);

-	if (mesaRead != mesaDraw)

-	    swrast_check_and_update_window_size(mesaCtx, mesaRead);

-

-	_mesa_make_current( mesaCtx,

-			    mesaDraw,

-			    mesaRead );

-    }

-    else {

-	/* unbind */

-	_mesa_make_current( NULL, NULL, NULL );

-    }

-

-    return GL_TRUE;

-}

-

-static GLboolean

-dri_unbind_context(__DRIcontext * cPriv)

-{

-    TRACE;

-    (void) cPriv;

-

-    /* Unset current context and dispath table */

-    _mesa_make_current(NULL, NULL, NULL);

-

-    return GL_TRUE;

-}

-

-

-const struct __DriverAPIRec driDriverAPI = {

-    .InitScreen = dri_init_screen,

-    .DestroyScreen = dri_destroy_screen,

-    .CreateContext = dri_create_context,

-    .DestroyContext = dri_destroy_context,

-    .CreateBuffer = dri_create_buffer,

-    .DestroyBuffer = dri_destroy_buffer,

-    .SwapBuffers = dri_swap_buffers,

-    .MakeCurrent = dri_make_current,

-    .UnbindContext = dri_unbind_context,

-};

-

-/* This is the table of extensions that the loader will dlsym() for. */

-PUBLIC const __DRIextension *__driDriverExtensions[] = {

-    &driCoreExtension.base,

-    &driSWRastExtension.base,

-    NULL

-};

+/*
+ * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DRI software rasterizer
+ *
+ * This is the mesa swrast module packaged into a DRI driver structure.
+ *
+ * The front-buffer is allocated by the loader. The loader provides read/write
+ * callbacks for access to the front-buffer. The driver uses a scratch row for
+ * front-buffer rendering to avoid repeated calls to the loader.
+ *
+ * The back-buffer is allocated by the driver and is private.
+ */
+
+#include "main/context.h"
+#include "main/extensions.h"
+#include "main/formats.h"
+#include "main/framebuffer.h"
+#include "main/imports.h"
+#include "main/renderbuffer.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+#include "vbo/vbo.h"
+#include "drivers/common/driverfuncs.h"
+#include "drivers/common/meta.h"
+#include "utils.h"
+
+#include "main/teximage.h"
+#include "main/texformat.h"
+#include "main/texstate.h"
+
+#include "swrast_priv.h"
+
+
+/**
+ * Screen and config-related functions
+ */
+
+static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
+				GLint texture_format, __DRIdrawable *dPriv)
+{
+    struct dri_context *dri_ctx;
+    int x, y, w, h;
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
+    struct gl_texture_unit *texUnit;
+    struct gl_texture_object *texObj;
+    struct gl_texture_image *texImage;
+    uint32_t internalFormat;
+    gl_format texFormat;
+
+    dri_ctx = pDRICtx->driverPrivate;
+
+    internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);
+
+    texUnit = _mesa_get_current_tex_unit(&dri_ctx->Base);
+    texObj = _mesa_select_tex_object(&dri_ctx->Base, texUnit, target);
+    texImage = _mesa_get_tex_image(&dri_ctx->Base, texObj, target, 0);
+
+    _mesa_lock_texture(&dri_ctx->Base, texObj);
+
+    sPriv->swrast_loader->getDrawableInfo(dPriv, &x, &y, &w, &h, dPriv->loaderPrivate);
+
+    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
+	texFormat = MESA_FORMAT_XRGB8888;
+    else
+	texFormat = MESA_FORMAT_ARGB8888;
+
+    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
+			       w, h, 1, 0, internalFormat, texFormat);
+
+    sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
+				   dPriv->loaderPrivate);
+
+    _mesa_unlock_texture(&dri_ctx->Base, texObj);
+}
+
+static void swrastSetTexBuffer(__DRIcontext *pDRICtx, GLint target,
+			       __DRIdrawable *dPriv)
+{
+    swrastSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);
+}
+
+static const __DRItexBufferExtension swrastTexBufferExtension = {
+    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
+    swrastSetTexBuffer,
+    swrastSetTexBuffer2,
+};
+
+static const __DRIextension *dri_screen_extensions[] = {
+    &swrastTexBufferExtension.base,
+    NULL
+};
+
+static __DRIconfig **
+swrastFillInModes(__DRIscreen *psp,
+		  unsigned pixel_bits, unsigned depth_bits,
+		  unsigned stencil_bits, GLboolean have_back_buffer)
+{
+    __DRIconfig **configs;
+    unsigned depth_buffer_factor;
+    unsigned back_buffer_factor;
+    GLenum fb_format;
+    GLenum fb_type;
+
+    /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't
+     * support pageflipping at all.
+     */
+    static const GLenum back_buffer_modes[] = {
+	GLX_NONE, GLX_SWAP_UNDEFINED_OML
+    };
+
+    uint8_t depth_bits_array[4];
+    uint8_t stencil_bits_array[4];
+    uint8_t msaa_samples_array[1];
+
+    depth_bits_array[0] = 0;
+    depth_bits_array[1] = 0;
+    depth_bits_array[2] = depth_bits;
+    depth_bits_array[3] = depth_bits;
+
+    /* Just like with the accumulation buffer, always provide some modes
+     * with a stencil buffer.
+     */
+    stencil_bits_array[0] = 0;
+    stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
+    stencil_bits_array[2] = 0;
+    stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits;
+
+    msaa_samples_array[0] = 0;
+
+    depth_buffer_factor = 4;
+    back_buffer_factor = 2;
+
+    switch (pixel_bits) {
+    case 8:
+	fb_format = GL_RGB;
+	fb_type = GL_UNSIGNED_BYTE_2_3_3_REV;
+	break;
+    case 16:
+	fb_format = GL_RGB;
+	fb_type = GL_UNSIGNED_SHORT_5_6_5;
+	break;
+    case 24:
+	fb_format = GL_BGR;
+	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+	break;
+    case 32:
+	fb_format = GL_BGRA;
+	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+	break;
+    default:
+	fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__,
+		pixel_bits);
+	return NULL;
+    }
+
+    configs = driCreateConfigs(fb_format, fb_type,
+			       depth_bits_array, stencil_bits_array,
+			       depth_buffer_factor, back_buffer_modes,
+			       back_buffer_factor, msaa_samples_array, 1,
+			       GL_TRUE);
+    if (configs == NULL) {
+	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
+		__LINE__);
+	return NULL;
+    }
+
+    return configs;
+}
+
+static const __DRIconfig **
+dri_init_screen(__DRIscreen * psp)
+{
+    __DRIconfig **configs8, **configs16, **configs24, **configs32;
+
+    TRACE;
+
+    psp->extensions = dri_screen_extensions;
+
+    configs8  = swrastFillInModes(psp,  8,  8, 0, 1);
+    configs16 = swrastFillInModes(psp, 16, 16, 0, 1);
+    configs24 = swrastFillInModes(psp, 24, 24, 8, 1);
+    configs32 = swrastFillInModes(psp, 32, 24, 8, 1);
+
+    configs16 = driConcatConfigs(configs8, configs16);
+    configs24 = driConcatConfigs(configs16, configs24);
+    configs32 = driConcatConfigs(configs24, configs32);
+
+    return (const __DRIconfig **)configs32;
+}
+
+static void
+dri_destroy_screen(__DRIscreen * sPriv)
+{
+    TRACE;
+}
+
+
+/**
+ * Framebuffer and renderbuffer-related functions.
+ */
+
+static GLuint
+choose_pixel_format(const struct gl_config *v)
+{
+    int depth = v->rgbBits;
+
+    if (depth == 32
+	&& v->redMask   == 0xff0000
+	&& v->greenMask == 0x00ff00
+	&& v->blueMask  == 0x0000ff)
+	return PF_A8R8G8B8;
+    else if (depth == 24
+	     && v->redMask   == 0xff0000
+	     && v->greenMask == 0x00ff00
+	     && v->blueMask  == 0x0000ff)
+	return PF_X8R8G8B8;
+    else if (depth == 16
+	     && v->redMask   == 0xf800
+	     && v->greenMask == 0x07e0
+	     && v->blueMask  == 0x001f)
+	return PF_R5G6B5;
+    else if (depth == 8
+	     && v->redMask   == 0x07
+	     && v->greenMask == 0x38
+	     && v->blueMask  == 0xc0)
+	return PF_R3G3B2;
+
+    _mesa_problem( NULL, "unexpected format in %s", __FUNCTION__ );
+    return 0;
+}
+
+static void
+swrast_delete_renderbuffer(struct gl_renderbuffer *rb)
+{
+    TRACE;
+
+    free(rb->Data);
+    free(rb);
+}
+
+/* see bytes_per_line in libGL */
+static INLINE int
+bytes_per_line(unsigned pitch_bits, unsigned mul)
+{
+   unsigned mask = mul - 1;
+
+   return ((pitch_bits + mask) & ~mask) / 8;
+}
+
+static GLboolean
+swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
+			   GLenum internalFormat, GLuint width, GLuint height)
+{
+    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
+
+    TRACE;
+
+    rb->Data = NULL;
+    rb->Width = width;
+    rb->Height = height;
+
+    xrb->pitch = bytes_per_line(width * xrb->bpp, 32);
+
+    return GL_TRUE;
+}
+
+static GLboolean
+swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
+			  GLenum internalFormat, GLuint width, GLuint height)
+{
+    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
+
+    TRACE;
+
+    free(rb->Data);
+
+    swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);
+
+    rb->Data = malloc(height * xrb->pitch);
+
+    return GL_TRUE;
+}
+
+static struct swrast_renderbuffer *
+swrast_new_renderbuffer(const struct gl_config *visual, GLboolean front)
+{
+    struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
+    GLuint pixel_format;
+
+    TRACE;
+
+    if (!xrb)
+	return NULL;
+
+    _mesa_init_renderbuffer(&xrb->Base, 0);
+
+    pixel_format = choose_pixel_format(visual);
+
+    xrb->Base.Delete = swrast_delete_renderbuffer;
+    if (front) {
+	xrb->Base.AllocStorage = swrast_alloc_front_storage;
+	swrast_set_span_funcs_front(xrb, pixel_format);
+    }
+    else {
+	xrb->Base.AllocStorage = swrast_alloc_back_storage;
+	swrast_set_span_funcs_back(xrb, pixel_format);
+    }
+
+    switch (pixel_format) {
+    case PF_A8R8G8B8:
+	xrb->Base.Format = MESA_FORMAT_ARGB8888;
+	xrb->Base.InternalFormat = GL_RGBA;
+	xrb->Base._BaseFormat = GL_RGBA;
+	xrb->Base.DataType = GL_UNSIGNED_BYTE;
+	xrb->bpp = 32;
+	break;
+    case PF_X8R8G8B8:
+	xrb->Base.Format = MESA_FORMAT_ARGB8888; /* XXX */
+	xrb->Base.InternalFormat = GL_RGB;
+	xrb->Base._BaseFormat = GL_RGB;
+	xrb->Base.DataType = GL_UNSIGNED_BYTE;
+	xrb->bpp = 32;
+	break;
+    case PF_R5G6B5:
+	xrb->Base.Format = MESA_FORMAT_RGB565;
+	xrb->Base.InternalFormat = GL_RGB;
+	xrb->Base._BaseFormat = GL_RGB;
+	xrb->Base.DataType = GL_UNSIGNED_BYTE;
+	xrb->bpp = 16;
+	break;
+    case PF_R3G3B2:
+	xrb->Base.Format = MESA_FORMAT_RGB332;
+	xrb->Base.InternalFormat = GL_RGB;
+	xrb->Base._BaseFormat = GL_RGB;
+	xrb->Base.DataType = GL_UNSIGNED_BYTE;
+	xrb->bpp = 8;
+	break;
+    default:
+	return NULL;
+    }
+
+    return xrb;
+}
+
+static GLboolean
+dri_create_buffer(__DRIscreen * sPriv,
+		  __DRIdrawable * dPriv,
+		  const struct gl_config * visual, GLboolean isPixmap)
+{
+    struct dri_drawable *drawable = NULL;
+    struct gl_framebuffer *fb;
+    struct swrast_renderbuffer *frontrb, *backrb;
+
+    TRACE;
+
+    drawable = CALLOC_STRUCT(dri_drawable);
+    if (drawable == NULL)
+	goto drawable_fail;
+
+    dPriv->driverPrivate = drawable;
+    drawable->dPriv = dPriv;
+
+    drawable->row = malloc(MAX_WIDTH * 4);
+    if (drawable->row == NULL)
+	goto drawable_fail;
+
+    fb = &drawable->Base;
+
+    /* basic framebuffer setup */
+    _mesa_initialize_window_framebuffer(fb, visual);
+
+    /* add front renderbuffer */
+    frontrb = swrast_new_renderbuffer(visual, GL_TRUE);
+    _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontrb->Base);
+
+    /* add back renderbuffer */
+    if (visual->doubleBufferMode) {
+	backrb = swrast_new_renderbuffer(visual, GL_FALSE);
+	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backrb->Base);
+    }
+
+    /* add software renderbuffers */
+    _mesa_add_soft_renderbuffers(fb,
+				 GL_FALSE, /* color */
+				 visual->haveDepthBuffer,
+				 visual->haveStencilBuffer,
+				 visual->haveAccumBuffer,
+				 GL_FALSE, /* alpha */
+				 GL_FALSE /* aux bufs */);
+
+    return GL_TRUE;
+
+drawable_fail:
+
+    if (drawable)
+	free(drawable->row);
+
+    FREE(drawable);
+
+    return GL_FALSE;
+}
+
+static void
+dri_destroy_buffer(__DRIdrawable * dPriv)
+{
+    TRACE;
+
+    if (dPriv) {
+	struct dri_drawable *drawable = dri_drawable(dPriv);
+	struct gl_framebuffer *fb;
+
+	free(drawable->row);
+
+	fb = &drawable->Base;
+
+	fb->DeletePending = GL_TRUE;
+	_mesa_reference_framebuffer(&fb, NULL);
+    }
+}
+
+static void
+dri_swap_buffers(__DRIdrawable * dPriv)
+{
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
+
+    GET_CURRENT_CONTEXT(ctx);
+
+    struct dri_drawable *drawable = dri_drawable(dPriv);
+    struct gl_framebuffer *fb;
+    struct swrast_renderbuffer *frontrb, *backrb;
+
+    TRACE;
+
+    fb = &drawable->Base;
+
+    frontrb =
+	swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
+    backrb =
+	swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
+
+    /* check for signle-buffered */
+    if (backrb == NULL)
+	return;
+
+    /* check if swapping currently bound buffer */
+    if (ctx && ctx->DrawBuffer == fb) {
+	/* flush pending rendering */
+	_mesa_notifySwapBuffers(ctx);
+    }
+
+    sPriv->swrast_loader->putImage(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,
+				   0, 0,
+				   frontrb->Base.Width,
+				   frontrb->Base.Height,
+				   backrb->Base.Data,
+				   dPriv->loaderPrivate);
+}
+
+
+/**
+ * General device driver functions.
+ */
+
+static void
+get_window_size( struct gl_framebuffer *fb, GLsizei *w, GLsizei *h )
+{
+    __DRIdrawable *dPriv = swrast_drawable(fb)->dPriv;
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
+    int x, y;
+
+    sPriv->swrast_loader->getDrawableInfo(dPriv,
+					  &x, &y, w, h,
+					  dPriv->loaderPrivate);
+}
+
+static void
+swrast_check_and_update_window_size( struct gl_context *ctx, struct gl_framebuffer *fb )
+{
+    GLsizei width, height;
+
+    get_window_size(fb, &width, &height);
+    if (fb->Width != width || fb->Height != height) {
+	_mesa_resize_framebuffer(ctx, fb, width, height);
+    }
+}
+
+static const GLubyte *
+get_string(struct gl_context *ctx, GLenum pname)
+{
+    (void) ctx;
+    switch (pname) {
+	case GL_VENDOR:
+	    return (const GLubyte *) "Mesa Project";
+	case GL_RENDERER:
+	    return (const GLubyte *) "Software Rasterizer";
+	default:
+	    return NULL;
+    }
+}
+
+static void
+update_state( struct gl_context *ctx, GLuint new_state )
+{
+    /* not much to do here - pass it on */
+    _swrast_InvalidateState( ctx, new_state );
+    _swsetup_InvalidateState( ctx, new_state );
+    _vbo_InvalidateState( ctx, new_state );
+    _tnl_InvalidateState( ctx, new_state );
+}
+
+static void
+viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+{
+    struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;
+    struct gl_framebuffer *read = ctx->WinSysReadBuffer;
+
+    swrast_check_and_update_window_size(ctx, draw);
+    swrast_check_and_update_window_size(ctx, read);
+}
+
+static gl_format swrastChooseTextureFormat(struct gl_context * ctx,
+					   GLint internalFormat,
+					   GLenum format,
+					   GLenum type)
+{
+    if (internalFormat == GL_RGB)
+	return MESA_FORMAT_XRGB8888;
+    return _mesa_choose_tex_format(ctx, internalFormat, format, type);
+}
+
+static void
+swrast_init_driver_functions(struct dd_function_table *driver)
+{
+    driver->GetString = get_string;
+    driver->UpdateState = update_state;
+    driver->GetBufferSize = NULL;
+    driver->Viewport = viewport;
+    driver->ChooseTextureFormat = swrastChooseTextureFormat;
+}
+
+static const char *es2_extensions[] = {
+   /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
+   "GL_ARB_draw_buffers",
+   "GL_ARB_multisample",
+   "GL_ARB_texture_compression",
+   "GL_ARB_transpose_matrix",
+   "GL_ARB_vertex_buffer_object",
+   "GL_ARB_window_pos",
+   "GL_EXT_blend_func_separate",
+   "GL_EXT_compiled_vertex_array",
+   "GL_EXT_framebuffer_blit",
+   "GL_EXT_multi_draw_arrays",
+   "GL_EXT_polygon_offset",
+   "GL_EXT_texture_object",
+   "GL_EXT_vertex_array",
+   "GL_IBM_multimode_draw_arrays",
+   "GL_MESA_window_pos",
+   "GL_NV_vertex_program",
+
+   /* Required by GLES2 */
+   "GL_ARB_fragment_program",
+   "GL_ARB_fragment_shader",
+   "GL_ARB_multitexture",
+   "GL_ARB_shader_objects",
+   "GL_ARB_texture_cube_map",
+   "GL_ARB_texture_mirrored_repeat",
+   "GL_ARB_texture_non_power_of_two",
+   "GL_ARB_vertex_shader",
+   "GL_EXT_blend_color",
+   "GL_EXT_blend_equation_separate",
+   "GL_EXT_blend_minmax",
+   "GL_EXT_blend_subtract",
+   "GL_EXT_stencil_wrap",
+
+   /* Optional GLES2 */
+   "GL_ARB_framebuffer_object",
+   "GL_EXT_texture_filter_anisotropic",
+   "GL_ARB_depth_texture",
+   "GL_EXT_packed_depth_stencil",
+   "GL_EXT_framebuffer_object",
+   NULL,
+};
+
+static void
+InitExtensionsES2(struct gl_context *ctx)
+{
+   int i;
+
+   /* Can't use driInitExtensions() since it uses extensions from
+    * main/remap_helper.h when called the first time. */
+
+   for (i = 0; es2_extensions[i]; i++)
+      _mesa_enable_extension(ctx, es2_extensions[i]);
+}
+
+/**
+ * Context-related functions.
+ */
+
+static GLboolean
+dri_create_context(gl_api api,
+		   const struct gl_config * visual,
+		   __DRIcontext * cPriv, void *sharedContextPrivate)
+{
+    struct dri_context *ctx = NULL;
+    struct dri_context *share = (struct dri_context *)sharedContextPrivate;
+    struct gl_context *mesaCtx = NULL;
+    struct gl_context *sharedCtx = NULL;
+    struct dd_function_table functions;
+
+    TRACE;
+
+    ctx = CALLOC_STRUCT(dri_context);
+    if (ctx == NULL)
+	goto context_fail;
+
+    cPriv->driverPrivate = ctx;
+    ctx->cPriv = cPriv;
+
+    /* build table of device driver functions */
+    _mesa_init_driver_functions(&functions);
+    swrast_init_driver_functions(&functions);
+
+    if (share) {
+	sharedCtx = &share->Base;
+    }
+
+    mesaCtx = &ctx->Base;
+
+    /* basic context setup */
+    if (!_mesa_initialize_context_for_api(mesaCtx, api, visual, sharedCtx, &functions, (void *) cPriv)) {
+	goto context_fail;
+    }
+
+    /* do bounds checking to prevent segfaults and server crashes! */
+    mesaCtx->Const.CheckArrayBounds = GL_TRUE;
+
+    /* create module contexts */
+    _swrast_CreateContext( mesaCtx );
+    _vbo_CreateContext( mesaCtx );
+    _tnl_CreateContext( mesaCtx );
+    _swsetup_CreateContext( mesaCtx );
+    _swsetup_Wakeup( mesaCtx );
+
+    /* use default TCL pipeline */
+    {
+       TNLcontext *tnl = TNL_CONTEXT(mesaCtx);
+       tnl->Driver.RunPipeline = _tnl_run_pipeline;
+    }
+
+    _mesa_meta_init(mesaCtx);
+    _mesa_enable_sw_extensions(mesaCtx);
+
+    switch (api) {
+    case API_OPENGL:
+        _mesa_enable_1_3_extensions(mesaCtx);
+        _mesa_enable_1_4_extensions(mesaCtx);
+        _mesa_enable_1_5_extensions(mesaCtx);
+        _mesa_enable_2_0_extensions(mesaCtx);
+        _mesa_enable_2_1_extensions(mesaCtx);
+
+        driInitExtensions( mesaCtx, NULL, GL_FALSE );
+        break;
+    case API_OPENGLES:
+        _mesa_enable_1_3_extensions(mesaCtx);
+        _mesa_enable_1_4_extensions(mesaCtx);
+        _mesa_enable_1_5_extensions(mesaCtx);
+
+        break;
+    case API_OPENGLES2:
+        InitExtensionsES2( mesaCtx);
+        break;
+    }
+
+    return GL_TRUE;
+
+context_fail:
+
+    FREE(ctx);
+
+    return GL_FALSE;
+}
+
+static void
+dri_destroy_context(__DRIcontext * cPriv)
+{
+    TRACE;
+
+    if (cPriv) {
+	struct dri_context *ctx = dri_context(cPriv);
+	struct gl_context *mesaCtx;
+
+	mesaCtx = &ctx->Base;
+
+        _mesa_meta_free(mesaCtx);
+	_swsetup_DestroyContext( mesaCtx );
+	_swrast_DestroyContext( mesaCtx );
+	_tnl_DestroyContext( mesaCtx );
+	_vbo_DestroyContext( mesaCtx );
+	_mesa_destroy_context( mesaCtx );
+    }
+}
+
+static GLboolean
+dri_make_current(__DRIcontext * cPriv,
+		 __DRIdrawable * driDrawPriv,
+		 __DRIdrawable * driReadPriv)
+{
+    struct gl_context *mesaCtx;
+    struct gl_framebuffer *mesaDraw;
+    struct gl_framebuffer *mesaRead;
+    TRACE;
+
+    if (cPriv) {
+	struct dri_context *ctx = dri_context(cPriv);
+	struct dri_drawable *draw;
+	struct dri_drawable *read;
+
+	if (!driDrawPriv || !driReadPriv)
+	    return GL_FALSE;
+
+	draw = dri_drawable(driDrawPriv);
+	read = dri_drawable(driReadPriv);
+	mesaCtx = &ctx->Base;
+	mesaDraw = &draw->Base;
+	mesaRead = &read->Base;
+
+	/* check for same context and buffer */
+	if (mesaCtx == _mesa_get_current_context()
+	    && mesaCtx->DrawBuffer == mesaDraw
+	    && mesaCtx->ReadBuffer == mesaRead) {
+	    return GL_TRUE;
+	}
+
+	_glapi_check_multithread();
+
+	swrast_check_and_update_window_size(mesaCtx, mesaDraw);
+	if (mesaRead != mesaDraw)
+	    swrast_check_and_update_window_size(mesaCtx, mesaRead);
+
+	_mesa_make_current( mesaCtx,
+			    mesaDraw,
+			    mesaRead );
+    }
+    else {
+	/* unbind */
+	_mesa_make_current( NULL, NULL, NULL );
+    }
+
+    return GL_TRUE;
+}
+
+static GLboolean
+dri_unbind_context(__DRIcontext * cPriv)
+{
+    TRACE;
+    (void) cPriv;
+
+    /* Unset current context and dispath table */
+    _mesa_make_current(NULL, NULL, NULL);
+
+    return GL_TRUE;
+}
+
+
+const struct __DriverAPIRec driDriverAPI = {
+    .InitScreen = dri_init_screen,
+    .DestroyScreen = dri_destroy_screen,
+    .CreateContext = dri_create_context,
+    .DestroyContext = dri_destroy_context,
+    .CreateBuffer = dri_create_buffer,
+    .DestroyBuffer = dri_destroy_buffer,
+    .SwapBuffers = dri_swap_buffers,
+    .MakeCurrent = dri_make_current,
+    .UnbindContext = dri_unbind_context,
+};
+
+/* This is the table of extensions that the loader will dlsym() for. */
+PUBLIC const __DRIextension *__driDriverExtensions[] = {
+    &driCoreExtension.base,
+    &driSWRastExtension.base,
+    NULL
+};