[Xquartz-changes] [388] AppleSGLX/trunk

[source_changes at macosforge.org]

Revision: 388
          http://trac.macosforge.org/projects/xquartz/changeset/388
Author:   jeremyhu at freedesktop.org
Date:     2009-12-21 13:06:42 -0800 (Mon, 21 Dec 2009)
Log Message:
-----------
Further changes from master

Modified Paths:
--------------
    AppleSGLX/trunk/BASED_ON
    AppleSGLX/trunk/glxhash.c
    AppleSGLX/trunk/xfont.c

Modified: AppleSGLX/trunk/BASED_ON
===================================================================
--- AppleSGLX/trunk/BASED_ON	2009-12-21 21:01:36 UTC (rev 387)
+++ AppleSGLX/trunk/BASED_ON	2009-12-21 21:06:42 UTC (rev 388)
@@ -1 +1,9 @@
-Mesa-7.2
+master as of 2009.12.21 (c020a83fae23f088990b1d5ae2fc4a1ed92f03d9)
+except for a few which still need to be rebased.
+
+Mesa-7.2 (c020a83fae23f088990b1d5ae2fc4a1ed92f03d9) + indent changes:
+  glxcmds.c
+  glxcurrent.c
+  glxext.c
+
+

Modified: AppleSGLX/trunk/glxhash.c
===================================================================
--- AppleSGLX/trunk/glxhash.c	2009-12-21 21:01:36 UTC (rev 387)
+++ AppleSGLX/trunk/glxhash.c	2009-12-21 21:06:42 UTC (rev 388)
@@ -77,6 +77,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define HASH_MAGIC 0xdeadbeef
 #define HASH_DEBUG 0
@@ -87,10 +88,21 @@
 
 #define HASH_ALLOC malloc
 #define HASH_FREE  free
-#define HASH_RANDOM_DECL
-#define HASH_RANDOM_INIT(seed)  srandom(seed)
-#define HASH_RANDOM             random()
+#ifndef __GLIBC__
+#define HASH_RANDOM_DECL	char *ps, rs[256]
+#define HASH_RANDOM_INIT(seed)	ps = initstate(seed, rs, sizeof(rs))
+#define HASH_RANDOM		random()
+#define HASH_RANDOM_DESTROY	setstate(ps)
+#else
+#define HASH_RANDOM_DECL	struct random_data rd; int32_t rv; char rs[256]
+#define HASH_RANDOM_INIT(seed)					\
+   do {								\
+      (void) memset(&rd, 0, sizeof(rd));			\
+      (void) initstate_r(seed, rs, sizeof(rs), &rd);		\
+   } while(0)
+#define HASH_RANDOM             ((void) random_r(&rd, &rv), rv)
 #define HASH_RANDOM_DESTROY
+#endif
 
 typedef struct __glxHashBucket
 {

Modified: AppleSGLX/trunk/xfont.c
===================================================================
--- AppleSGLX/trunk/xfont.c	2009-12-21 21:01:36 UTC (rev 387)
+++ AppleSGLX/trunk/xfont.c	2009-12-21 21:06:42 UTC (rev 388)
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/glx/xfont.c,v 1.6 2001/05/02 15:06:02 dawes Exp $ */
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
@@ -34,6 +33,8 @@
   called by that routine when direct rendering is enabled.
 */
 
+#if defined(GLX_DIRECT_RENDERING) || defined(__APPLE__)
+
 #include "glxclient.h"
 
 /* Some debugging info.  */
@@ -372,3 +373,5 @@
    glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
    glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
 }
+
+#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20091221/e64a946c/attachment.html>