svn merge ^/branches/released .

9 files changed, 256 insertions, 9 deletions

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index da55c61f9..9c59ed82c 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -124,6 +124,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },

    { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },

    { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },

+   { "GL_ARB_texture_float",                       o(ARB_texture_float),                       GL,             2004 },

    { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },

    { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },

    { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },

@@ -268,6 +269,7 @@ static const struct extension extension_table[] = {
    { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },

    { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },

    { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },

+   { "GL_ATI_texture_float",                       o(ARB_texture_float),                       GL,             2002 },

    { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },

    { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },

    { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },

@@ -278,7 +280,6 @@ static const struct extension extension_table[] = {
    { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },

    { "GL_MESA_texture_signed_rgba",                o(EXT_texture_snorm),                       GL,             2009 },

    { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },

-   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL,             2009 },

    { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },

    { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },

    { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 76493f1a8..a961e68cb 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -1145,7 +1145,37 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
    case GL_INTENSITY16_SNORM:

       return ctx->Extensions.EXT_texture_snorm &&

              ctx->Extensions.ARB_framebuffer_object ? GL_INTENSITY : 0;

-   /* XXX add floating point and integer formats eventually */

+   case GL_R16F:

+   case GL_R32F:

+      return ctx->Extensions.ARB_texture_rg &&

+             ctx->Extensions.ARB_texture_float ? GL_RED : 0;

+   case GL_RG16F:

+   case GL_RG32F:

+      return ctx->Extensions.ARB_texture_rg &&

+             ctx->Extensions.ARB_texture_float ? GL_RG : 0;

+   case GL_RGB16F:

+   case GL_RGB32F:

+      return ctx->Extensions.ARB_texture_float ? GL_RGB : 0;

+   case GL_RGBA16F:

+   case GL_RGBA32F:

+      return ctx->Extensions.ARB_texture_float ? GL_RGBA : 0;

+   case GL_ALPHA16F_ARB:

+   case GL_ALPHA32F_ARB:

+      return ctx->Extensions.ARB_texture_float &&

+             ctx->Extensions.ARB_framebuffer_object ? GL_ALPHA : 0;

+   case GL_LUMINANCE16F_ARB:

+   case GL_LUMINANCE32F_ARB:

+      return ctx->Extensions.ARB_texture_float &&

+             ctx->Extensions.ARB_framebuffer_object ? GL_LUMINANCE : 0;

+   case GL_LUMINANCE_ALPHA16F_ARB:

+   case GL_LUMINANCE_ALPHA32F_ARB:

+      return ctx->Extensions.ARB_texture_float &&

+             ctx->Extensions.ARB_framebuffer_object ? GL_LUMINANCE_ALPHA : 0;

+   case GL_INTENSITY16F_ARB:

+   case GL_INTENSITY32F_ARB:

+      return ctx->Extensions.ARB_texture_float &&

+             ctx->Extensions.ARB_framebuffer_object ? GL_INTENSITY : 0;

+   /* XXX add integer formats eventually */

    default:

       return 0;

    }

diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 8d2d4bfc1..5ae8e2e29 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -677,7 +677,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
    {

       MESA_FORMAT_LUMINANCE_FLOAT32,

       "MESA_FORMAT_LUMINANCE_FLOAT32",

-      GL_ALPHA,

+      GL_LUMINANCE,

       GL_FLOAT,

       0, 0, 0, 0,

       32, 0, 0, 0, 0,

@@ -686,7 +686,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
    {

       MESA_FORMAT_LUMINANCE_FLOAT16,

       "MESA_FORMAT_LUMINANCE_FLOAT16",

-      GL_ALPHA,

+      GL_LUMINANCE,

       GL_FLOAT,

       0, 0, 0, 0,

       16, 0, 0, 0, 0,

@@ -728,6 +728,42 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 16, 0, 0, 0,

       1, 1, 2

    },

+   {

+      MESA_FORMAT_R_FLOAT32,

+      "MESA_FORMAT_R_FLOAT32",

+      GL_RED,

+      GL_FLOAT,

+      32, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_R_FLOAT16,

+      "MESA_FORMAT_R_FLOAT16",

+      GL_RED,

+      GL_FLOAT,

+      16, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_RG_FLOAT32,

+      "MESA_FORMAT_RG_FLOAT32",

+      GL_RG,

+      GL_FLOAT,

+      32, 32, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_RG_FLOAT16,

+      "MESA_FORMAT_RG_FLOAT16",

+      GL_RG,

+      GL_FLOAT,

+      16, 16, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

 

    /* unnormalized signed int formats */

    {

@@ -1714,22 +1750,26 @@ _mesa_format_to_type_and_comps(gl_format format,
       *comps = 3;

       return;

    case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:

+   case MESA_FORMAT_RG_FLOAT32:

       *datatype = GL_FLOAT;

       *comps = 2;

       return;

    case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:

+   case MESA_FORMAT_RG_FLOAT16:

       *datatype = GL_HALF_FLOAT_ARB;

       *comps = 2;

       return;

    case MESA_FORMAT_ALPHA_FLOAT32:

    case MESA_FORMAT_LUMINANCE_FLOAT32:

    case MESA_FORMAT_INTENSITY_FLOAT32:

+   case MESA_FORMAT_R_FLOAT32:

       *datatype = GL_FLOAT;

       *comps = 1;

       return;

    case MESA_FORMAT_ALPHA_FLOAT16:

    case MESA_FORMAT_LUMINANCE_FLOAT16:

    case MESA_FORMAT_INTENSITY_FLOAT16:

+   case MESA_FORMAT_R_FLOAT16:

       *datatype = GL_HALF_FLOAT_ARB;

       *comps = 1;

       return;

diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index 1eaca9b4c..492eef917 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -142,6 +142,10 @@ typedef enum
    MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,

    MESA_FORMAT_INTENSITY_FLOAT32,

    MESA_FORMAT_INTENSITY_FLOAT16,

+   MESA_FORMAT_R_FLOAT32,

+   MESA_FORMAT_R_FLOAT16,

+   MESA_FORMAT_RG_FLOAT32,

+   MESA_FORMAT_RG_FLOAT16,

    /*@}*/

 

    /**

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index b741c51ab..6acfa7660 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -551,7 +551,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
             fb->Visual.alphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS);

             fb->Visual.rgbBits = fb->Visual.redBits

                + fb->Visual.greenBits + fb->Visual.blueBits;

-            fb->Visual.floatMode = GL_FALSE;

             fb->Visual.samples = rb->NumSamples;

             if (_mesa_get_format_color_encoding(fmt) == GL_SRGB)

                 fb->Visual.sRGBCapable = ctx->Const.sRGBCapable;

@@ -560,6 +559,19 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
       }

    }

 

+   fb->Visual.floatMode = GL_FALSE;

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      if (fb->Attachment[i].Renderbuffer) {

+         const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;

+         const gl_format fmt = rb->Format;

+

+         if (_mesa_get_format_datatype(fmt) == GL_FLOAT) {

+            fb->Visual.floatMode = GL_TRUE;

+            break;

+         }

+      }

+   }

+

    if (fb->Attachment[BUFFER_DEPTH].Renderbuffer) {

       const struct gl_renderbuffer *rb =

          fb->Attachment[BUFFER_DEPTH].Renderbuffer;

diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index b3ac64f6f..cb2716619 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -631,6 +631,34 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_3d_f_intensity_f16,

       store_texel_intensity_f16

    },

+   {

+      MESA_FORMAT_R_FLOAT32,

+      fetch_texel_1d_f_r_f32,

+      fetch_texel_2d_f_r_f32,

+      fetch_texel_3d_f_r_f32,

+      store_texel_r_f32

+   },

+   {

+      MESA_FORMAT_R_FLOAT16,

+      fetch_texel_1d_f_r_f16,

+      fetch_texel_2d_f_r_f16,

+      fetch_texel_3d_f_r_f16,

+      store_texel_r_f16

+   },

+   {

+      MESA_FORMAT_RG_FLOAT32,

+      fetch_texel_1d_f_rg_f32,

+      fetch_texel_2d_f_rg_f32,

+      fetch_texel_3d_f_rg_f32,

+      store_texel_rg_f32

+   },

+   {

+      MESA_FORMAT_RG_FLOAT16,

+      fetch_texel_1d_f_rg_f16,

+      fetch_texel_2d_f_rg_f16,

+      fetch_texel_3d_f_rg_f16,

+      store_texel_rg_f16

+   },

 

    /* non-normalized, signed int */

    {

diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h
index fe525aa62..57bb94c68 100644
--- a/mesalib/src/mesa/main/texfetch_tmp.h
+++ b/mesalib/src/mesa/main/texfetch_tmp.h
@@ -438,6 +438,110 @@ static void store_texel_intensity_f16(struct gl_texture_image *texImage,
 #endif

 

 

+/* MESA_FORMAT_R_FLOAT32 *****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D R_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_r_f32)( const struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   texel[RCOMP] = src[0];

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_r_f32(struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   dst[0] = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_R_FLOAT16 *****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D R_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_r_f16)( const struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   texel[RCOMP] = _mesa_half_to_float(src[0]);

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_r_f16(struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   dst[0] = _mesa_float_to_half(rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RG_FLOAT32 ****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RG_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_rg_f32)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);

+   texel[RCOMP] = src[0];

+   texel[GCOMP] = src[1];

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rg_f32(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RG_FLOAT16 ****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RG_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_rg_f16)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);

+   texel[RCOMP] = _mesa_half_to_float(src[0]);

+   texel[GCOMP] = _mesa_half_to_float(src[1]);

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rg_f16(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);

+   dst[0] = _mesa_float_to_half(rgba[RCOMP]);

+   dst[1] = _mesa_float_to_half(rgba[GCOMP]);

+}

+#endif

 

 

 /*

diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index e22e90693..99513a222 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -628,6 +628,22 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       }

    }

 

+   if (ctx->Extensions.ARB_texture_rg && ctx->Extensions.ARB_texture_float) {

+      switch (internalFormat) {

+      case GL_R16F:

+	 return MESA_FORMAT_R_FLOAT16;

+      case GL_R32F:

+         return MESA_FORMAT_R_FLOAT32;

+      case GL_RG16F:

+	 return MESA_FORMAT_RG_FLOAT16;

+      case GL_RG32F:

+         return MESA_FORMAT_RG_FLOAT32;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

    if (ctx->Extensions.EXT_texture_format_BGRA8888) {

       switch (internalFormat) {

       case GL_BGRA:

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 46ae867c1..066535111 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -3535,13 +3535,17 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_ALPHA_FLOAT32 ||

           dstFormat == MESA_FORMAT_LUMINANCE_FLOAT32 ||

           dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 ||

-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT32);

+          dstFormat == MESA_FORMAT_INTENSITY_FLOAT32 ||

+          dstFormat == MESA_FORMAT_R_FLOAT32 ||

+          dstFormat == MESA_FORMAT_RG_FLOAT32);

    ASSERT(baseInternalFormat == GL_RGBA ||

           baseInternalFormat == GL_RGB ||

           baseInternalFormat == GL_ALPHA ||

           baseInternalFormat == GL_LUMINANCE ||

           baseInternalFormat == GL_LUMINANCE_ALPHA ||

-          baseInternalFormat == GL_INTENSITY);

+          baseInternalFormat == GL_INTENSITY ||

+          baseInternalFormat == GL_RED ||

+          baseInternalFormat == GL_RG);

    ASSERT(texelBytes == components * sizeof(GLfloat));

 

    if (!ctx->_ImageTransferState &&

@@ -3605,13 +3609,17 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_ALPHA_FLOAT16 ||

           dstFormat == MESA_FORMAT_LUMINANCE_FLOAT16 ||

           dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 ||

-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT16);

+          dstFormat == MESA_FORMAT_INTENSITY_FLOAT16 ||

+          dstFormat == MESA_FORMAT_R_FLOAT16 ||

+          dstFormat == MESA_FORMAT_RG_FLOAT16);

    ASSERT(baseInternalFormat == GL_RGBA ||

           baseInternalFormat == GL_RGB ||

           baseInternalFormat == GL_ALPHA ||

           baseInternalFormat == GL_LUMINANCE ||

           baseInternalFormat == GL_LUMINANCE_ALPHA ||

-          baseInternalFormat == GL_INTENSITY);

+          baseInternalFormat == GL_INTENSITY ||

+          baseInternalFormat == GL_RED ||

+          baseInternalFormat == GL_RG);

    ASSERT(texelBytes == components * sizeof(GLhalfARB));

 

    if (!ctx->_ImageTransferState &&

@@ -4252,6 +4260,10 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },

    { MESA_FORMAT_INTENSITY_FLOAT32, _mesa_texstore_rgba_float32 },

    { MESA_FORMAT_INTENSITY_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_R_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_R_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_RG_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_RG_FLOAT16, _mesa_texstore_rgba_float16 },

 

    { MESA_FORMAT_RGBA_INT8, _mesa_texstore_rgba_int8 },

    { MESA_FORMAT_RGBA_INT16, _mesa_texstore_rgba_int16 },