Mesa (711): Only use gcc visibility support with gcc4+.

2011-11-02 Thread Thomas Fogal 
Module: Mesa
Branch: 711
Commit: be634b9031e3989f38f00796716fa565118410e4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=be634b9031e3989f38f00796716fa565118410e4

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Wed Oct 19 14:41:35 2011 -0600

Only use gcc visibility support with gcc4+.

I had a colleague hitting issues compiling with an old gcc3.2
system.  These patches got them through.

Reviewed-by: Brian Paul bri...@vmware.com
(cherry-picked from commit cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c)

---

 include/GL/gl.h  |2 +-
 src/mesa/main/compiler.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h
index bca550f..7fa1b15 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -67,7 +67,7 @@
 #elif defined(__CYGWIN__)  defined(USE_OPENGL32) /* use native windows 
opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__)|| (defined(__SUNPRO_C)  (__SUNPRO_C = 
0x590))
+#elif (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #  define GLAPI __attribute__((visibility(default)))
 #  define GLAPIENTRY
 #endif /* WIN32  !CYGWIN */
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 743841b..071f691 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -172,7 +172,7 @@ extern C {
  * inline a static function that we later use in an alias. - ajax
  */
 #ifndef PUBLIC
-#  if defined(__GNUC__) || (defined(__SUNPRO_C)  (__SUNPRO_C = 0x590))
+#  if (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #define PUBLIC __attribute__((visibility(default)))
 #define USED __attribute__((used))
 #  else

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.11): Only use gcc visibility support with gcc4+.

2011-11-02 Thread Thomas Fogal 
Module: Mesa
Branch: 7.11
Commit: 449b301eecb884b38a5388518919b684e03433ed
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=449b301eecb884b38a5388518919b684e03433ed

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Wed Oct 19 14:41:35 2011 -0600

Only use gcc visibility support with gcc4+.

I had a colleague hitting issues compiling with an old gcc3.2
system.  These patches got them through.

Reviewed-by: Brian Paul bri...@vmware.com
(cherry-picked from commit cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c)

---

 include/GL/gl.h  |2 +-
 src/mesa/main/compiler.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h
index bca550f..7fa1b15 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -67,7 +67,7 @@
 #elif defined(__CYGWIN__)  defined(USE_OPENGL32) /* use native windows 
opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__)|| (defined(__SUNPRO_C)  (__SUNPRO_C = 
0x590))
+#elif (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #  define GLAPI __attribute__((visibility(default)))
 #  define GLAPIENTRY
 #endif /* WIN32  !CYGWIN */
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 743841b..071f691 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -172,7 +172,7 @@ extern C {
  * inline a static function that we later use in an alias. - ajax
  */
 #ifndef PUBLIC
-#  if defined(__GNUC__) || (defined(__SUNPRO_C)  (__SUNPRO_C = 0x590))
+#  if (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #define PUBLIC __attribute__((visibility(default)))
 #define USED __attribute__((used))
 #  else

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Only use gcc visibility support with gcc4+.

2011-10-24 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Wed Oct 19 14:41:35 2011 -0600

Only use gcc visibility support with gcc4+.

I had a colleague hitting issues compiling with an old gcc3.2
system.  These patches got them through.

NOTE: This is a candidate for the 7.11 branch.

Reviewed-by: Brian Paul bri...@vmware.com

---

 include/GL/gl.h  |2 +-
 src/mesa/main/compiler.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 998a83a..e65e1bc 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -67,7 +67,7 @@
 #elif defined(__CYGWIN__)  defined(USE_OPENGL32) /* use native windows 
opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__)|| (defined(__SUNPRO_C)  (__SUNPRO_C = 
0x590))
+#elif (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #  define GLAPI __attribute__((visibility(default)))
 #  define GLAPIENTRY
 #endif /* WIN32  !CYGWIN */
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 89d6cda..921e302 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -150,7 +150,7 @@ extern C {
  * inline a static function that we later use in an alias. - ajax
  */
 #ifndef PUBLIC
-#  if defined(__GNUC__) || (defined(__SUNPRO_C)  (__SUNPRO_C = 0x590))
+#  if (defined(__GNUC__)  __GNUC__ = 4) || (defined(__SUNPRO_C)  
(__SUNPRO_C = 0x590))
 #define PUBLIC __attribute__((visibility(default)))
 #define USED __attribute__((used))
 #  else

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Add an autoconf option for mangling Mesa.

2011-10-17 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: c0573fb29df6defe58f4898f0b8a42e8b9214d36
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0573fb29df6defe58f4898f0b8a42e8b9214d36

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Mon Oct 10 10:33:18 2011 -0600

Add an autoconf option for mangling Mesa.

In addition to setting up the flags correctly, this renames the
generated libraries to ensure they get 'Mangled' in the name.
This is very useful for distros and the like, where mangled Mesa
and non-mangled GL libraries typically need to be installed
side-by-side.

Reviewed-by: Dan Nicholson dbn.li...@gmail.com

---

 configs/autoconf.in |4 ++--
 configure.ac|   27 ---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 9bbafc9..96fe5da 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -64,8 +64,8 @@ FLEX = @FLEX@
 BISON = @BISON@
 
 # Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
+GL_LIB = @GL_LIB@
+GLU_LIB = @GLU_LIB@
 GLW_LIB = GLw
 OSMESA_LIB = @OSMESA_LIB@
 GLESv1_CM_LIB = GLESv1_CM
diff --git a/configure.ac b/configure.ac
index ae7b36b..3f951ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,28 @@ else
 fi
 
 dnl
+dnl Mangled Mesa support
+dnl
+AC_ARG_ENABLE([mangling],
+  [AS_HELP_STRING([--enable-mangling],
+[enable mangled symbols and library name @:@default=disabled@:@])],
+  [enable_mangling=${enableval}],
+  [enable_mangling=no]
+)
+GL_LIB=GL
+GLU_LIB=GLU
+OSMESA_LIB=OSMesa
+if test x${enable_mangling} = xyes ; then
+  DEFINES=${DEFINES} -DUSE_MGL_NAMESPACE
+  GL_LIB=MangledGL
+  GLU_LIB=MangledGLU
+  OSMESA_LIB=MangledOSMesa
+fi
+AC_SUBST([GL_LIB])
+AC_SUBST([GLU_LIB])
+AC_SUBST([OSMESA_LIB])
+
+dnl
 dnl potentially-infringing-but-nobody-knows-for-sure stuff
 dnl
 AC_ARG_ENABLE([texture-float],
@@ -1288,17 +1310,16 @@ if test x$osmesa_bits != x8; then
 fi
 case x$osmesa_bits in
 x8)
-OSMESA_LIB=OSMesa
+OSMESA_LIB=${OSMESA_LIB}
 ;;
 x16|x32)
-OSMESA_LIB=OSMesa$osmesa_bits
+OSMESA_LIB=${OSMESA_LIB}$osmesa_bits
 DEFINES=$DEFINES -DCHAN_BITS=$osmesa_bits 
-DDEFAULT_SOFTWARE_DEPTH_BITS=31
 ;;
 *)
 AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])
 ;;
 esac
-AC_SUBST([OSMESA_LIB])
 
 if test x$enable_osmesa = xyes; then
 # only link libraries with osmesa if shared

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Demos (master): Add new test program to show gl_NormalMatrix issue.

2011-10-06 Thread Thomas Fogal 
Module: Demos
Branch: master
Commit: a5fbe07be5c37487964fe22f9bd36b8f8f768ec5
URL:
http://cgit.freedesktop.org/mesa/demos/commit/?id=a5fbe07be5c37487964fe22f9bd36b8f8f768ec5

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Oct  6 14:37:40 2011 -0600

Add new test program to show gl_NormalMatrix issue.

Current Mesa/i915 is given me a green ball here, whereas I feel it
should default to red.

---

 src/demos/CMakeLists.txt |1 +
 src/demos/normal.c   |  596 ++
 2 files changed, 597 insertions(+), 0 deletions(-)

diff --git a/src/demos/CMakeLists.txt b/src/demos/CMakeLists.txt
index f1bcc03..b35fae6 100644
--- a/src/demos/CMakeLists.txt
+++ b/src/demos/CMakeLists.txt
@@ -51,6 +51,7 @@ set (targets
lodbias
morph3d
multiarb
+   normal
paltex
pixeltest
pointblast
diff --git a/src/demos/normal.c b/src/demos/normal.c
new file mode 100644
index 000..0e04c8b
--- /dev/null
+++ b/src/demos/normal.c
@@ -0,0 +1,596 @@
+/**
+ * Test gl_NormalMatrix.
+ * Tom Fogal
+ * 5 Oct 2011
+ *
+ * Based on Test OpenGL 2.0 vertex/fragment shaders.
+ * Brian Paul
+ * 1 November 2006
+ *
+ * Based on ARB version by:
+ * Michal Krol
+ * 20 February 2006
+ *
+ * Based on the original demo by:
+ * Brian Paul
+ * 17 April 2003
+ */
+
+#include assert.h
+#include string.h
+#include stdio.h
+#include stdlib.h
+#include math.h
+#include GL/glew.h
+#include glut_wrap.h
+
+
+#define TEXTURE 0
+
+static GLint CoordAttrib = 0;
+
+static char *FragProgFile = NULL;
+static char *VertProgFile = NULL;
+
+static GLfloat diffuse[4] = { 0.5f, 0.5f, 1.0f, 1.0f };
+static GLfloat specular[4] = { 0.8f, 0.8f, 0.8f, 1.0f };
+static GLfloat lightPos[4] = { 0.0f, 10.0f, 20.0f, 0.0f };
+static GLfloat delta = 1.0f;
+
+static GLuint fragShader;
+static GLuint vertShader;
+static GLuint program;
+
+static GLuint SphereList, RectList, CurList;
+static GLint win = 0;
+static GLboolean anim = GL_TRUE;
+static GLboolean wire = GL_FALSE;
+static GLboolean pixelLight = GL_TRUE;
+
+static GLint t0 = 0;
+static GLint frames = 0;
+
+static GLfloat xRot = 90.0f, yRot = 0.0f;
+
+
+static void
+normalize(GLfloat *dst, const GLfloat *src)
+{
+   GLfloat len = sqrt(src[0] * src[0] + src[1] * src[1] + src[2] * src[2]);
+   dst[0] = src[0] / len;
+   dst[1] = src[1] / len;
+   dst[2] = src[2] / len;
+   dst[3] = src[3];
+}
+
+
+static void
+Redisplay(void)
+{
+   GLfloat vec[4];
+
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+   /* update light position */
+   normalize(vec, lightPos);
+   glLightfv(GL_LIGHT0, GL_POSITION, vec);
+   
+   if (pixelLight) {
+  glUseProgram(program);
+  glDisable(GL_LIGHTING);
+   }
+   else {
+  glUseProgram(0);
+  glEnable(GL_LIGHTING);
+   }
+
+   glPushMatrix();
+   glRotatef(xRot, 1.0f, 0.0f, 0.0f);
+   glRotatef(yRot, 0.0f, 1.0f, 0.0f);
+   /*
+   glutSolidSphere(2.0, 10, 5);
+   */
+   glCallList(CurList);
+   glPopMatrix();
+
+   glutSwapBuffers();
+   frames++;
+
+   if (anim) {
+  GLint t = glutGet(GLUT_ELAPSED_TIME);
+  if (t - t0 = 5000) {
+ GLfloat seconds =(GLfloat)(t - t0) / 1000.0f;
+ GLfloat fps = frames / seconds;
+ printf(%d frames in %6.3f seconds = %6.3f FPS\n,
+frames, seconds, fps);
+ fflush(stdout);
+ t0 = t;
+ frames = 0;
+  }
+   }
+}
+
+
+static void
+Idle(void)
+{
+   lightPos[0] += delta;
+   if (lightPos[0]  25.0f || lightPos[0]  -25.0f)
+  delta = -delta;
+   glutPostRedisplay();
+}
+
+
+static void
+Reshape(int width, int height)
+{
+   glViewport(0, 0, width, height);
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 25.0);
+   glMatrixMode(GL_MODELVIEW);
+   glLoadIdentity();
+   glTranslatef(0.0f, 0.0f, -15.0f);
+}
+
+
+static void
+CleanUp(void)
+{
+   glDeleteShader(fragShader);
+   glDeleteShader(vertShader);
+   glDeleteProgram(program);
+   glutDestroyWindow(win);
+}
+
+
+static void
+Key(unsigned char key, int x, int y)
+{
+  (void) x;
+  (void) y;
+
+   switch(key) {
+   case ' ':
+   case 'a':
+  anim = !anim;
+  if (anim)
+ glutIdleFunc(Idle);
+  else
+ glutIdleFunc(NULL);
+  break;
+   case 'x':
+  lightPos[0] -= 1.0f;
+  break;
+   case 'X':
+  lightPos[0] += 1.0f;
+  break;
+   case 'w':
+  wire = !wire;
+  if (wire)
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+  else
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+  break;
+   case 'o':
+  if (CurList == SphereList)
+ CurList = RectList;
+  else
+ CurList = SphereList;
+  break;
+   case 'p':
+  pixelLight = !pixelLight;
+  if (pixelLight)
+ printf(Per-pixel lighting\n);
+  else
+ printf(Conventional lighting\n);
+  break;
+   case 27:
+  CleanUp();
+  exit(0);
+  break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void
+SpecialKey(int

Mesa (master): Fix GLX_USE_TLS define.

2011-02-23 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 4484297505431cfa9d0360f888ea4fb4194c698a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4484297505431cfa9d0360f888ea4fb4194c698a

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Mon Feb 21 22:32:18 2011 -0700

Fix GLX_USE_TLS define.

It was only getting set in the case of DRI drivers.

---

 configure.ac |8 +++-
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e1702ba..fbc7436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -890,6 +890,9 @@ AC_ARG_ENABLE([glx-tls],
 [GLX_USE_TLS=no])
 AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
 
+AS_IF([test x$GLX_USE_TLS = xyes],
+  [DEFINES=${DEFINES} -DGLX_USE_TLS -DPTHREADS])
+
 dnl
 dnl More DRI setup
 dnl
@@ -945,11 +948,6 @@ esac
 
 dnl Set DRI_DIRS, DEFINES and LIB_DEPS
 if test $mesa_driver = dri -o $mesa_driver = no; then
-# Use TLS in GLX?
-if test x$GLX_USE_TLS = xyes; then
-DEFINES=$DEFINES -DGLX_USE_TLS -DPTHREADS
-fi
-
 # Platform specific settings and drivers to build
 case $host_os in
 linux*)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Export TLS support in gl.pc.

2011-01-10 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 31351dc029ff0e12a250e3ffc509f4f01e025a24
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=31351dc029ff0e12a250e3ffc509f4f01e025a24

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Dec  5 17:58:32 2010 -0700

Export TLS support in gl.pc.

---

 configs/autoconf.in |1 +
 configure.ac|8 +++-
 src/mesa/Makefile   |1 +
 src/mesa/gl.pc.in   |1 +
 4 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3dceb1a..ff5ea6f 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -32,6 +32,7 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@
 LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@
 GLUT_CFLAGS = @GLUT_CFLAGS@
+GLX_TLS = @GLX_TLS@
 
 TALLOC_LIBS = @TALLOC_LIBS@
 TALLOC_CFLAGS = @TALLOC_CFLAGS@
diff --git a/configure.ac b/configure.ac
index c00ecd0..9cbced5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -808,13 +808,19 @@ if test $mesa_driver = xlib; then
 fi
 
 dnl
-dnl More DRI setup
+dnl TLS detection
 dnl
+
 AC_ARG_ENABLE([glx-tls],
 [AS_HELP_STRING([--enable-glx-tls],
 [enable TLS support in GLX @:@default=disabled@:@])],
 [GLX_USE_TLS=$enableval],
 [GLX_USE_TLS=no])
+AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+dnl
+dnl More DRI setup
+dnl
 dnl Directory for DRI drivers
 AC_ARG_WITH([dri-driverdir],
 [AS_HELP_STRING([--with-dri-driverdir=DIR],
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 0d1da01..25e7cce 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -129,6 +129,7 @@ gl_pcedit = sed \
-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+   -e 's,@GLX_TLS@,$(GLX_TLS),' \
-e 's,@GL_LIB@,$(GL_LIB),'
 
 gl.pc: gl.pc.in
diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
index 97b8659..2d3bc91 100644
--- a/src/mesa/gl.pc.in
+++ b/src/mesa/gl.pc.in
@@ -10,3 +10,4 @@ Version: @VERSION@
 Libs: -L${libdir} -...@gl_lib@
 Libs.private: @GL_PC_LIB_PRIV@
 Cflags: -I${includedir} @GL_PC_CFLAGS@
+glx_tls: @GLX_TLS@

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Add GLX_TLS setting to configs/default.

2011-01-10 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 0e3ff159f950f7481af53506a8331476bc54c00f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e3ff159f950f7481af53506a8331476bc54c00f

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Mon Jan 10 15:37:26 2011 -0700

Add GLX_TLS setting to configs/default.

Should have gone in with 31351dc029ff0e12a250e3ffc509f4f01e025a24,
thanks to Dan Nicholson for noticing.

---

 configs/default |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configs/default b/configs/default
index 394dc17..b969415 100644
--- a/configs/default
+++ b/configs/default
@@ -25,6 +25,7 @@ CXXFLAGS = -O
 LDFLAGS =
 HOST_CFLAGS = $(CFLAGS)
 GLU_CFLAGS = 
+GLX_TLS = no
 
 # Compiler for building demos/tests/etc
 APP_CC = $(CC)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Regenerate gl_mangle.h.

2010-12-20 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: cd9ed3da684d8cce845730f23b0ce74890e09262
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd9ed3da684d8cce845730f23b0ce74890e09262

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Mon Dec 20 19:24:29 2010 -0700

Regenerate gl_mangle.h.

NOTE: This is a candidate for the 7.10 branch.

---

 include/GL/gl_mangle.h |  332 +++-
 1 files changed, 329 insertions(+), 3 deletions(-)

Diff:   
http://cgit.freedesktop.org/mesa/mesa/diff/?id=cd9ed3da684d8cce845730f23b0ce74890e09262
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.9): Implement x86_64 atomics for compilers w/o intrinsics.

2010-10-01 Thread Thomas Fogal 
Module: Mesa
Branch: 7.9
Commit: ba889a2b3e44aba5c16a4b3f49ed6a6f0f7148de
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba889a2b3e44aba5c16a4b3f49ed6a6f0f7148de

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Sep 26 18:57:59 2010 -0600

Implement x86_64 atomics for compilers w/o intrinsics.

Really old gcc's (3.3, at least) don't have support for the
intrinsics we need.  This implements a fallback for that case.

---

 src/gallium/auxiliary/util/u_atomic.h |   47 +
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index a156823..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -29,6 +29,8 @@
 #define PIPE_ATOMIC_ASM_MSVC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
+#elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
+#define PIPE_ATOMIC_ASM_GCC_X86_64
 #elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
 #define PIPE_ATOMIC_GCC_INTRINSIC
 #else
@@ -36,6 +38,51 @@
 #endif
 
 
+#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)
+#define PIPE_ATOMIC GCC x86_64 assembly
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm__ __volatile__(lock; decl %0; sete %1:+m(*v), =qm(c)
+   ::memory);
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm__ __volatile__(lock; incl %0:+m(*v));
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm__ __volatile__(lock; decl %0:+m(*v));
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */
+
 
 #if defined(PIPE_ATOMIC_ASM_GCC_X86)
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.8): Implement x86_64 atomics for compilers w/o intrinsics.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: 7.8
Commit: cc32ff741c5d32a66531a586b1f9268b94846c58
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc32ff741c5d32a66531a586b1f9268b94846c58

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Sep 26 18:57:59 2010 -0600

Implement x86_64 atomics for compilers w/o intrinsics.

Really old gcc's (3.3, at least) don't have support for the
intrinsics we need.  This implements a fallback for that case.

---

 src/gallium/auxiliary/util/u_atomic.h |   47 +
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index a156823..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -29,6 +29,8 @@
 #define PIPE_ATOMIC_ASM_MSVC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
+#elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
+#define PIPE_ATOMIC_ASM_GCC_X86_64
 #elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
 #define PIPE_ATOMIC_GCC_INTRINSIC
 #else
@@ -36,6 +38,51 @@
 #endif
 
 
+#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)
+#define PIPE_ATOMIC GCC x86_64 assembly
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm__ __volatile__(lock; decl %0; sete %1:+m(*v), =qm(c)
+   ::memory);
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm__ __volatile__(lock; incl %0:+m(*v));
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm__ __volatile__(lock; decl %0:+m(*v));
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */
+
 
 #if defined(PIPE_ATOMIC_ASM_GCC_X86)
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.8): Prefer intrinsics to handrolled atomic ops.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: 7.8
Commit: 337dace22dc2b0eab2372375f1574d94b894ef84
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=337dace22dc2b0eab2372375f1574d94b894ef84

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Sep 26 22:32:15 2010 -0600

Prefer intrinsics to handrolled atomic ops.

---

 src/gallium/auxiliary/util/u_atomic.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index 8434491..4ae6def 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -27,12 +27,12 @@
 #define PIPE_ATOMIC_MSVC_INTRINSIC
 #elif (defined(PIPE_CC_MSVC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_MSVC_X86
+#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
 #define PIPE_ATOMIC_ASM_GCC_X86_64
-#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
 #else
 #error Unsupported platform
 #endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Implement x86_64 atomics for compilers w/o intrinsics.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 76a60faf529e6107e3f50406c0d40e64bc484686
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=76a60faf529e6107e3f50406c0d40e64bc484686

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Sep 26 18:57:59 2010 -0600

Implement x86_64 atomics for compilers w/o intrinsics.

Really old gcc's (3.3, at least) don't have support for the
intrinsics we need.  This implements a fallback for that case.

---

 src/gallium/auxiliary/util/u_atomic.h |   47 +
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index a156823..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -29,6 +29,8 @@
 #define PIPE_ATOMIC_ASM_MSVC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
+#elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
+#define PIPE_ATOMIC_ASM_GCC_X86_64
 #elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
 #define PIPE_ATOMIC_GCC_INTRINSIC
 #else
@@ -36,6 +38,51 @@
 #endif
 
 
+#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)
+#define PIPE_ATOMIC GCC x86_64 assembly
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm__ __volatile__(lock; decl %0; sete %1:+m(*v), =qm(c)
+   ::memory);
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm__ __volatile__(lock; incl %0:+m(*v));
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm__ __volatile__(lock; decl %0:+m(*v));
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */
+
 
 #if defined(PIPE_ATOMIC_ASM_GCC_X86)
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Prefer intrinsics to handrolled atomic ops.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Sun Sep 26 22:32:15 2010 -0600

Prefer intrinsics to handrolled atomic ops.

---

 src/gallium/auxiliary/util/u_atomic.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index 8434491..4ae6def 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -27,12 +27,12 @@
 #define PIPE_ATOMIC_MSVC_INTRINSIC
 #elif (defined(PIPE_CC_MSVC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_MSVC_X86
+#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
 #define PIPE_ATOMIC_ASM_GCC_X86_64
-#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
 #else
 #error Unsupported platform
 #endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): Revert Prefer intrinsics to handrolled atomic ops.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: master
Commit: 3661f757ee7e75348f0df834ecf1febb211ddf66
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3661f757ee7e75348f0df834ecf1febb211ddf66

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Sep 30 14:39:14 2010 -0600

Revert Prefer intrinsics to handrolled atomic ops.

This reverts commit 5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e, quickly
fixing 30514.

---

 src/gallium/auxiliary/util/u_atomic.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index 4ae6def..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -27,12 +27,12 @@
 #define PIPE_ATOMIC_MSVC_INTRINSIC
 #elif (defined(PIPE_CC_MSVC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_MSVC_X86
-#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
 #define PIPE_ATOMIC_ASM_GCC_X86_64
+#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
 #else
 #error Unsupported platform
 #endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.8): Revert Prefer intrinsics to handrolled atomic ops.

2010-09-30 Thread Thomas Fogal 
Module: Mesa
Branch: 7.8
Commit: 3af43c0b4c29f7cb82df72d0b65bcd190053f57c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3af43c0b4c29f7cb82df72d0b65bcd190053f57c

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Sep 30 14:39:14 2010 -0600

Revert Prefer intrinsics to handrolled atomic ops.

This reverts commit 5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e, quickly
fixing 30514.

---

 src/gallium/auxiliary/util/u_atomic.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h 
b/src/gallium/auxiliary/util/u_atomic.h
index 4ae6def..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -27,12 +27,12 @@
 #define PIPE_ATOMIC_MSVC_INTRINSIC
 #elif (defined(PIPE_CC_MSVC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_MSVC_X86
-#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
 #elif (defined(PIPE_CC_GCC)  defined(PIPE_ARCH_X86_64))
 #define PIPE_ATOMIC_ASM_GCC_X86_64
+#elif defined(PIPE_CC_GCC)  (PIPE_CC_GCC_VERSION = 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
 #else
 #error Unsupported platform
 #endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.8): Regenerate mangling header.

2010-08-19 Thread Thomas Fogal 
Module: Mesa
Branch: 7.8
Commit: 4adff471fe89b0f3dcfe7ce7e843718610913d5e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4adff471fe89b0f3dcfe7ce7e843718610913d5e

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Aug 19 16:47:31 2010 -0600

Regenerate mangling header.

---

 include/GL/gl_mangle.h |  126 ++-
 1 files changed, 123 insertions(+), 3 deletions(-)

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 43d2e89..15589d8 100644
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -56,6 +56,7 @@
 #define glBeginOcclusionQueryNVMANGLE(BeginOcclusionQueryNV)
 #define glBeginPerfMonitorAMD  MANGLE(BeginPerfMonitorAMD)
 #define glBeginQueryARBMANGLE(BeginQueryARB)
+#define glBeginQueryIndexedMANGLE(BeginQueryIndexed)
 #define glBeginQuery   MANGLE(BeginQuery)
 #define glBeginTransformFeedbackEXT
MANGLE(BeginTransformFeedbackEXT)
 #define glBeginTransformFeedback   MANGLE(BeginTransformFeedback)
@@ -75,6 +76,7 @@
 #define glBindBufferRange  MANGLE(BindBufferRange)
 #define glBindBufferRangeNVMANGLE(BindBufferRangeNV)
 #define glBindFragDataLocationEXT  MANGLE(BindFragDataLocationEXT)
+#define glBindFragDataLocationIndexed  
MANGLE(BindFragDataLocationIndexed)
 #define glBindFragDataLocation MANGLE(BindFragDataLocation)
 #define glBindFragmentShaderATIMANGLE(BindFragmentShaderATI)
 #define glBindFramebufferEXT   MANGLE(BindFramebufferEXT)
@@ -87,10 +89,12 @@
 #define glBindProgramNVMANGLE(BindProgramNV)
 #define glBindRenderbufferEXT  MANGLE(BindRenderbufferEXT)
 #define glBindRenderbuffer MANGLE(BindRenderbuffer)
+#define glBindSampler  MANGLE(BindSampler)
 #define glBindTexGenParameterEXT   MANGLE(BindTexGenParameterEXT)
 #define glBindTextureEXT   MANGLE(BindTextureEXT)
 #define glBindTexture  MANGLE(BindTexture)
 #define glBindTextureUnitParameterEXT  
MANGLE(BindTextureUnitParameterEXT)
+#define glBindTransformFeedbackMANGLE(BindTransformFeedback)
 #define glBindTransformFeedbackNV  MANGLE(BindTransformFeedbackNV)
 #define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE)
 #define glBindVertexArray  MANGLE(BindVertexArray)
@@ -215,6 +219,10 @@
 #define glColorMaskIndexedEXT  MANGLE(ColorMaskIndexedEXT)
 #define glColorMaskMANGLE(ColorMask)
 #define glColorMaterialMANGLE(ColorMaterial)
+#define glColorP3uiMANGLE(ColorP3ui)
+#define glColorP3uiv   MANGLE(ColorP3uiv)
+#define glColorP4uiMANGLE(ColorP4ui)
+#define glColorP4uiv   MANGLE(ColorP4uiv)
 #define glColorPointerEXT  MANGLE(ColorPointerEXT)
 #define glColorPointerListIBM  MANGLE(ColorPointerListIBM)
 #define glColorPointer MANGLE(ColorPointer)
@@ -236,6 +244,7 @@
 #define glCombinerParameterivNVMANGLE(CombinerParameterivNV)
 #define glCombinerStageParameterfvNV   
MANGLE(CombinerStageParameterfvNV)
 #define glCompileShaderARB MANGLE(CompileShaderARB)
+#define glCompileShaderIncludeARB  MANGLE(CompileShaderIncludeARB)
 #define glCompileShaderMANGLE(CompileShader)
 #define glCompressedMultiTexImage1DEXT 
MANGLE(CompressedMultiTexImage1DEXT)
 #define glCompressedMultiTexImage2DEXT 
MANGLE(CompressedMultiTexImage2DEXT)
@@ -326,6 +335,7 @@
 #define glDeleteFramebuffersEXTMANGLE(DeleteFramebuffersEXT)
 #define glDeleteFramebuffers   MANGLE(DeleteFramebuffers)
 #define glDeleteLists  MANGLE(DeleteLists)
+#define glDeleteNamedStringARB MANGLE(DeleteNamedStringARB)
 #define glDeleteObjectARB  MANGLE(DeleteObjectARB)
 #define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV)
 #define glDeletePerfMonitorsAMDMANGLE(DeletePerfMonitorsAMD)
@@ -336,10 +346,12 @@
 #define glDeleteQueriesMANGLE(DeleteQueries)
 #define glDeleteRenderbuffersEXT   MANGLE(DeleteRenderbuffersEXT)
 #define glDeleteRenderbuffers  MANGLE(DeleteRenderbuffers)
+#define glDeleteSamplers   MANGLE(DeleteSamplers)
 #define glDeleteShader MANGLE(DeleteShader)
 #define glDeleteSync   MANGLE(DeleteSync)
 #define glDeleteTexturesEXTMANGLE(DeleteTexturesEXT)
 #define glDeleteTextures   MANGLE(DeleteTextures)
+#define glDeleteTransformFeedbacks MANGLE(DeleteTransformFeedbacks)
 #define glDeleteTransformFeedbacksNV   
MANGLE(DeleteTransformFeedbacksNV)
 #define glDeleteVertexArraysAPPLE  MANGLE(DeleteVertexArraysAPPLE)
 #define glDeleteVertexArrays   MANGLE(DeleteVertexArrays)
@@ -363,6 +375,7 @@
 #define glDisableVertexAttribArrayARB

Mesa (7.8): 36 new commits

2010-08-06 Thread Thomas Fogal 
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=800473566cdcee8d062d65ef9af6833ff1ac8d42
Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Fri Aug 6 12:28:47 2010 -0600

Add release notes for 7.8.3.

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9af135c7cd4424a3bbce406aa36fa5b160fe5552
Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Aug 5 14:45:11 2010 -0600

Revert radeon: allow driconf vblank settings with dri2

As requested by Alex Deucher; dri2ConfigQueryExtension is not
available in 7.8.

This reverts commit 66ad60399ae005084ad8c07569a1c9a461c39ec9.

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d06b34f5633bf448315f48ec628b51b24533958c
Author: Marek Olšák mar...@gmail.com
Date:   Sat Jul 17 15:55:24 2010 +0200

st/mesa: fix FRAMEBUFFER_UNSUPPORTED with the D24S8 format

Fixes FDO bug #29116.

(cherry picked from commit 4fd39a8d69cade6db5c4a0295a5f5f3014110b1c)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8363b25bb4383a30a1b79bbde97048d15293749
Author: Brian Paul bri...@vmware.com
Date:   Sun May 9 22:08:54 2010 -0600

swrast: fix 16-bit/channel rendering

NOTE: This is a candidate for the 7.8 stable branch
(cherry picked from commit e3d8d25ebf4e052432f13513d03a420bc22d399d)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b69946870ec961d81d4deed50456a6e9d7d12b20
Author: José Fonseca jfons...@vmware.com
Date:   Tue May 11 21:27:05 2010 +0100

mesa/st+tgsi: Provide a free callback to match with ureg_get_tokens().

This fixes crashes with the memory debugging routines on Windows.

NOTE: This is a candidate for the 7.8 stable branch
(cherry picked from commit edbc302ad678e1a4a8803ba0e827a13dd27105d2)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3daa728fe7cd39e508f839af1876e513eb55b34e
Author: Brian Paul bri...@vmware.com
Date:   Fri Jul 2 10:16:05 2010 -0600

mesa: fix texenv generation when num color bufs == 0

Before, if there were no color buffers enabled (with glDrawBuffers(GL_NONE))
when the texenv program was generated, we'd emit writes to OUTPUT[1] but
the OutputsWritten mask was 0.  This inconsistency caused an assertion to
fail later in the Mesa-TGSI translation.

Fixes fd.o bug 28169

NOTE: this is a candidate for the 7.8 branch (and depends on commit
b6b9b17d27c570cc99ae339e595cf2f63ca5e8d7).
(cherry picked from commit 6e83420ee0ccb2228fab0f86a6e8bf8a6aefe57a)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=596e1d3e440fe33059987603029d9fb6fa483577
Author: Brian Paul bri...@vmware.com
Date:   Fri Jul 2 08:14:54 2010 -0600

mesa: make the number of draw buffers part of the texenv program key state

All the state that effects the program should be in the key.
This didn't help with bug 28169 but is a good fix anyway.

NOTE: this is a low-priority candidate for the 7.8 branch.  In practice,
this issue might never be hit.
(cherry picked from commit b6b9b17d27c570cc99ae339e595cf2f63ca5e8d7)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b6a68df92e0f47f680dcf958cbc7f12c6550c35
Author: Maciej Cencora m.cenc...@gmail.com
Date:   Sat Mar 13 16:46:19 2010 +0100

radeon: fix glCopyTex(Sub)Image

Fallback to swrast for software renderbuffers
(cherry picked from commit 1a8a230a61289392e8300901dfabd7911799cbc3)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a915f34e13408f6a1da8eed3687b87be64535de
Author: Maciej Cencora m.cenc...@gmail.com
Date:   Wed Mar 10 20:53:21 2010 +0100

radeon: fix glCopyTex(Sub)Image if user FBO is bound

Fixes piglit/fbo-blit and wine d3d9 unit test.
(cherry picked from commit a68e8a4eaadfe2a1e4999d5e378c7d9fa99dc656)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=be86a63d9ab38fabe1fdff4af2e925a89dd9d6ab
Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Tue Aug 3 13:04:02 2010 -0600

glsl: fix indirect addressing of gl_TextureMatrix[] arrays

The code to emit an array of OpenGL state vars lacked the code
to handle the gl_TextureMatrix[] array.

Fixes fd.o bug 28967

(manual cherry pick of 41f66915ab3d052e0e2ef06000d6534eb7776ec6)

Acked-by: Brian Paul bri...@vmware.com

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb37c3a1c698229e7ae14a5b46e832f9b883f2d7
Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Tue Aug 3 12:59:06 2010 -0600

glsl: fix 'if ((x=foo())  1.0)' bug

Fixes fd.o bug 27216.  May also be the root cause of fd.o bug 28950.

We weren't propogating the storage info for the x=foo() expression up
through the IR tree to the inequality expression.

(manual cherry-pick 3751e6e1fc385739022d0942b46e175632ad0d4b)

Acked-by: Brian Paul bri...@vmware.com

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=218b9be37a714f09371914546fd61dae414f889a
Author: Brian Paul

Mesa (7.8): Regenerate gl_mangle.h

2010-03-25 Thread Thomas Fogal 
Module: Mesa
Branch: 7.8
Commit: 38cb44516e9c1e9154fa8297ea53efc803378c12
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=38cb44516e9c1e9154fa8297ea53efc803378c12

Author: Tom Fogal tfo...@alumni.unh.edu
Date:   Thu Mar 25 16:48:59 2010 -0600

Regenerate gl_mangle.h

---

 include/GL/gl_mangle.h |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index b292840..43d2e89 100644
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -393,6 +393,8 @@
 #define glEdgeFlagPointerListIBM   MANGLE(EdgeFlagPointerListIBM)
 #define glEdgeFlagPointer  MANGLE(EdgeFlagPointer)
 #define glEdgeFlagvMANGLE(EdgeFlagv)
+#define glEGLImageTargetRenderbufferStorageOES 
MANGLE(EGLImageTargetRenderbufferStorageOES)
+#define glEGLImageTargetTexture2DOES   
MANGLE(EGLImageTargetTexture2DOES)
 #define glElementPointerAPPLE  MANGLE(ElementPointerAPPLE)
 #define glElementPointerATIMANGLE(ElementPointerATI)
 #define glEnableClientStateIndexedEXT  
MANGLE(EnableClientStateIndexedEXT)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit