dri: Introduce new flags in __DRI_ATTRIB_RENDER_TYPE

Mark __DRI_ATTRIB_FLOAT_MODE as deprecated, and introduce new flags to
__DRI_ATTRIB_RENDER_TYPE for float modes.  Both signed float
(fbconfig_float) and unsigned (packed_float) are introduced. The old
attribute should be set for both float modes.

v2 (idr): Require that the render mode from the DRI attributes matches the
render mode of the config exactly.  This is the behavior of the old code.

Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 30ce175e6f0077a9d2772c6c31fe2eeb704b8f4e..5c99d5596df1b66a38e5e59cf0f0c305572ccc8b 100644 (file)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -552,6 +552,8 @@ struct __DRIuseInvalidateExtensionRec {
 #define __DRI_ATTRIB_RGBA_BIT                  0x01    
 #define __DRI_ATTRIB_COLOR_INDEX_BIT           0x02
 #define __DRI_ATTRIB_LUMINANCE_BIT             0x04
+#define __DRI_ATTRIB_FLOAT_BIT                 0x08
+#define __DRI_ATTRIB_UNSIGNED_FLOAT_BIT                0x10
 
 /* __DRI_ATTRIB_CONFIG_CAVEAT */
 #define __DRI_ATTRIB_SLOW_BIT                  0x01

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 1bce314fa999e02513874201d9a165093cea4fff..eb5aa3144faae958b911ff0a3fbc54137fdd13e6 100644 (file)
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -75,7 +75,7 @@ EGLint dri2_to_egl_attribute_map[] = {
    0,                          /* __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE */
    0,                          /* __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE */
    0,                          /* __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE */
-   0,                          /* __DRI_ATTRIB_FLOAT_MODE */
+   0,                          /* __DRI_ATTRIB_FLOAT_MODE (deprecated) */
    0,                          /* __DRI_ATTRIB_RED_MASK */
    0,                          /* __DRI_ATTRIB_GREEN_MASK */
    0,                          /* __DRI_ATTRIB_BLUE_MASK */

diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 32625e83d2543ca8c0a898fe3cd7718edda8ea01..b2a3117c5acd2c19ae10ebb412cd9fb3a0ec0244 100644 (file)
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -285,9 +285,15 @@ driConfigEqual(const __DRIcoreExtension *core,
          if (value & __DRI_ATTRIB_RGBA_BIT) {
             glxValue |= GLX_RGBA_BIT;
          }
-         else if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) {
+         if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) {
             glxValue |= GLX_COLOR_INDEX_BIT;
          }
+         if (value & __DRI_ATTRIB_FLOAT_BIT) {
+            glxValue |= GLX_RGBA_FLOAT_BIT_ARB;
+         }
+         if (value & __DRI_ATTRIB_UNSIGNED_FLOAT_BIT) {
+            glxValue |= GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT;
+         }
          if (glxValue != config->renderType)
             return GL_FALSE;
          break;

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index ac0773b0d4ca0fa4ec78bb651565ba1812298156..c9fc2189128806aeef7418e0871e0db14b7cd791 100644 (file)
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -366,7 +366,6 @@ static const struct { unsigned int attrib, offset; } attribMap[] = {
     __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE,     transparentGreen),
     __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,      transparentBlue),
     __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE,     transparentAlpha),
-    __ATTRIB(__DRI_ATTRIB_FLOAT_MODE,                  floatMode),
     __ATTRIB(__DRI_ATTRIB_RED_MASK,                    redMask),
     __ATTRIB(__DRI_ATTRIB_GREEN_MASK,                  greenMask),
     __ATTRIB(__DRI_ATTRIB_BLUE_MASK,                   blueMask),
@@ -418,11 +417,6 @@ driGetConfigAttribIndex(const __DRIconfig *config,
         /* XXX no return value??? */
        break;
 
-    case __DRI_ATTRIB_FLOAT_MODE:
-        /* this field is not int-sized */
-        *value = config->modes.floatMode;
-        break;
-
     default:
         /* any other int-sized field */
        *value = *(unsigned int *)