frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix XDarwin's broken build of libGL and server side GLX. GL library is only 

known to build correctly on Mac OS X 10.3.4 and still needs some work
    for earlier versions.
This commit is contained in:
Torrey Lyons 2004-07-27 20:24:00 +00:00
parent 8ef3e7052e
commit ddd5835612
3 changed files with 721 additions and 597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

501
GL/apple/aglGlx.c
View File

@ -1,10 +1,14 @@
/* /*
* GLX implementation that uses Apple's AGL.framework for OpenGL * GLX implementation that uses Apple's AGL.framework for OpenGL
*
* FIXME: This file and indirect.c are very similar. The two should be
* merged by introducing suitable abstractions.
*/ */
/* /*
* Copyright (c) 2002 Greg Parker. All Rights Reserved. * Copyright (c) 2002 Greg Parker. All Rights Reserved.
* Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
* *
* Portions of this file are copied from xf86glx.c, * Large portions of this file are copied from Mesa's xf86glx.c,
* which contains the following copyright: * which contains the following copyright:
* *
* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@ -27,10 +31,6 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name(s) of the above copyright
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/ */
/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
@ -58,6 +58,8 @@
#include <GL/internal/glcore.h> #include <GL/internal/glcore.h>
#undef BOOL #undef BOOL
#include "glcontextmodes.h"
// Write debugging output, or not // Write debugging output, or not
#ifdef GLAQUA_DEBUG #ifdef GLAQUA_DEBUG
#define GLAQUA_DEBUG_MSG ErrorF #define GLAQUA_DEBUG_MSG ErrorF
@ -84,14 +86,14 @@ GLboolean glIsTextureEXT (GLuint h) {
// some prototypes // some prototypes
static Bool glAquaScreenProbe(int screen); static Bool glAquaScreenProbe(int screen);
static Bool glAquaInitVisuals(VisualPtr *visualp, DepthPtr *depthp, static Bool glAquaInitVisuals(VisualPtr *visualp, DepthPtr *depthp,
int *nvisualp, int *ndepthp, int *nvisualp, int *ndepthp,
int *rootDepthp, VisualID *defaultVisp, int *rootDepthp, VisualID *defaultVisp,
unsigned long sizes, int bitsPerRGB); unsigned long sizes, int bitsPerRGB);
static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
void **privates); void **privates);
static __GLinterface *glAquaCreateContext(__GLimports *imports, static __GLinterface *glAquaCreateContext(__GLimports *imports,
__GLcontextModes *mode, __GLcontextModes *mode,
__GLinterface *shareGC); __GLinterface *shareGC);
static void glAquaCreateBuffer(__GLXdrawablePrivate *glxPriv); static void glAquaCreateBuffer(__GLXdrawablePrivate *glxPriv);
static void glAquaResetExtension(void); static void glAquaResetExtension(void);
@ -102,14 +104,14 @@ static void glAquaResetExtension(void);
* __glXScreenInit to initialize each of the active screens * __glXScreenInit to initialize each of the active screens
* (__glXActiveScreens[]). Several of the fields must be initialized by * (__glXActiveScreens[]). Several of the fields must be initialized by
* the screenProbe routine before they are copied to the active screens * the screenProbe routine before they are copied to the active screens
* struct. In particular, the contextCreate, pGlxVisual, numVisuals, * struct. In particular, the contextCreate, modes, numVisuals,
* and numUsableVisuals fields must be initialized. * and numUsableVisuals fields must be initialized.
*/ */
__GLXscreenInfo __glDDXScreenInfo = { static __GLXscreenInfo __glDDXScreenInfo = {
glAquaScreenProbe, /* Must be generic and handle all screens */ glAquaScreenProbe, /* Must be generic and handle all screens */
glAquaCreateContext, /* Substitute screen's createContext routine */ glAquaCreateContext, /* Substitute screen's createContext routine */
glAquaCreateBuffer, /* Substitute screen's createBuffer routine */ glAquaCreateBuffer, /* Substitute screen's createBuffer routine */
NULL, /* Set up pGlxVisual in probe */ NULL, /* Set up modes in probe */
NULL, /* Set up pVisualPriv in probe */ NULL, /* Set up pVisualPriv in probe */
0, /* Set up numVisuals in probe */ 0, /* Set up numVisuals in probe */
0, /* Set up numUsableVisuals in probe */ 0, /* Set up numUsableVisuals in probe */
@ -119,13 +121,20 @@ __GLXscreenInfo __glDDXScreenInfo = {
NULL /* WrappedPositionWindow is overwritten */ NULL /* WrappedPositionWindow is overwritten */
}; };
__GLXextensionInfo __glDDXExtensionInfo = { void *__glXglDDXScreenInfo(void) {
return &__glDDXScreenInfo;
}
static __GLXextensionInfo __glDDXExtensionInfo = {
GL_CORE_APPLE, GL_CORE_APPLE,
glAquaResetExtension, glAquaResetExtension,
glAquaInitVisuals, glAquaInitVisuals,
glAquaSetVisualConfigs glAquaSetVisualConfigs
}; };
void *__glXglDDXExtensionInfo(void) {
return &__glDDXExtensionInfo;
}
// prototypes // prototypes
@ -134,7 +143,7 @@ static GLboolean glAquaLoseCurrent(__GLcontext *gc);
static GLboolean glAquaMakeCurrent(__GLcontext *gc); static GLboolean glAquaMakeCurrent(__GLcontext *gc);
static GLboolean glAquaShareContext(__GLcontext *gc, __GLcontext *gcShare); static GLboolean glAquaShareContext(__GLcontext *gc, __GLcontext *gcShare);
static GLboolean glAquaCopyContext(__GLcontext *dst, const __GLcontext *src, static GLboolean glAquaCopyContext(__GLcontext *dst, const __GLcontext *src,
GLuint mask); GLuint mask);
static GLboolean glAquaForceCurrent(__GLcontext *gc); static GLboolean glAquaForceCurrent(__GLcontext *gc);
/* Drawing surface notification callbacks */ /* Drawing surface notification callbacks */
@ -168,7 +177,7 @@ static __GLexports glAquaExports = {
typedef struct { typedef struct {
int num_vis; int num_vis;
__GLXvisualConfig *glx_vis; __GLcontextModes *modes;
void **priv; void **priv;
// wrapped screen functions // wrapped screen functions
@ -436,8 +445,8 @@ static AGLPixelFormat makeFormat(__GLcontextModes *mode)
} }
static __GLinterface *glAquaCreateContext(__GLimports *imports, static __GLinterface *glAquaCreateContext(__GLimports *imports,
__GLcontextModes *mode, __GLcontextModes *mode,
__GLinterface *shareGC) __GLinterface *shareGC)
{ {
__GLcontext *result; __GLcontext *result;
__GLcontext *sharectx = (__GLcontext *)shareGC; __GLcontext *sharectx = (__GLcontext *)shareGC;
@ -564,23 +573,21 @@ glAquaUnrealizeWindow(WindowPtr pWin)
} }
/*
* In the case the driver has no GLX visuals we'll use these.
* [0] = RGB, double buffered
* [1] = RGB, double buffered, stencil, accum
*/
// Originally copied from Mesa // Originally copied from Mesa
static int numConfigs = 0; static int numConfigs = 0;
static __GLXvisualConfig *visualConfigs = NULL; static __GLXvisualConfig *visualConfigs = NULL;
static void **visualPrivates = NULL; static void **visualPrivates = NULL;
#define NUM_FALLBACK_CONFIGS 2 /*
* In the case the driver defines no GLX visuals we'll use these.
* Note that for TrueColor and DirectColor visuals, bufferSize is the
* sum of redSize, greenSize, blueSize and alphaSize, which may be larger
* than the nplanes/rootDepth of the server's X11 visuals
*/
#define NUM_FALLBACK_CONFIGS 5
static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = { static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
/* [0] = RGB, double buffered, Z */
{ {
-1, /* vid */ -1, /* vid */
-1, /* class */ -1, /* class */
@ -595,11 +602,12 @@ static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
0, /* stencilSize */ 0, /* stencilSize */
0, /* auxBuffers */ 0, /* auxBuffers */
0, /* level */ 0, /* level */
GLX_NONE_EXT, /* visualRating */ GLX_NONE, /* visualRating */
0, /* transparentPixel */ GLX_NONE, /* transparentPixel */
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */ 0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */ 0 /* transparentIndex */
}, },
/* [1] = RGB, double buffered, Z, stencil, accum */
{ {
-1, /* vid */ -1, /* vid */
-1, /* class */ -1, /* class */
@ -614,15 +622,74 @@ static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
8, /* stencilSize */ 8, /* stencilSize */
0, /* auxBuffers */ 0, /* auxBuffers */
0, /* level */ 0, /* level */
GLX_NONE_EXT, /* visualRating */ GLX_NONE, /* visualRating */
0, /* transparentPixel */ GLX_NONE, /* transparentPixel */
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */ 0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */ 0 /* transparentIndex */
} },
/* [2] = RGB+Alpha, double buffered, Z, stencil, accum */
{
-1, /* vid */
-1, /* class */
True, /* rgba */
-1, -1, -1, 8, /* rgba sizes */
-1, -1, -1, -1, /* rgba masks */
16, 16, 16, 16, /* rgba accum sizes */
True, /* doubleBuffer */
False, /* stereo */
-1, /* bufferSize */
16, /* depthSize */
8, /* stencilSize */
0, /* auxBuffers */
0, /* level */
GLX_NONE, /* visualRating */
GLX_NONE, /* transparentPixel */
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */
},
/* [3] = RGB+Alpha, single buffered, Z, stencil, accum */
{
-1, /* vid */
-1, /* class */
True, /* rgba */
-1, -1, -1, 8, /* rgba sizes */
-1, -1, -1, -1, /* rgba masks */
16, 16, 16, 16, /* rgba accum sizes */
False, /* doubleBuffer */
False, /* stereo */
-1, /* bufferSize */
16, /* depthSize */
8, /* stencilSize */
0, /* auxBuffers */
0, /* level */
GLX_NONE, /* visualRating */
GLX_NONE, /* transparentPixel */
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */
},
/* [4] = CI, double buffered, Z */
{
-1, /* vid */
-1, /* class */
False, /* rgba? (false = color index) */
-1, -1, -1, 0, /* rgba sizes */
-1, -1, -1, 0, /* rgba masks */
0, 0, 0, 0, /* rgba accum sizes */
True, /* doubleBuffer */
False, /* stereo */
-1, /* bufferSize */
16, /* depthSize */
0, /* stencilSize */
0, /* auxBuffers */
0, /* level */
GLX_NONE, /* visualRating */
GLX_NONE, /* transparentPixel */
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */
},
}; };
static int count_bits(unsigned int n) static int count_bits(unsigned int n)
{ {
int bits = 0; int bits = 0;
@ -635,11 +702,10 @@ static int count_bits(unsigned int n)
} }
// Mostly copied from Mesa's xf86glx.c
static Bool init_visuals(int *nvisualp, VisualPtr *visualp, static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
VisualID *defaultVisp, VisualID *defaultVisp,
int ndepth, DepthPtr pdepth, int ndepth, DepthPtr pdepth,
int rootDepth) int rootDepth)
{ {
int numRGBconfigs; int numRGBconfigs;
int numCIconfigs; int numCIconfigs;
@ -649,7 +715,7 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
VisualPtr pVisual = *visualp; VisualPtr pVisual = *visualp;
VisualPtr pVisualNew = NULL; VisualPtr pVisualNew = NULL;
VisualID *orig_vid = NULL; VisualID *orig_vid = NULL;
__GLXvisualConfig *glXVisualPtr = NULL; __GLcontextModes *modes;
__GLXvisualConfig *pNewVisualConfigs = NULL; __GLXvisualConfig *pNewVisualConfigs = NULL;
void **glXVisualPriv; void **glXVisualPriv;
void **pNewVisualPriv; void **pNewVisualPriv;
@ -667,14 +733,14 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
pNewVisualConfigs = (__GLXvisualConfig *) pNewVisualConfigs = (__GLXvisualConfig *)
__glXMalloc(numNewConfigs * sizeof(__GLXvisualConfig)); __glXMalloc(numNewConfigs * sizeof(__GLXvisualConfig));
if (!pNewVisualConfigs) { if (!pNewVisualConfigs) {
return FALSE; return FALSE;
} }
/* Alloc space for the list of new GLX visual privates */ /* Alloc space for the list of new GLX visual privates */
pNewVisualPriv = (void **) __glXMalloc(numNewConfigs * sizeof(void *)); pNewVisualPriv = (void **) __glXMalloc(numNewConfigs * sizeof(void *));
if (!pNewVisualPriv) { if (!pNewVisualPriv) {
__glXFree(pNewVisualConfigs); __glXFree(pNewVisualConfigs);
return FALSE; return FALSE;
} }
/* /*
@ -682,9 +748,9 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
** visual configs. ** visual configs.
*/ */
if (numConfigs == 0) { if (numConfigs == 0) {
memcpy(pNewVisualConfigs, FallbackConfigs, memcpy(pNewVisualConfigs, FallbackConfigs,
NUM_FALLBACK_CONFIGS * sizeof(__GLXvisualConfig)); NUM_FALLBACK_CONFIGS * sizeof(__GLXvisualConfig));
memset(pNewVisualPriv, 0, NUM_FALLBACK_CONFIGS * sizeof(void *)); memset(pNewVisualPriv, 0, NUM_FALLBACK_CONFIGS * sizeof(void *));
} }
else { else {
/* copy driver's visual config info */ /* copy driver's visual config info */
@ -698,18 +764,18 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
numRGBconfigs = 0; numRGBconfigs = 0;
numCIconfigs = 0; numCIconfigs = 0;
for (i = 0; i < numNewConfigs; i++) { for (i = 0; i < numNewConfigs; i++) {
if (pNewVisualConfigs[i].rgba) if (pNewVisualConfigs[i].rgba)
numRGBconfigs++; numRGBconfigs++;
else else
numCIconfigs++; numCIconfigs++;
} }
/* Count the total number of visuals to compute */ /* Count the total number of visuals to compute */
numNewVisuals = 0; numNewVisuals = 0;
for (i = 0; i < numVisuals; i++) { for (i = 0; i < numVisuals; i++) {
numNewVisuals += numNewVisuals +=
(pVisual[i].class == TrueColor || pVisual[i].class == DirectColor) (pVisual[i].class == TrueColor || pVisual[i].class == DirectColor)
? numRGBconfigs : numCIconfigs; ? numRGBconfigs : numCIconfigs;
} }
/* Reset variables for use with the next screen/driver's visual configs */ /* Reset variables for use with the next screen/driver's visual configs */
@ -719,127 +785,132 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
/* Alloc temp space for the list of orig VisualIDs for each new visual */ /* Alloc temp space for the list of orig VisualIDs for each new visual */
orig_vid = (VisualID *)__glXMalloc(numNewVisuals * sizeof(VisualID)); orig_vid = (VisualID *)__glXMalloc(numNewVisuals * sizeof(VisualID));
if (!orig_vid) { if (!orig_vid) {
__glXFree(pNewVisualPriv); __glXFree(pNewVisualPriv);
__glXFree(pNewVisualConfigs); __glXFree(pNewVisualConfigs);
return FALSE; return FALSE;
} }
/* Alloc space for the list of glXVisuals */ /* Alloc space for the list of glXVisuals */
glXVisualPtr = (__GLXvisualConfig *)__glXMalloc(numNewVisuals * modes = _gl_context_modes_create(numNewVisuals, sizeof(__GLcontextModes));
sizeof(__GLXvisualConfig)); if (modes == NULL) {
if (!glXVisualPtr) { __glXFree(orig_vid);
__glXFree(orig_vid); __glXFree(pNewVisualPriv);
__glXFree(pNewVisualPriv); __glXFree(pNewVisualConfigs);
__glXFree(pNewVisualConfigs); return FALSE;
return FALSE;
} }
/* Alloc space for the list of glXVisualPrivates */ /* Alloc space for the list of glXVisualPrivates */
glXVisualPriv = (void **)__glXMalloc(numNewVisuals * sizeof(void *)); glXVisualPriv = (void **)__glXMalloc(numNewVisuals * sizeof(void *));
if (!glXVisualPriv) { if (!glXVisualPriv) {
__glXFree(glXVisualPtr); _gl_context_modes_destroy( modes );
__glXFree(orig_vid); __glXFree(orig_vid);
__glXFree(pNewVisualPriv); __glXFree(pNewVisualPriv);
__glXFree(pNewVisualConfigs); __glXFree(pNewVisualConfigs);
return FALSE; return FALSE;
} }
/* Alloc space for the new list of the X server's visuals */ /* Alloc space for the new list of the X server's visuals */
pVisualNew = (VisualPtr)__glXMalloc(numNewVisuals * sizeof(VisualRec)); pVisualNew = (VisualPtr)__glXMalloc(numNewVisuals * sizeof(VisualRec));
if (!pVisualNew) { if (!pVisualNew) {
__glXFree(glXVisualPriv); __glXFree(glXVisualPriv);
__glXFree(glXVisualPtr); _gl_context_modes_destroy( modes );
__glXFree(orig_vid); __glXFree(orig_vid);
__glXFree(pNewVisualPriv); __glXFree(pNewVisualPriv);
__glXFree(pNewVisualConfigs); __glXFree(pNewVisualConfigs);
return FALSE; return FALSE;
} }
/* Initialize the new visuals */ /* Initialize the new visuals */
found_default = FALSE; found_default = FALSE;
glAquaScreens[screenInfo.numScreens-1].modes = modes;
for (i = j = 0; i < numVisuals; i++) { for (i = j = 0; i < numVisuals; i++) {
int is_rgb = (pVisual[i].class == TrueColor || int is_rgb = (pVisual[i].class == TrueColor ||
pVisual[i].class == DirectColor); pVisual[i].class == DirectColor);
for (k = 0; k < numNewConfigs; k++) { for (k = 0; k < numNewConfigs; k++) {
if (pNewVisualConfigs[k].rgba != is_rgb) if (pNewVisualConfigs[k].rgba != is_rgb)
continue; continue;
/* Initialize the new visual */ assert( modes != NULL );
pVisualNew[j] = pVisual[i];
pVisualNew[j].vid = FakeClientID(0);
/* Check for the default visual */ /* Initialize the new visual */
if (!found_default && pVisual[i].vid == *defaultVisp) { pVisualNew[j] = pVisual[i];
*defaultVisp = pVisualNew[j].vid; pVisualNew[j].vid = FakeClientID(0);
found_default = TRUE;
}
/* Save the old VisualID */ /* Check for the default visual */
orig_vid[j] = pVisual[i].vid; if (!found_default && pVisual[i].vid == *defaultVisp) {
*defaultVisp = pVisualNew[j].vid;
found_default = TRUE;
}
/* Initialize the glXVisual */ /* Save the old VisualID */
glXVisualPtr[j] = pNewVisualConfigs[k]; orig_vid[j] = pVisual[i].vid;
glXVisualPtr[j].vid = pVisualNew[j].vid;
/* /* Initialize the glXVisual */
* If the class is -1, then assume the X visual information _gl_copy_visual_to_context_mode( modes, & pNewVisualConfigs[k] );
* is identical to what GLX needs, and take them from the X modes->visualID = pVisualNew[j].vid;
* visual. NOTE: if class != -1, then all other fields MUST
* be initialized.
*/
if (glXVisualPtr[j].class == -1) {
glXVisualPtr[j].class = pVisual[i].class;
glXVisualPtr[j].redSize = count_bits(pVisual[i].redMask);
glXVisualPtr[j].greenSize = count_bits(pVisual[i].greenMask);
glXVisualPtr[j].blueSize = count_bits(pVisual[i].blueMask);
glXVisualPtr[j].alphaSize = glXVisualPtr[j].alphaSize;
glXVisualPtr[j].redMask = pVisual[i].redMask;
glXVisualPtr[j].greenMask = pVisual[i].greenMask;
glXVisualPtr[j].blueMask = pVisual[i].blueMask;
glXVisualPtr[j].alphaMask = glXVisualPtr[j].alphaMask;
glXVisualPtr[j].bufferSize = rootDepth;
}
/* Save the device-dependent private for this visual */ /*
glXVisualPriv[j] = pNewVisualPriv[k]; * If the class is -1, then assume the X visual information
* is identical to what GLX needs, and take them from the X
* visual. NOTE: if class != -1, then all other fields MUST
* be initialized.
*/
if (modes->visualType == GLX_NONE) {
modes->visualType = _gl_convert_from_x_visual_type( pVisual[i].class );
modes->redBits = count_bits(pVisual[i].redMask);
modes->greenBits = count_bits(pVisual[i].greenMask);
modes->blueBits = count_bits(pVisual[i].blueMask);
modes->alphaBits = modes->alphaBits;
modes->redMask = pVisual[i].redMask;
modes->greenMask = pVisual[i].greenMask;
modes->blueMask = pVisual[i].blueMask;
modes->alphaMask = modes->alphaMask;
modes->rgbBits = (is_rgb)
? (modes->redBits + modes->greenBits +
modes->blueBits + modes->alphaBits)
: rootDepth;
}
j++; /* Save the device-dependent private for this visual */
} glXVisualPriv[j] = pNewVisualPriv[k];
j++;
modes = modes->next;
}
} }
assert(j <= numNewVisuals); assert(j <= numNewVisuals);
/* Save the GLX visuals in the screen structure */ /* Save the GLX visuals in the screen structure */
glAquaScreens[screenInfo.numScreens-1].num_vis = numNewVisuals; glAquaScreens[screenInfo.numScreens-1].num_vis = numNewVisuals;
glAquaScreens[screenInfo.numScreens-1].glx_vis = glXVisualPtr;
glAquaScreens[screenInfo.numScreens-1].priv = glXVisualPriv; glAquaScreens[screenInfo.numScreens-1].priv = glXVisualPriv;
/* Set up depth's VisualIDs */ /* Set up depth's VisualIDs */
for (i = 0; i < ndepth; i++) { for (i = 0; i < ndepth; i++) {
int numVids = 0; int numVids = 0;
VisualID *pVids = NULL; VisualID *pVids = NULL;
int k, n = 0; int k, n = 0;
/* Count the new number of VisualIDs at this depth */ /* Count the new number of VisualIDs at this depth */
for (j = 0; j < pdepth[i].numVids; j++) for (j = 0; j < pdepth[i].numVids; j++)
for (k = 0; k < numNewVisuals; k++) for (k = 0; k < numNewVisuals; k++)
if (pdepth[i].vids[j] == orig_vid[k]) if (pdepth[i].vids[j] == orig_vid[k])
numVids++; numVids++;
/* Allocate a new list of VisualIDs for this depth */ /* Allocate a new list of VisualIDs for this depth */
pVids = (VisualID *)__glXMalloc(numVids * sizeof(VisualID)); pVids = (VisualID *)__glXMalloc(numVids * sizeof(VisualID));
/* Initialize the new list of VisualIDs for this depth */ /* Initialize the new list of VisualIDs for this depth */
for (j = 0; j < pdepth[i].numVids; j++) for (j = 0; j < pdepth[i].numVids; j++)
for (k = 0; k < numNewVisuals; k++) for (k = 0; k < numNewVisuals; k++)
if (pdepth[i].vids[j] == orig_vid[k]) if (pdepth[i].vids[j] == orig_vid[k])
pVids[n++] = pVisualNew[k].vid; pVids[n++] = pVisualNew[k].vid;
/* Update this depth's list of VisualIDs */ /* Update this depth's list of VisualIDs */
__glXFree(pdepth[i].vids); __glXFree(pdepth[i].vids);
pdepth[i].vids = pVids; pdepth[i].vids = pVids;
pdepth[i].numVids = numVids; pdepth[i].numVids = numVids;
} }
/* Update the X server's visuals */ /* Update the X server's visuals */
@ -862,9 +933,8 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
return TRUE; return TRUE;
} }
// Copied from Mesa
static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
void **privates) void **privates)
{ {
GLAQUA_DEBUG_MSG("glAquaSetVisualConfigs\n"); GLAQUA_DEBUG_MSG("glAquaSetVisualConfigs\n");
@ -873,11 +943,10 @@ static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
visualPrivates = privates; visualPrivates = privates;
} }
// Copied from Mesa
static Bool glAquaInitVisuals(VisualPtr *visualp, DepthPtr *depthp, static Bool glAquaInitVisuals(VisualPtr *visualp, DepthPtr *depthp,
int *nvisualp, int *ndepthp, int *nvisualp, int *ndepthp,
int *rootDepthp, VisualID *defaultVisp, int *rootDepthp, VisualID *defaultVisp,
unsigned long sizes, int bitsPerRGB) unsigned long sizes, int bitsPerRGB)
{ {
GLAQUA_DEBUG_MSG("glAquaInitVisuals\n"); GLAQUA_DEBUG_MSG("glAquaInitVisuals\n");
@ -885,7 +954,7 @@ static Bool glAquaInitVisuals(VisualPtr *visualp, DepthPtr *depthp,
* Setup the visuals supported by this particular screen. * Setup the visuals supported by this particular screen.
*/ */
return init_visuals(nvisualp, visualp, defaultVisp, return init_visuals(nvisualp, visualp, defaultVisp,
*ndepthp, *depthp, *rootDepthp); *ndepthp, *depthp, *rootDepthp);
} }
@ -893,100 +962,92 @@ static void fixup_visuals(int screen)
{ {
ScreenPtr pScreen = screenInfo.screens[screen]; ScreenPtr pScreen = screenInfo.screens[screen];
glAquaScreenRec *pScr = &glAquaScreens[screen]; glAquaScreenRec *pScr = &glAquaScreens[screen];
__GLXvisualConfig *pGLXVis = pScr->glx_vis; int j;
VisualPtr pVis; __GLcontextModes *modes;
int i, j;
GLAQUA_DEBUG_MSG("fixup_visuals\n"); GLAQUA_DEBUG_MSG("fixup_visuals\n");
for (i = 0; i < pScr->num_vis; i++, pGLXVis++) { for ( modes = pScr->modes ; modes != NULL ; modes = modes->next ) {
pVis = pScreen->visuals; const int vis_class = _gl_convert_to_x_visual_type( modes->visualType );
const int nplanes = (modes->rgbBits - modes->alphaBits);
const VisualPtr pVis = pScreen->visuals;
/* Find a visual that matches the GLX visual's class and size */ /* Find a visual that matches the GLX visual's class and size */
for (j = 0; j < pScreen->numVisuals; j++, pVis++) { for (j = 0; j < pScreen->numVisuals; j++) {
if (pVis->class == pGLXVis->class && if (pVis[j].class == vis_class &&
pVis->nplanes == pGLXVis->bufferSize) { pVis[j].nplanes == nplanes) {
/* Fixup the masks */ /* Fixup the masks */
pGLXVis->redMask = pVis->redMask; modes->redMask = pVis[j].redMask;
pGLXVis->greenMask = pVis->greenMask; modes->greenMask = pVis[j].greenMask;
pGLXVis->blueMask = pVis->blueMask; modes->blueMask = pVis[j].blueMask;
/* Recalc the sizes */ /* Recalc the sizes */
pGLXVis->redSize = count_bits(pGLXVis->redMask); modes->redBits = count_bits(modes->redMask);
pGLXVis->greenSize = count_bits(pGLXVis->greenMask); modes->greenBits = count_bits(modes->greenMask);
pGLXVis->blueSize = count_bits(pGLXVis->blueMask); modes->blueBits = count_bits(modes->blueMask);
} }
} }
} }
} }
static void init_screen_visuals(int screen) static void init_screen_visuals(int screen)
{ {
ScreenPtr pScreen = screenInfo.screens[screen]; ScreenPtr pScreen = screenInfo.screens[screen];
__GLXvisualConfig *pGLXVis = glAquaScreens[screen].glx_vis; __GLcontextModes *modes;
// XMesaVisual *pXMesaVisual;
VisualPtr pVis;
int *used; int *used;
int i, j; int i, j;
GLAQUA_DEBUG_MSG("init_screen_visuals\n"); GLAQUA_DEBUG_MSG("init_screen_visuals\n");
/* Alloc space for the list of XMesa visuals */ /* FIXME: Change 'used' to be a array of bits (rather than of ints),
// pXMesaVisual = (XMesaVisual *)__glXMalloc(MESAScreens[screen].num_vis * * FIXME: create a stack array of 8 or 16 bytes. If 'numVisuals' is less
// sizeof(XMesaVisual)); * FIXME: than 64 or 128 the stack array can be used instead of calling
// __glXMemset(pXMesaVisual, 0, * FIXME: __glXMalloc / __glXFree. If nothing else, convert 'used' to
// MESAScreens[screen].num_vis * sizeof(XMesaVisual)); * FIXME: array of bytes instead of ints!
*/
used = (int *)__glXMalloc(pScreen->numVisuals * sizeof(int)); used = (int *)__glXMalloc(pScreen->numVisuals * sizeof(int));
__glXMemset(used, 0, pScreen->numVisuals * sizeof(int)); __glXMemset(used, 0, pScreen->numVisuals * sizeof(int));
for (i = 0; i < glAquaScreens[screen].num_vis; i++, pGLXVis++) { i = 0;
pVis = pScreen->visuals; for ( modes = glAquaScreens[screen].modes
for (j = 0; j < pScreen->numVisuals; j++, pVis++) { ; modes != NULL
; modes = modes->next ) {
const int vis_class = _gl_convert_to_x_visual_type( modes->visualType );
const int nplanes = (modes->rgbBits - modes->alphaBits);
const VisualPtr pVis = pScreen->visuals;
if (pVis->class == pGLXVis->class && for (j = 0; j < pScreen->numVisuals; j++) {
pVis->nplanes == pGLXVis->bufferSize && if (pVis[j].class == vis_class &&
!used[j]) { pVis[j].nplanes == nplanes &&
pVis[j].redMask == modes->redMask &&
pVis[j].greenMask == modes->greenMask &&
pVis[j].blueMask == modes->blueMask &&
!used[j]) {
if (pVis->redMask == pGLXVis->redMask && /* Set the VisualID */
pVis->greenMask == pGLXVis->greenMask && modes->visualID = pVis[j].vid;
pVis->blueMask == pGLXVis->blueMask) {
/* Create the XMesa visual */ /* Mark this visual used */
/* used[j] = 1;
pXMesaVisual[i] = break;
XMesaCreateVisual(pScreen, }
pVis, }
pGLXVis->rgba, if ( j == pScreen->numVisuals ) {
(pGLXVis->alphaSize > 0), ErrorF("No matching visual for __GLcontextMode with "
pGLXVis->doubleBuffer, "visual class = %d (%d), nplanes = %u\n",
pGLXVis->stereo, vis_class,
GL_TRUE, // ximage_flag (int)modes->visualType,
pGLXVis->depthSize, (unsigned int)(modes->rgbBits - modes->alphaBits) );
pGLXVis->stencilSize, }
pGLXVis->accumRedSize, else if ( modes->visualID == -1 ) {
pGLXVis->accumGreenSize, FatalError( "Matching visual found, but visualID still -1!\n" );
pGLXVis->accumBlueSize, }
pGLXVis->accumAlphaSize,
0, // numSamples
pGLXVis->level,
pGLXVis->visualRating );
*/
/* Set the VisualID */
pGLXVis->vid = pVis->vid;
/* Mark this visual used */ i++;
used[j] = 1;
break;
}
}
}
} }
__glXFree(used); __glXFree(used);
// glAquaScreens[screen].xm_vis = pXMesaVisual;
} }
static Bool glAquaScreenProbe(int screen) static Bool glAquaScreenProbe(int screen)
@ -999,10 +1060,10 @@ static Bool glAquaScreenProbe(int screen)
/* /*
* Set up the current screen's visuals. * Set up the current screen's visuals.
*/ */
__glDDXScreenInfo.pGlxVisual = glAquaScreens[screen].glx_vis; __glDDXScreenInfo.modes = glAquaScreens[screen].modes;
__glDDXScreenInfo.pVisualPriv = glAquaScreens[screen].priv; __glDDXScreenInfo.pVisualPriv = glAquaScreens[screen].priv;
__glDDXScreenInfo.numVisuals = __glDDXScreenInfo.numVisuals =
__glDDXScreenInfo.numUsableVisuals = glAquaScreens[screen].num_vis; __glDDXScreenInfo.numUsableVisuals = glAquaScreens[screen].num_vis;
/* /*
* Set the current screen's createContext routine. This could be * Set the current screen's createContext routine. This could be
@ -1022,7 +1083,9 @@ static Bool glAquaScreenProbe(int screen)
*/ */
init_screen_visuals(screen); init_screen_visuals(screen);
// Wrap RealizeWindow and UnrealizeWindow on this screen /*
* Wrap RealizeWindow and UnrealizeWindow on this screen
*/
pScreen = screenInfo.screens[screen]; pScreen = screenInfo.screens[screen];
screenPriv = &glAquaScreens[screen]; screenPriv = &glAquaScreens[screen];
screenPriv->RealizeWindow = pScreen->RealizeWindow; screenPriv->RealizeWindow = pScreen->RealizeWindow;
@ -1035,10 +1098,10 @@ static Bool glAquaScreenProbe(int screen)
static GLboolean glAquaResizeBuffers(__GLdrawableBuffer *buffer, static GLboolean glAquaResizeBuffers(__GLdrawableBuffer *buffer,
GLint x, GLint y, GLint x, GLint y,
GLuint width, GLuint height, GLuint width, GLuint height,
__GLdrawablePrivate *glPriv, __GLdrawablePrivate *glPriv,
GLuint bufferMask) GLuint bufferMask)
{ {
GLAquaDrawableRec *aquaPriv = (GLAquaDrawableRec *)glPriv->private; GLAquaDrawableRec *aquaPriv = (GLAquaDrawableRec *)glPriv->private;
__GLXcontext *gx; __GLXcontext *gx;
@ -1122,24 +1185,24 @@ GLint __glEvalComputeK(GLenum target)
case GL_MAP2_VERTEX_4: case GL_MAP2_VERTEX_4:
case GL_MAP2_COLOR_4: case GL_MAP2_COLOR_4:
case GL_MAP2_TEXTURE_COORD_4: case GL_MAP2_TEXTURE_COORD_4:
return 4; return 4;
case GL_MAP1_VERTEX_3: case GL_MAP1_VERTEX_3:
case GL_MAP1_TEXTURE_COORD_3: case GL_MAP1_TEXTURE_COORD_3:
case GL_MAP1_NORMAL: case GL_MAP1_NORMAL:
case GL_MAP2_VERTEX_3: case GL_MAP2_VERTEX_3:
case GL_MAP2_TEXTURE_COORD_3: case GL_MAP2_TEXTURE_COORD_3:
case GL_MAP2_NORMAL: case GL_MAP2_NORMAL:
return 3; return 3;
case GL_MAP1_TEXTURE_COORD_2: case GL_MAP1_TEXTURE_COORD_2:
case GL_MAP2_TEXTURE_COORD_2: case GL_MAP2_TEXTURE_COORD_2:
return 2; return 2;
case GL_MAP1_TEXTURE_COORD_1: case GL_MAP1_TEXTURE_COORD_1:
case GL_MAP2_TEXTURE_COORD_1: case GL_MAP2_TEXTURE_COORD_1:
case GL_MAP1_INDEX: case GL_MAP1_INDEX:
case GL_MAP2_INDEX: case GL_MAP2_INDEX:
return 1; return 1;
default: default:
return 0; return 0;
} }
} }
@ -1148,8 +1211,8 @@ GLuint __glFloorLog2(GLuint val)
int c = 0; int c = 0;
while (val > 1) { while (val > 1) {
c++; c++;
val >>= 1; val >>= 1;
} }
return c; return c;
} }

815
GL/apple/indirect.c
View File

File diff suppressed because it is too large Load Diff

2
GL/glx/single2.c
View File

@ -42,7 +42,7 @@
#include "g_disptab.h" #include "g_disptab.h"
#include "GL/glx_ansic.h" #include "GL/glx_ansic.h"
#ifdef __CYGWIN__ /* should be XFree86Server */ #if defined(__CYGWIN__) || defined(__DARWIN__) /* should be XFree86Server */
#define xf86atof atof #define xf86atof atof
#endif #endif