more work on _eglConfigToContextModesRec()

diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 34195c5277d92d5043e4b6ec9aaaf07070deabf9..31a91e5de68599dd799da1f96633dbe203662895 100644 (file)
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -19,7 +19,7 @@
 /**
  * Convert an _EGLConfig to a __GLcontextModes object.
  */
-static void
+void
 _eglConfigToContextModesRec(const _EGLConfig *config, __GLcontextModes *mode)
 {
    memset(mode, 0, sizeof(*mode));
@@ -33,8 +33,7 @@ _eglConfigToContextModesRec(const _EGLConfig *config, __GLcontextModes *mode)
    mode->greenBits = GET_CONFIG_ATTRIB(config, EGL_GREEN_SIZE);
    mode->blueBits = GET_CONFIG_ATTRIB(config, EGL_BLUE_SIZE);
    mode->alphaBits = GET_CONFIG_ATTRIB(config, EGL_ALPHA_SIZE);
-   mode->rgbBits = mode->redBits + mode->greenBits
-      + mode->blueBits + mode->alphaBits;
+   mode->rgbBits = GET_CONFIG_ATTRIB(config, EGL_BUFFER_SIZE);
 
    mode->depthBits = GET_CONFIG_ATTRIB(config, EGL_DEPTH_SIZE);
    mode->haveDepthBuffer = mode->depthBits > 0;
@@ -42,6 +41,8 @@ _eglConfigToContextModesRec(const _EGLConfig *config, __GLcontextModes *mode)
    mode->stencilBits = GET_CONFIG_ATTRIB(config, EGL_STENCIL_SIZE);
    mode->haveStencilBuffer = mode->stencilBits > 0;
 
+   /* no accum */
+
    mode->level = GET_CONFIG_ATTRIB(config, EGL_LEVEL);
    mode->samples = GET_CONFIG_ATTRIB(config, EGL_SAMPLES);
    mode->sampleBuffers = GET_CONFIG_ATTRIB(config, EGL_SAMPLE_BUFFERS);

diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h
index 3ec8a7577487333e02be651a8ada7d8bd0bc30a3..f311e0702acc4c1a45ec3ecf499acf51a9da3867 100644 (file)
--- a/src/egl/main/eglconfig.h
+++ b/src/egl/main/eglconfig.h
@@ -18,7 +18,7 @@ struct _egl_config
 };
 
 
-
+#define SET_CONFIG_ATTRIB(CONF, ATTR, VAL) ((CONF)->Attrib[(ATTR) - FIRST_ATTRIB] = VAL)
 #define GET_CONFIG_ATTRIB(CONF, ATTR) ((CONF)->Attrib[(ATTR) - FIRST_ATTRIB])
 
 
@@ -69,4 +69,8 @@ _eglFillInConfigs( _EGLConfig *configs,
                const GLenum * db_modes, unsigned num_db_modes,
                int visType );
                 
+extern void
+_eglConfigToContextModesRec(const _EGLConfig *config, __GLcontextModes *mode);
+
+
 #endif /* EGLCONFIG_INCLUDED */