xserver/GL/glx Makefile.am, 1.2, 1.3 glxcmds.c, 1.15, 1.16 glxext.c,
1.8, 1.9 glxext.h, 1.6, 1.7 glxserver.h, 1.8, 1.9 impsize.h,
1.5, 1.6
Dave Airlie
xserver-commit at pdx.freedesktop.org
Thu Dec 22 18:07:59 PST 2005
Committed by: airlied
Update of /cvs/xserver/xserver/GL/glx
In directory gabe:/tmp/cvs-serv19869/GL/glx
Modified Files:
Makefile.am glxcmds.c glxext.c glxext.h glxserver.h impsize.h
Log Message:
Well there were a couple of snapshots later than CVS available outside of
Novell, so I've done a crazy merge to try and get them into a workable
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if I did.
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am 13 Jun 2005 16:38:05 -0000 1.2
+++ Makefile.am 23 Dec 2005 02:07:57 -0000 1.3
@@ -1,3 +1,5 @@
+noinst_LTLIBRARIES = libglx.la
+
INCLUDES = \
-I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/glx \
@@ -10,9 +12,7 @@
-I at MESA_SOURCE@/include \
@XSERVER_CFLAGS@
-noinst_LIBRARIES = libglx.a
-
-libglx_a_SOURCES = \
+libglx_la_SOURCES = \
g_disptab.c \
g_disptab.h \
g_disptab_EXT.c \
@@ -58,7 +58,8 @@
singlesize.c \
singlesize.h \
xfont.c \
+ compsize.c \
unpack.h
-libglx_a_CFLAGS = -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING \
+libglx_la_CFLAGS = -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING \
-DGLX_USE_DLOPEN -DGLX_USE_MESA
Index: glxcmds.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxcmds.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- glxcmds.c 10 Jun 2005 16:02:39 -0000 1.15
+++ glxcmds.c 23 Dec 2005 02:07:57 -0000 1.16
@@ -53,6 +53,14 @@
__glProcTable *__glRenderTable = NULL;
__glProcTableEXT *__glRenderTableEXT = NULL;
+void
+GlxSetRenderTables (__glProcTable *table,
+ __glProcTableEXT *tableEXT)
+{
+ __glRenderTable = table;
+ __glRenderTableEXT = tableEXT;
+}
+
static __GLimports imports = {
__glXImpMalloc,
__glXImpCalloc,
Index: glxext.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxext.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- glxext.c 10 Jun 2005 16:02:39 -0000 1.8
+++ glxext.c 23 Dec 2005 02:07:57 -0000 1.9
@@ -47,7 +47,7 @@
{
int i;
- __glXFlushContextCache();
+ GlxFlushContextCache();
(*__glXExt->resetExtension)();
__glXScreenReset();
@@ -183,7 +183,7 @@
if (cx->modes) __glXFree(cx->modes);
__glXFree(cx);
if (cx == __glXLastContext) {
- __glXFlushContextCache();
+ GlxFlushContextCache();
}
return GL_TRUE;
@@ -330,7 +330,8 @@
/************************************************************************/
-void __glXFlushContextCache(void)
+void
+GlxFlushContextCache (void)
{
__glXLastContext = 0;
}
Index: glxext.h
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxext.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- glxext.h 10 Jun 2005 12:30:39 -0000 1.6
+++ glxext.h 23 Dec 2005 02:07:57 -0000 1.7
@@ -37,6 +37,8 @@
**
*/
+#include "micmap.h"
+
/*
* Added by VA Linux for XFree86 4.0.x
*/
@@ -61,7 +63,6 @@
} __GLXextensionInfo;
extern GLboolean __glXFreeContext(__GLXcontext *glxc);
-extern void __glXFlushContextCache(void);
extern void __glXNoSuchRenderOpcode(GLbyte*);
extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
@@ -88,6 +89,9 @@
extern Bool __glXCoreType(void);
+extern void
+GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **privates);
+
extern int GlxInitVisuals(
VisualPtr * visualp,
DepthPtr * depthp,
@@ -100,5 +104,11 @@
int preferredVis
);
+void
+GlxWrapInitVisuals (miInitVisualsProcPtr *initVisProc);
+
+extern void
+GlxFlushContextCache (void);
+
#endif /* _glxext_h_ */
Index: glxserver.h
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxserver.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- glxserver.h 10 Jun 2005 12:30:39 -0000 1.8
+++ glxserver.h 23 Dec 2005 02:07:57 -0000 1.9
@@ -729,9 +729,42 @@
void (*PointParameteriNV) (GLenum pname, GLint params);
void (*PointParameterivNV) (GLenum pname, const GLint *params);
void (*ActiveStencilFaceEXT) (GLenum face);
+ GLboolean (*IsRenderbufferEXT) (GLuint renderbuffer);
+ void (*BindRenderbufferEXT) (GLenum target, GLuint renderbuffer);
+ void (*DeleteRenderbuffersEXT) (GLsizei n, const GLuint *renderbuffers);
+ void (*GenRenderbuffersEXT) (GLsizei n, GLuint *renderbuffers);
+ void (*RenderbufferStorageEXT) (GLenum target, GLenum internalformat,
+ GLsizei width, GLsizei height);
+ void (*GetRenderbufferParameterivEXT) (GLenum target, GLenum pname,
+ GLint *params);
+ GLboolean (*IsFramebufferEXT) (GLuint framebuffer);
+ void (*BindFramebufferEXT) (GLenum target, GLuint framebuffer);
+ void (*DeleteFramebuffersEXT) (GLsizei n, const GLuint *framebuffers);
+ void (*GenFramebuffersEXT) (GLsizei n, GLuint *framebuffers);
+ GLenum (*CheckFramebufferStatusEXT) (GLenum target);
+ void (*FramebufferTexture1DEXT) (GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level);
+ void (*FramebufferTexture2DEXT) (GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level);
+ void (*FramebufferTexture3DEXT) (GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level, GLint zoffset);
+ void (*FramebufferRenderbufferEXT) (GLenum target, GLenum attachment,
+ GLenum renderbuffertarget,
+ GLuint renderbuffer);
+ void (*GetFramebufferAttachmentParameterivEXT) (GLenum target,
+ GLenum attachment,
+ GLenum pname,
+ GLint *params);
+ void (*GenerateMipmapEXT) (GLenum target);
} __glProcTableEXT;
extern __glProcTable *__glRenderTable;
extern __glProcTableEXT *__glRenderTableEXT;
+extern void GlxSetRenderTables (__glProcTable *table,
+ __glProcTableEXT *tableEXT);
+
#endif
Index: impsize.h
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/impsize.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- impsize.h 19 Jan 2004 05:34:52 -0000 1.5
+++ impsize.h 23 Dec 2005 02:07:57 -0000 1.6
@@ -70,4 +70,18 @@
extern int __glPointParameterfvARB_size(GLenum e);
extern int __glPointParameteriv_size(GLenum e);
+extern int __glElementsPerGroup(GLenum format, GLenum type);
+extern int __glBytesPerElement(GLenum type);
+extern int __glImageSize(GLsizei width, GLsizei height, GLsizei depth,
+ GLenum format, GLenum type);
+extern int __glBitmap_size(GLsizei w, GLsizei h);
+extern int __glTexImage1D_size(GLenum format, GLenum type, GLsizei w);
+extern int __glTexImage2D_size(GLenum format, GLenum type, GLsizei w,
+ GLsizei h);
+extern int __glTexImage3D_size(GLenum format, GLenum type,
+ GLsizei w, GLsizei h, GLsizei d);
+extern unsigned int __glFloorLog2(GLuint val);
+
+
+
#endif /* _impsize_h_ */
More information about the xserver-commit
mailing list