From 705e142dda047f24b563fc2bea0f922173e91d1b Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 12 Oct 2010 11:40:05 -0400 Subject: gl: Remove unused GLcontextModes fields --- src/mesa/main/context.c | 1 - src/mesa/main/glheader.h | 16 ---------------- src/mesa/main/mtypes.h | 21 --------------------- 3 files changed, 38 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 0a527040d9..a3479f1f7d 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -296,7 +296,6 @@ _mesa_initialize_visual( GLvisual *vis, vis->numAuxBuffers = 0; vis->level = 0; - vis->pixmapMode = 0; vis->sampleBuffers = numSamples > 0 ? 1 : 0; vis->samples = numSamples; diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 1fe8c99f0f..0c9013de66 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -160,20 +160,4 @@ typedef void *GLeglImageOES; #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 */ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index f428922814..8eae64b62a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -562,8 +562,6 @@ struct gl_shine_tab * \sa _gl_context_modes_create */ typedef struct __GLcontextModesRec { - struct __GLcontextModesRec * next; - GLboolean rgbMode; GLboolean floatMode; GLboolean colorIndexMode; @@ -587,14 +585,6 @@ typedef struct __GLcontextModesRec { 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 */ GLint visualRating; @@ -608,12 +598,6 @@ typedef struct __GLcontextModesRec { GLint sampleBuffers; GLint samples; - /* SGIX_fbconfig / GLX 1.3 */ - GLint drawableType; - GLint renderType; - GLint xRenderable; - GLint fbconfigID; - /* SGIX_pbuffer / GLX 1.3 */ GLint maxPbufferWidth; GLint maxPbufferHeight; @@ -621,14 +605,9 @@ typedef struct __GLcontextModesRec { GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */ GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */ - /* SGIX_visual_select_group */ - GLint visualSelectGroup; - /* OML_swap_method */ GLint swapMethod; - GLint screen; - /* EXT_texture_from_pixmap */ GLint bindToTextureRgb; GLint bindToTextureRgba; -- cgit v1.2.3