gl: Remove unused GLcontextModes fields
This commit is contained in:
parent
e3c1c5377c
commit
705e142dda
|
@ -569,7 +569,7 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
|
||||||
/* RGB WINDOW:
|
/* RGB WINDOW:
|
||||||
* We support RGB rendering into almost any kind of visual.
|
* We support RGB rendering into almost any kind of visual.
|
||||||
*/
|
*/
|
||||||
const int xclass = v->mesa_visual.visualType;
|
const int xclass = v->visualType;
|
||||||
if (xclass != GLX_TRUE_COLOR && xclass == !GLX_DIRECT_COLOR) {
|
if (xclass != GLX_TRUE_COLOR && xclass == !GLX_DIRECT_COLOR) {
|
||||||
_mesa_warning(NULL,
|
_mesa_warning(NULL,
|
||||||
"XMesa: RGB mode rendering not supported in given visual.\n");
|
"XMesa: RGB mode rendering not supported in given visual.\n");
|
||||||
|
@ -716,13 +716,13 @@ XMesaVisual XMesaCreateVisual( Display *display,
|
||||||
v->mesa_visual.redMask = visinfo->red_mask;
|
v->mesa_visual.redMask = visinfo->red_mask;
|
||||||
v->mesa_visual.greenMask = visinfo->green_mask;
|
v->mesa_visual.greenMask = visinfo->green_mask;
|
||||||
v->mesa_visual.blueMask = visinfo->blue_mask;
|
v->mesa_visual.blueMask = visinfo->blue_mask;
|
||||||
v->mesa_visual.visualID = visinfo->visualid;
|
v->visualID = visinfo->visualid;
|
||||||
v->mesa_visual.screen = visinfo->screen;
|
v->screen = visinfo->screen;
|
||||||
|
|
||||||
#if !(defined(__cplusplus) || defined(c_plusplus))
|
#if !(defined(__cplusplus) || defined(c_plusplus))
|
||||||
v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->class);
|
v->visualType = xmesa_convert_from_x_visual_type(visinfo->class);
|
||||||
#else
|
#else
|
||||||
v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
|
v->visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
v->mesa_visual.visualRating = visualCaveat;
|
v->mesa_visual.visualRating = visualCaveat;
|
||||||
|
@ -733,7 +733,7 @@ XMesaVisual XMesaCreateVisual( Display *display,
|
||||||
(void) initialize_visual_and_buffer( v, NULL, rgb_flag, 0, 0 );
|
(void) initialize_visual_and_buffer( v, NULL, rgb_flag, 0, 0 );
|
||||||
|
|
||||||
{
|
{
|
||||||
const int xclass = v->mesa_visual.visualType;
|
const int xclass = v->visualType;
|
||||||
if (xclass == GLX_TRUE_COLOR || xclass == GLX_DIRECT_COLOR) {
|
if (xclass == GLX_TRUE_COLOR || xclass == GLX_DIRECT_COLOR) {
|
||||||
red_bits = _mesa_bitcount(GET_REDMASK(v));
|
red_bits = _mesa_bitcount(GET_REDMASK(v));
|
||||||
green_bits = _mesa_bitcount(GET_GREENMASK(v));
|
green_bits = _mesa_bitcount(GET_GREENMASK(v));
|
||||||
|
@ -783,7 +783,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
|
||||||
|
|
||||||
vis->numAuxBuffers = 0;
|
vis->numAuxBuffers = 0;
|
||||||
vis->level = 0;
|
vis->level = 0;
|
||||||
vis->pixmapMode = 0;
|
|
||||||
vis->sampleBuffers = 0;
|
vis->sampleBuffers = 0;
|
||||||
vis->samples = 0;
|
vis->samples = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,6 +281,7 @@ XMesaCopyContext(XMesaContext src, XMesaContext dst, unsigned long mask);
|
||||||
*/
|
*/
|
||||||
struct xmesa_visual {
|
struct xmesa_visual {
|
||||||
GLvisual mesa_visual; /* Device independent visual parameters */
|
GLvisual mesa_visual; /* Device independent visual parameters */
|
||||||
|
int screen, visualID, visualType;
|
||||||
Display *display; /* The X11 display */
|
Display *display; /* The X11 display */
|
||||||
XVisualInfo * visinfo; /* X's visual info (pointer to private copy) */
|
XVisualInfo * visinfo; /* X's visual info (pointer to private copy) */
|
||||||
XVisualInfo *vishandle; /* Only used in fakeglx.c */
|
XVisualInfo *vishandle; /* Only used in fakeglx.c */
|
||||||
|
|
|
@ -444,8 +444,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
|
||||||
|
|
||||||
pdp->driScreenPriv = psp;
|
pdp->driScreenPriv = psp;
|
||||||
|
|
||||||
if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes,
|
if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes, 0)) {
|
||||||
renderType == GLX_PIXMAP_BIT)) {
|
|
||||||
free(pdp);
|
free(pdp);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -620,9 +620,6 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type,
|
||||||
modes->transparentBlue = GLX_DONT_CARE;
|
modes->transparentBlue = GLX_DONT_CARE;
|
||||||
modes->transparentAlpha = GLX_DONT_CARE;
|
modes->transparentAlpha = GLX_DONT_CARE;
|
||||||
modes->transparentIndex = GLX_DONT_CARE;
|
modes->transparentIndex = GLX_DONT_CARE;
|
||||||
modes->visualType = GLX_DONT_CARE;
|
|
||||||
modes->renderType = GLX_RGBA_BIT;
|
|
||||||
modes->drawableType = GLX_WINDOW_BIT;
|
|
||||||
modes->rgbMode = GL_TRUE;
|
modes->rgbMode = GL_TRUE;
|
||||||
|
|
||||||
if ( db_modes[i] == GLX_NONE ) {
|
if ( db_modes[i] == GLX_NONE ) {
|
||||||
|
|
|
@ -1397,14 +1397,14 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
|
||||||
v->mesa_visual.redMask = visinfo->redMask;
|
v->mesa_visual.redMask = visinfo->redMask;
|
||||||
v->mesa_visual.greenMask = visinfo->greenMask;
|
v->mesa_visual.greenMask = visinfo->greenMask;
|
||||||
v->mesa_visual.blueMask = visinfo->blueMask;
|
v->mesa_visual.blueMask = visinfo->blueMask;
|
||||||
v->mesa_visual.visualID = visinfo->vid;
|
v->visualID = visinfo->vid;
|
||||||
v->mesa_visual.screen = 0; /* FIXME: What should be done here? */
|
v->screen = 0; /* FIXME: What should be done here? */
|
||||||
#else
|
#else
|
||||||
v->mesa_visual.redMask = visinfo->red_mask;
|
v->mesa_visual.redMask = visinfo->red_mask;
|
||||||
v->mesa_visual.greenMask = visinfo->green_mask;
|
v->mesa_visual.greenMask = visinfo->green_mask;
|
||||||
v->mesa_visual.blueMask = visinfo->blue_mask;
|
v->mesa_visual.blueMask = visinfo->blue_mask;
|
||||||
v->mesa_visual.visualID = visinfo->visualid;
|
v->visualID = visinfo->visualid;
|
||||||
v->mesa_visual.screen = visinfo->screen;
|
v->screen = visinfo->screen;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(XFree86Server) || !(defined(__cplusplus) || defined(c_plusplus))
|
#if defined(XFree86Server) || !(defined(__cplusplus) || defined(c_plusplus))
|
||||||
|
|
|
@ -86,6 +86,7 @@ enum pixel_format {
|
||||||
struct xmesa_visual {
|
struct xmesa_visual {
|
||||||
GLvisual mesa_visual; /* Device independent visual parameters */
|
GLvisual mesa_visual; /* Device independent visual parameters */
|
||||||
XMesaDisplay *display; /* The X11 display */
|
XMesaDisplay *display; /* The X11 display */
|
||||||
|
int screen, visualID;
|
||||||
#ifdef XFree86Server
|
#ifdef XFree86Server
|
||||||
GLint ColormapEntries;
|
GLint ColormapEntries;
|
||||||
GLint nplanes;
|
GLint nplanes;
|
||||||
|
|
|
@ -79,7 +79,7 @@ typedef XColor XMesaColor;
|
||||||
#define GET_GREENMASK(__v) __v->mesa_visual.greenMask
|
#define GET_GREENMASK(__v) __v->mesa_visual.greenMask
|
||||||
#define GET_BLUEMASK(__v) __v->mesa_visual.blueMask
|
#define GET_BLUEMASK(__v) __v->mesa_visual.blueMask
|
||||||
#define GET_VISUAL_DEPTH(__v) __v->visinfo->depth
|
#define GET_VISUAL_DEPTH(__v) __v->visinfo->depth
|
||||||
#define GET_BLACK_PIXEL(__v) BlackPixel(__v->display, __v->mesa_visual.screen)
|
#define GET_BLACK_PIXEL(__v) BlackPixel(__v->display, __v->screen)
|
||||||
#define CHECK_BYTE_ORDER(__v) host_byte_order()==ImageByteOrder(__v->display)
|
#define CHECK_BYTE_ORDER(__v) host_byte_order()==ImageByteOrder(__v->display)
|
||||||
#define CHECK_FOR_HPCR(__v) XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True)
|
#define CHECK_FOR_HPCR(__v) XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True)
|
||||||
|
|
||||||
|
|
|
@ -296,7 +296,6 @@ _mesa_initialize_visual( GLvisual *vis,
|
||||||
|
|
||||||
vis->numAuxBuffers = 0;
|
vis->numAuxBuffers = 0;
|
||||||
vis->level = 0;
|
vis->level = 0;
|
||||||
vis->pixmapMode = 0;
|
|
||||||
vis->sampleBuffers = numSamples > 0 ? 1 : 0;
|
vis->sampleBuffers = numSamples > 0 ? 1 : 0;
|
||||||
vis->samples = numSamples;
|
vis->samples = numSamples;
|
||||||
|
|
||||||
|
|
|
@ -160,20 +160,4 @@ typedef void *GLeglImageOES;
|
||||||
|
|
||||||
#define GLX_DONT_CARE 0xFFFFFFFF
|
#define GLX_DONT_CARE 0xFFFFFFFF
|
||||||
|
|
||||||
#define GLX_RGBA_BIT 0x00000001
|
|
||||||
#define GLX_COLOR_INDEX_BIT 0x00000002
|
|
||||||
#define GLX_WINDOW_BIT 0x00000001
|
|
||||||
#define GLX_PIXMAP_BIT 0x00000002
|
|
||||||
#define GLX_PBUFFER_BIT 0x00000004
|
|
||||||
|
|
||||||
#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
|
|
||||||
#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
|
|
||||||
#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
|
|
||||||
#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
|
|
||||||
#define GLX_Y_INVERTED_EXT 0x20D4
|
|
||||||
|
|
||||||
#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
|
|
||||||
#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
|
|
||||||
#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
|
|
||||||
|
|
||||||
#endif /* GLHEADER_H */
|
#endif /* GLHEADER_H */
|
||||||
|
|
|
@ -562,8 +562,6 @@ struct gl_shine_tab
|
||||||
* \sa _gl_context_modes_create
|
* \sa _gl_context_modes_create
|
||||||
*/
|
*/
|
||||||
typedef struct __GLcontextModesRec {
|
typedef struct __GLcontextModesRec {
|
||||||
struct __GLcontextModesRec * next;
|
|
||||||
|
|
||||||
GLboolean rgbMode;
|
GLboolean rgbMode;
|
||||||
GLboolean floatMode;
|
GLboolean floatMode;
|
||||||
GLboolean colorIndexMode;
|
GLboolean colorIndexMode;
|
||||||
|
@ -587,14 +585,6 @@ typedef struct __GLcontextModesRec {
|
||||||
|
|
||||||
GLint level;
|
GLint level;
|
||||||
|
|
||||||
GLint pixmapMode;
|
|
||||||
|
|
||||||
/* GLX */
|
|
||||||
GLint visualID;
|
|
||||||
GLint visualType; /**< One of the GLX X visual types. (i.e.,
|
|
||||||
* \c GLX_TRUE_COLOR, etc.)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* EXT_visual_rating / GLX 1.2 */
|
/* EXT_visual_rating / GLX 1.2 */
|
||||||
GLint visualRating;
|
GLint visualRating;
|
||||||
|
|
||||||
|
@ -608,12 +598,6 @@ typedef struct __GLcontextModesRec {
|
||||||
GLint sampleBuffers;
|
GLint sampleBuffers;
|
||||||
GLint samples;
|
GLint samples;
|
||||||
|
|
||||||
/* SGIX_fbconfig / GLX 1.3 */
|
|
||||||
GLint drawableType;
|
|
||||||
GLint renderType;
|
|
||||||
GLint xRenderable;
|
|
||||||
GLint fbconfigID;
|
|
||||||
|
|
||||||
/* SGIX_pbuffer / GLX 1.3 */
|
/* SGIX_pbuffer / GLX 1.3 */
|
||||||
GLint maxPbufferWidth;
|
GLint maxPbufferWidth;
|
||||||
GLint maxPbufferHeight;
|
GLint maxPbufferHeight;
|
||||||
|
@ -621,14 +605,9 @@ typedef struct __GLcontextModesRec {
|
||||||
GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */
|
GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */
|
||||||
GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */
|
GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */
|
||||||
|
|
||||||
/* SGIX_visual_select_group */
|
|
||||||
GLint visualSelectGroup;
|
|
||||||
|
|
||||||
/* OML_swap_method */
|
/* OML_swap_method */
|
||||||
GLint swapMethod;
|
GLint swapMethod;
|
||||||
|
|
||||||
GLint screen;
|
|
||||||
|
|
||||||
/* EXT_texture_from_pixmap */
|
/* EXT_texture_from_pixmap */
|
||||||
GLint bindToTextureRgb;
|
GLint bindToTextureRgb;
|
||||||
GLint bindToTextureRgba;
|
GLint bindToTextureRgba;
|
||||||
|
|
Loading…
Reference in New Issue