From c9b33ecd7c07cace0a6553ccfdaf7b021959c934 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsap7@yahoo.gr>
Date: Wed, 6 Dec 2006 06:43:23 +0200
Subject: Drop old (pre-AIGLX) GLcore interface.

The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX,
it is only used by DDX's which are known not to work with the new DIX glx code.

---

Bug 9285: misc glcore, xmesa cleanups

ACKed by Ian Romanick.
---
 src/mesa/main/imports.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main/imports.c')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index ed809acbe2..996839a20e 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1176,16 +1176,6 @@ default_fprintf(__GLcontext *gc, void *stream, const char *fmt, ...)
    return r;
 }
 
-/**
- * \todo this really is driver-specific and can't be here 
- */
-static __GLdrawablePrivate *
-default_GetDrawablePrivate(__GLcontext *gc)
-{
-   (void) gc;
-   return NULL;
-}
-
 /*@}*/
 
 
@@ -1222,6 +1212,7 @@ _mesa_init_default_imports(__GLimports *imports, void *driverCtx)
    imports->fopen = default_fopen;
    imports->fclose = default_fclose;
    imports->fprintf = default_fprintf;
-   imports->getDrawablePrivate = default_GetDrawablePrivate;
+   imports->getDrawablePrivate = NULL; /* driver-specific */
+   imports->getReadablePrivate = NULL; /* driver-specific */
    imports->other = driverCtx;
 }
-- 
cgit v1.2.3


From 869b8ad499717eda4a1be04de4e516134123402c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sat, 20 Jan 2007 18:06:38 -0800
Subject: Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use
 it.

---
 src/mesa/drivers/dri/i965/brw_draw_upload.c |  2 +-
 src/mesa/main/imports.c                     | 21 +++++++++++++++++++++
 src/mesa/main/imports.h                     |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main/imports.c')

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 57ee294f0c..08741ad90f 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -414,7 +414,7 @@ GLboolean brw_upload_vertices( struct brw_context *brw,
     */
    
    while (tmp) {
-      GLuint i = ffsll(tmp)-1;
+      GLuint i = _mesa_ffsll(tmp)-1;
       struct brw_vertex_element *input = &brw->vb.inputs[i];
 
       tmp &= ~((GLuint64EXT)1<<i);
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 996839a20e..ad77373075 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -574,6 +574,27 @@ _mesa_ffs(int i)
 #endif
 }
 
+int
+_mesa_ffsll(long long val)
+{
+#ifdef ffsll
+	return ffsll(val);
+#else
+	int bit;
+
+	assert(sizeof(val) == 8);
+
+	bit = ffs(val);
+	if (bit != 0)
+		return bit;
+
+	bit = ffs(val >> 32);
+	if (bit != 0)
+		return 32 + bit;
+
+	return 0;
+#endif
+}
 
 /**
  * Return number of bits set in given GLuint.
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 19a9478f76..d9885dbeec 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -688,6 +688,9 @@ _mesa_pow(double x, double y);
 extern int
 _mesa_ffs(int i);
 
+extern int
+_mesa_ffsll(long long i);
+
 extern unsigned int
 _mesa_bitcount(unsigned int n);
 
-- 
cgit v1.2.3