xserver/hw/xgl/glx Makefile.am, 1.2, 1.3 xglx.c, 1.11, 1.12 xglx.h, 1.1, 1.2 xglxinit.c, 1.1, 1.2 xglxorg.c, NONE, 1.1

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl/glx
In directory gabe:/tmp/cvs-serv16345/glx

Modified Files:
	Makefile.am xglx.c xglx.h xglxinit.c 
Added Files:
	xglxorg.c 
Log Message:
commit all Xgl changes from Xgl code drop (EGL still to do)


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	23 Dec 2005 02:07:58 -0000	1.2
+++ Makefile.am	3 Jan 2006 09:56:22 -0000	1.3
@@ -16,7 +16,8 @@
 
 libxglx_la_SOURCES = \
 	xglx.h	     \
-	xglx.c
+	xglx.c       \
+	xglxorg.c
 
 if XGLXSERVER
 Xglx_DEPENDENCIES = @XGLX_LIBS@

Index: xglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/xglx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xglx.c	23 Dec 2005 02:07:58 -0000	1.11
+++ xglx.c	3 Jan 2006 09:56:22 -0000	1.12
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2004 David Reveman
- * 
+ *
  * 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
@@ -12,23 +12,24 @@
  * software for any purpose. It is provided "as is" without express or
  * implied warranty.
  *
[...1277 lines suppressed...]
+
     XFree (ximage);
     XFreeGC (xdisplay, xgc);
-    
+
     xformat = XRenderFindStandardFormat (xdisplay, PictStandardARGB32);
     xpicture = XRenderCreatePicture (xdisplay, xpixmap, xformat, 0, 0);
 
     cursor = XRenderCreateCursor (xdisplay, xpicture,
 				  pCursor->bits->xhot,
 				  pCursor->bits->yhot);
-    
+
     XRenderFreePicture (xdisplay, xpicture);
     XFreePixmap (xdisplay, xpixmap);
-    
+
     return cursor;
 }
 

Index: xglx.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/xglx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xglx.h	23 Dec 2005 02:07:58 -0000	1.1
+++ xglx.h	3 Jan 2006 09:56:22 -0000	1.2
@@ -28,6 +28,62 @@
 
 #include "xgl.h"
 
+#ifdef _XSERVER64
+#define _XSERVER64_tmp
+#undef _XSERVER64
+typedef unsigned long XID64;
+typedef unsigned long Mask64;
+typedef unsigned long Atom64;
+typedef unsigned long VisualID64;
+typedef unsigned long Time64;
+#define XID      XID64
+#define Mask     Mask64
+#define Atom     Atom64
+#define VisualID VisualID64
+#define Time     Time64
+typedef XID Window64;
+typedef XID Drawable64;
+typedef XID Font64;
+typedef XID Pixmap64;
+typedef XID Cursor64;
+typedef XID Colormap64;
+typedef XID GContext64;
+typedef XID KeySym64;
+#define Window   Window64
+#define Drawable Drawable64
+#define Font     Font64
+#define Pixmap   Pixmap64
+#define Cursor   Cursor64
+#define Colormap Colormap64
+#define GContext GContext64
+#define KeySym   KeySym64
+#endif
+
+#define GC XlibGC
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#undef GC
+
+#ifdef _XSERVER64_tmp
+#ifndef _XSERVER64
+#define _XSERVER64
+#endif
+#undef _XSERVER64_tmp
+#undef XID
+#undef Mask
+#undef Atom
+#undef VisualID
+#undef Time
+#undef Window
+#undef Drawable
+#undef Font
+#undef Pixmap
+#undef Cursor
+#undef Colormap
+#undef GContext
+#undef KeySym
+#endif
+
 void
 xglxInitOutput (ScreenInfo *pScreenInfo,
 		int	   argc,
@@ -61,4 +117,22 @@
 void
 xglxOsVendorInit (void);
 
+#ifndef NXGLXORG
+
+void
+xglxUseXorgMsg (void);
+
+int
+xglxProcessXorgArgument (int  argc,
+			 char **argv,
+			 int  i);
+
+void
+xglxAbortXorg (void);
+
+char *
+xglxInitXorg (void);
+
+#endif
+
 #endif /* _XGLX_H_ */

Index: xglxinit.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/xglxinit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xglxinit.c	23 Dec 2005 02:07:58 -0000	1.1
+++ xglxinit.c	3 Jan 2006 09:56:22 -0000	1.2
@@ -26,13 +26,18 @@
 #include "xglx.h"
 
 static xglScreenInfoRec xglxScreenInfo = {
-    NULL, 0, 0, 0, 0,
+    NULL, 0, 0, 0, 0, 0,
     DEFAULT_GEOMETRY_DATA_TYPE,
     DEFAULT_GEOMETRY_USAGE,
     FALSE,
     XGL_DEFAULT_PBO_MASK,
     FALSE,
-    FALSE
+    {
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } }
+    }
 };
 
 #ifdef GLXEXT

--- NEW FILE: xglxorg.c ---
(This appears to be a binary file; contents omitted.)