From: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed, 28 Jul 2010 13:14:55 +0000 (-0400)
Subject: glx: Delete unused glcontextmodes.c functions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4f9f066485d93cd6bb0e21fec0775ceed96d14de;p=mesa.git

glx: Delete unused glcontextmodes.c functions
---

diff --git a/src/glx/glcontextmodes.c b/src/glx/glcontextmodes.c
index 7778eea1992..18c45d59d73 100644
--- a/src/glx/glcontextmodes.c
+++ b/src/glx/glcontextmodes.c
@@ -61,29 +61,6 @@ _gl_convert_from_x_visual_type(int visualType)
       ? glx_visual_types[visualType] : GLX_NONE;
 }
 
-
-/**
- * Convert a GLX visual type to an X visual type.
- * 
- * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, 
- *                   \c GLX_STATIC_GRAY, etc.) to be converted.
- * \return If \c visualType is a valid GLX visual type, an X visual type will
- *         be returned.  Otherwise -1 will be returned.
- */
-GLint
-_gl_convert_to_x_visual_type(int visualType)
-{
-   static const int x_visual_types[NUM_VISUAL_TYPES] = {
-      TrueColor, DirectColor,
-      PseudoColor, StaticColor,
-      GrayScale, StaticGray
-   };
-
-   return ((unsigned) (visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES)
-      ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1;
-}
-
-
 /**
  * Get data from a GL context mode.
  * 
@@ -365,66 +342,3 @@ _gl_context_modes_find_fbconfig(__GLcontextModes * modes, int fbid)
 
    return NULL;
 }
-
-/**
- * Determine if two context-modes are the same.  This is intended to be used
- * by libGL implementations to compare to sets of driver generated FBconfigs.
- * 
- * \param a  Context-mode to be compared.
- * \param b  Context-mode to be compared.
- * \returns \c GL_TRUE if the two context-modes are the same.  \c GL_FALSE is
- *          returned otherwise.
- */
-GLboolean
-_gl_context_modes_are_same(const __GLcontextModes * a,
-                           const __GLcontextModes * b)
-{
-   return ((a->rgbMode == b->rgbMode) &&
-           (a->floatMode == b->floatMode) &&
-           (a->colorIndexMode == b->colorIndexMode) &&
-           (a->doubleBufferMode == b->doubleBufferMode) &&
-           (a->stereoMode == b->stereoMode) &&
-           (a->redBits == b->redBits) &&
-           (a->greenBits == b->greenBits) &&
-           (a->blueBits == b->blueBits) && (a->alphaBits == b->alphaBits) &&
-#if 0                           /* For some reason these don't get set on the client-side in libGL. */
-           (a->redMask == b->redMask) &&
-           (a->greenMask == b->greenMask) &&
-           (a->blueMask == b->blueMask) && (a->alphaMask == b->alphaMask) &&
-#endif
-           (a->rgbBits == b->rgbBits) &&
-           (a->indexBits == b->indexBits) &&
-           (a->accumRedBits == b->accumRedBits) &&
-           (a->accumGreenBits == b->accumGreenBits) &&
-           (a->accumBlueBits == b->accumBlueBits) &&
-           (a->accumAlphaBits == b->accumAlphaBits) &&
-           (a->depthBits == b->depthBits) &&
-           (a->stencilBits == b->stencilBits) &&
-           (a->numAuxBuffers == b->numAuxBuffers) &&
-           (a->level == b->level) &&
-           (a->pixmapMode == b->pixmapMode) &&
-           (a->visualRating == b->visualRating) &&
-           (a->transparentPixel == b->transparentPixel) &&
-           ((a->transparentPixel != GLX_TRANSPARENT_RGB) ||
-            ((a->transparentRed == b->transparentRed) &&
-             (a->transparentGreen == b->transparentGreen) &&
-             (a->transparentBlue == b->transparentBlue) &&
-             (a->transparentAlpha == b->transparentAlpha))) &&
-           ((a->transparentPixel != GLX_TRANSPARENT_INDEX) ||
-            (a->transparentIndex == b->transparentIndex)) &&
-           (a->sampleBuffers == b->sampleBuffers) &&
-           (a->samples == b->samples) &&
-           ((a->drawableType & b->drawableType) != 0) &&
-           (a->renderType == b->renderType) &&
-           (a->maxPbufferWidth == b->maxPbufferWidth) &&
-           (a->maxPbufferHeight == b->maxPbufferHeight) &&
-           (a->maxPbufferPixels == b->maxPbufferPixels) &&
-           (a->optimalPbufferWidth == b->optimalPbufferWidth) &&
-           (a->optimalPbufferHeight == b->optimalPbufferHeight) &&
-           (a->swapMethod == b->swapMethod) &&
-           (a->bindToTextureRgb == b->bindToTextureRgb) &&
-           (a->bindToTextureRgba == b->bindToTextureRgba) &&
-           (a->bindToMipmapTexture == b->bindToMipmapTexture) &&
-           (a->bindToTextureTargets == b->bindToTextureTargets) &&
-           (a->yInverted == b->yInverted));
-}
diff --git a/src/glx/glcontextmodes.h b/src/glx/glcontextmodes.h
index 7e6590624bf..be2b29a1952 100644
--- a/src/glx/glcontextmodes.h
+++ b/src/glx/glcontextmodes.h
@@ -39,10 +39,6 @@ typedef struct __GLcontextModesRec {
     GLuint doubleBufferMode;
     GLuint stereoMode;
 
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
-
     GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
     GLuint redMask, greenMask, blueMask, alphaMask;
     GLint rgbBits;		/* total bits for rgb */
@@ -121,10 +117,8 @@ typedef struct __GLcontextModesRec {
    (__GLX_MIN_CONFIG_PROPS + 2 * __GLX_EXT_CONFIG_PROPS)
 
 extern GLint _gl_convert_from_x_visual_type(int visualType);
-extern GLint _gl_convert_to_x_visual_type(int visualType);
 extern int _gl_get_context_mode_data(const __GLcontextModes * mode,
                                      int attribute, int *value_return);
-
 extern __GLcontextModes *_gl_context_modes_create(unsigned count,
                                                   size_t minimum_size);
 extern void _gl_context_modes_destroy(__GLcontextModes * modes);
@@ -132,7 +126,5 @@ extern __GLcontextModes *_gl_context_modes_find_visual(__GLcontextModes *
                                                        modes, int vid);
 extern __GLcontextModes *_gl_context_modes_find_fbconfig(__GLcontextModes *
                                                          modes, int fbid);
-extern GLboolean _gl_context_modes_are_same(const __GLcontextModes * a,
-                                            const __GLcontextModes * b);
 
 #endif /* GLCONTEXTMODES_H */
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 4a9c9d499e7..7612e5e8340 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -573,13 +573,6 @@ __glXInitializeVisualConfigFromTags(__GLcontextModes * config, int count,
 
    config->renderType =
       (config->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;
-
-   config->haveAccumBuffer = ((config->accumRedBits +
-                               config->accumGreenBits +
-                               config->accumBlueBits +
-                               config->accumAlphaBits) > 0);
-   config->haveDepthBuffer = (config->depthBits > 0);
-   config->haveStencilBuffer = (config->stencilBits > 0);
 }
 
 static __GLcontextModes *