fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-19 00:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some GLX code cleanups

Browse source
This commit is contained in:
David Reveman 2006-02-02 01:44:59 +00:00
parent 9d831ae1c7
commit 47599d0138
4 changed files with 119 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2006-02-01 David Reveman <davidr@novell.com>
* hw/xgl/xglglx.h:
* hw/xgl/xglglx.c:
* hw/xgl/glxext/xglglxext.c: Some GLX code cleanups.
* hw/xgl/glxext/xglglxlog.c:
* hw/xgl/glxext/xglglxext.c: Match _glapi_table in mesa 6.4.1.
(xglScreenProbe): __xglScreenInfo -> __xglScreenInfoPtr.

26
hw/xgl/glxext/xglglxext.c
View file

@ -67,12 +67,10 @@ typedef struct _xglGLXScreenInfo {
GLXCreateBufferProc createBuffer;
} xglGLXScreenInfoRec, *xglGLXScreenInfoPtr;
extern __GLXscreenInfo *__xglScreenInfoPtr;
extern __GLXscreenInfo *__xglScreenInfo;
static xglGLXScreenInfoRec screenInfoPriv;
//extern __GLXscreenInfo __glDDXScreenInfo;
typedef GLboolean (*GLResizeBuffersProc) (__GLdrawableBuffer *buffer,
GLint x,
GLint y,
@ -5489,10 +5487,10 @@ xglScreenProbe (int screen)
status = (*screenInfoPriv.screenProbe) (screen);
modes = __xglScreenInfoPtr->modes;
modes = __xglScreenInfo->modes;
/* Create Xgl GLX visuals */
for (i = 0; i < __xglScreenInfoPtr->numVisuals; i++)
for (i = 0; i < __xglScreenInfo->numVisuals; i++)
{
pVisual = xglFindVisualWithId (pScreen, pScreen->visuals[i].vid);
if (pVisual)
@ -5584,17 +5582,17 @@ xglScreenProbe (int screen)
}
/* Wrap createBuffer */
if (__xglScreenInfoPtr->createBuffer != xglCreateBuffer)
if (__xglScreenInfo->createBuffer != xglCreateBuffer)
{
screenInfoPriv.createBuffer = __xglScreenInfoPtr->createBuffer;
__xglScreenInfoPtr->createBuffer = xglCreateBuffer;
screenInfoPriv.createBuffer = __xglScreenInfo->createBuffer;
__xglScreenInfo->createBuffer = xglCreateBuffer;
}
/* Wrap createContext */
if (__xglScreenInfoPtr->createContext != xglCreateContext)
if (__xglScreenInfo->createContext != xglCreateContext)
{
screenInfoPriv.createContext = __xglScreenInfoPtr->createContext;
__xglScreenInfoPtr->createContext = xglCreateContext;
screenInfoPriv.createContext = __xglScreenInfo->createContext;
__xglScreenInfo->createContext = xglCreateContext;
}
return status;
@ -5722,10 +5720,10 @@ xglInitVisualConfigs (ScreenPtr pScreen)
GlxSetVisualConfigs (numConfig, pConfig, (void **) ppConfigPriv);
/* Wrap screenProbe */
if (__xglScreenInfoPtr->screenProbe != xglScreenProbe)
if (__xglScreenInfo->screenProbe != xglScreenProbe)
{
screenInfoPriv.screenProbe = __xglScreenInfoPtr->screenProbe;
__xglScreenInfoPtr->screenProbe = xglScreenProbe;
screenInfoPriv.screenProbe = __xglScreenInfo->screenProbe;
__xglScreenInfo->screenProbe = xglScreenProbe;
}
visuals = pScreen->visuals;

145
hw/xgl/xglglx.c
View file

@ -43,7 +43,10 @@ static void *glCoreHandle = 0;
#define SYM(ptr, name) { (void **) &(ptr), (name) }
__GLXextensionInfo *__xglExtensionInfo;
__GLXscreenInfo *__xglScreenInfoPtr;
__GLXscreenInfo *__xglScreenInfo;
void *(*__glcore_DDXScreenInfo) (void);
void *(*__glcore_DDXExtensionInfo) (void);
void
GlxSetVisualConfigs (int nconfigs,
@ -96,52 +99,52 @@ GlxFlushContextCache (void)
void
GlxSetRenderTables (struct _glapi_table *table)
{
(*__xglGLXFunc.setRenderTables) (table);
(*__xglGLXFunc.setRenderTables) (table);
}
struct _glapi_table *_mglapi_Dispatch;
void *(*__glcore_DDXScreenInfo)(void);
void *__glXglDDXScreenInfo(void)
void *
__glXglDDXScreenInfo (void)
{
return __xglScreenInfoPtr;
return __xglScreenInfo;
}
void *(*__glcore_DDXExtensionInfo)(void);
void *__glXglDDXExtensionInfo(void)
void *
__glXglDDXExtensionInfo( void)
{
return __xglExtensionInfo;
}
void _gl_copy_visual_to_context_mode( __GLcontextModes * mode,
const __GLXvisualConfig * config )
{
(*__xglGLXFunc.copy_visual_to_context_mode)(mode, config);
return __xglExtensionInfo;
}
__GLcontextModes *_gl_context_modes_create( unsigned count, size_t minimum_size )
void
_gl_copy_visual_to_context_mode (__GLcontextModes *mode,
const __GLXvisualConfig *config)
{
return (*__xglGLXFunc.context_modes_create)(count, minimum_size);
(*__xglGLXFunc.copy_visual_to_context_mode) (mode, config);
}
void _gl_context_modes_destroy( __GLcontextModes * modes )
__GLcontextModes *
_gl_context_modes_create (unsigned count,
size_t minimumSize)
{
(*__xglGLXFunc.context_modes_destroy)(modes);
return (*__xglGLXFunc.context_modes_create) (count, minimumSize);
}
GLint _gl_convert_from_x_visual_type( int visualType )
void
_gl_context_modes_destroy (__GLcontextModes *modes)
{
return (*__xglGLXFunc.convert_from_x_visual_type)(visualType);
(*__xglGLXFunc.context_modes_destroy) (modes);
}
GLint _gl_convert_to_x_visual_type( int visualType )
GLint
_gl_convert_from_x_visual_type (int visualType)
{
return (*__xglGLXFunc.convert_to_x_visual_type)(visualType);
return (*__xglGLXFunc.convert_from_x_visual_type) (visualType);
}
GLint
_gl_convert_to_x_visual_type (int visualType)
{
return (*__xglGLXFunc.convert_to_x_visual_type) (visualType);
}
Bool
xglLoadGLXModules (void)
@ -157,11 +160,16 @@ xglLoadGLXModules (void)
SYM (__xglGLXFunc.initVisuals, "GlxInitVisuals"),
SYM (__xglGLXFunc.flushContextCache, "__glXFlushContextCache"),
SYM (__xglGLXFunc.setRenderTables, "GlxSetRenderTables"),
SYM (__xglGLXFunc.copy_visual_to_context_mode, "_gl_copy_visual_to_context_mode"),
SYM (__xglGLXFunc.context_modes_create, "_gl_context_modes_create"),
SYM (__xglGLXFunc.context_modes_destroy, "_gl_context_modes_destroy"),
SYM (__xglGLXFunc.convert_from_x_visual_type, "_gl_convert_from_x_visual_type"),
SYM (__xglGLXFunc.convert_to_x_visual_type, "_gl_convert_to_x_visual_type"),
SYM (__xglGLXFunc.copy_visual_to_context_mode,
"_gl_copy_visual_to_context_mode"),
SYM (__xglGLXFunc.context_modes_create,
"_gl_context_modes_create"),
SYM (__xglGLXFunc.context_modes_destroy,
"_gl_context_modes_destroy"),
SYM (__xglGLXFunc.convert_from_x_visual_type,
"_gl_convert_from_x_visual_type"),
SYM (__xglGLXFunc.convert_to_x_visual_type,
"_gl_convert_to_x_visual_type")
};
glXHandle = xglLoadModule ("glx", RTLD_NOW | RTLD_LOCAL);
@ -179,54 +187,63 @@ xglLoadGLXModules (void)
if (!glCoreHandle)
{
xglSymbolRec ddxsym[] = {
xglSymbolRec ddxSym[] = {
SYM (__glcore_DDXExtensionInfo, "__glXglDDXExtensionInfo"),
SYM (__glcore_DDXScreenInfo, "__glXglDDXScreenInfo")
};
SYM (__glcore_DDXScreenInfo, "__glXglDDXScreenInfo")
};
glCoreHandle = xglLoadModule ("glcore", RTLD_NOW | RTLD_LOCAL);
if (!glCoreHandle)
return FALSE;
if (!xglLookupSymbols (glCoreHandle, ddxsym,
sizeof (ddxsym) / sizeof(ddxsym[0])))
if (!xglLookupSymbols (glCoreHandle, ddxSym,
sizeof (ddxSym) / sizeof(ddxSym[0])))
{
xglUnloadModule (glCoreHandle);
glCoreHandle = 0;
return FALSE;
}
__xglScreenInfoPtr = __glcore_DDXScreenInfo();
__xglExtensionInfo = __glcore_DDXExtensionInfo();
{
xglSymbolRec sym[] = {
SYM (__xglScreenInfoPtr->screenProbe, "__MESA_screenProbe"),
SYM (__xglScreenInfoPtr->createContext, "__MESA_createContext"),
SYM (__xglScreenInfoPtr->createBuffer, "__MESA_createBuffer"),
SYM (__xglExtensionInfo->resetExtension,
"__MESA_resetExtension"),
SYM (__xglExtensionInfo->initVisuals, "__MESA_initVisuals"),
SYM (__xglExtensionInfo->setVisualConfigs,
"__MESA_setVisualConfigs"),
};
if (!xglLookupSymbols (glCoreHandle, sym,
sizeof (sym) / sizeof (sym[0])))
{
xglUnloadModule (glCoreHandle);
glCoreHandle = 0;
return FALSE;
}
__xglScreenInfo = __glcore_DDXScreenInfo ();
__xglExtensionInfo = __glcore_DDXExtensionInfo ();
if (__xglScreenInfo && __xglExtensionInfo)
{
xglSymbolRec sym[] = {
SYM (__xglScreenInfo->screenProbe, "__MESA_screenProbe"),
SYM (__xglScreenInfo->createContext, "__MESA_createContext"),
SYM (__xglScreenInfo->createBuffer, "__MESA_createBuffer"),
SYM (__xglExtensionInfo->resetExtension,
"__MESA_resetExtension"),
SYM (__xglExtensionInfo->initVisuals, "__MESA_initVisuals"),
SYM (__xglExtensionInfo->setVisualConfigs,
"__MESA_setVisualConfigs")
};
if (!xglLookupSymbols (glCoreHandle, sym,
sizeof (sym) / sizeof (sym[0])))
{
xglUnloadModule (glCoreHandle);
glCoreHandle = 0;
return FALSE;
}
}
else
{
xglUnloadModule (glCoreHandle);
glCoreHandle = 0;
return FALSE;
}
}
if (!xglLoadHashFuncs (glCoreHandle))
{
xglUnloadModule (glCoreHandle);
glCoreHandle = 0;
return FALSE;
}
}

44
hw/xgl/xglglx.h
View file

@ -32,32 +32,32 @@
#include "glxext.h"
#include "glapitable.h"
typedef struct _xglGLXFunc {
void (*extensionInit) (void);
void (*setVisualConfigs) (int nconfigs,
__GLXvisualConfig *configs,
void **privates);
void (*wrapInitVisuals) (miInitVisualsProcPtr *initVisuals);
int (*initVisuals) (VisualPtr *visualp,
DepthPtr *depthp,
int *nvisualp,
int *ndepthp,
int *rootDepthp,
VisualID *defaultVisp,
unsigned long sizes,
int bitsPerRGB,
int preferredVis);
void (*extensionInit) (void);
void (*setVisualConfigs) (int nconfigs,
__GLXvisualConfig *configs,
void **privates);
void (*wrapInitVisuals) (miInitVisualsProcPtr *initVisuals);
int (*initVisuals) (VisualPtr *visualp,
DepthPtr *depthp,
int *nvisualp,
int *ndepthp,
int *rootDepthp,
VisualID *defaultVisp,
unsigned long sizes,
int bitsPerRGB,
int preferredVis);
void (*flushContextCache) (void);
void *(*DDXExtensionInfo) (void);
void *(*DDXScreenInfo) (void);
void (*setRenderTables) (struct _glapi_table *table);
void (*copy_visual_to_context_mode)( __GLcontextModes *mode, const __GLXvisualConfig *config );
__GLcontextModes *(*context_modes_create)( unsigned count, size_t minimum_size );
void (*context_modes_destroy)( __GLcontextModes * modes );
GLint (*convert_from_x_visual_type)( int visualType );
GLint (*convert_to_x_visual_type)( int visualType );
void (*setRenderTables) (struct _glapi_table *table);
void (*copy_visual_to_context_mode) (__GLcontextModes *mode,
const __GLXvisualConfig *config);
__GLcontextModes *(*context_modes_create) (unsigned count,
size_t minimumSize);
void (*context_modes_destroy) (__GLcontextModes *modes);
GLint (*convert_from_x_visual_type) (int visualType);
GLint (*convert_to_x_visual_type) (int visualType);
} xglGLXFuncRec, *xglGLXFuncPtr;
extern xglGLXFuncRec __xglGLXFunc;