svn merge ^/branches/released .

8 files changed, 331 insertions, 12 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_blend.c b/mesalib/src/mesa/state_tracker/st_atom_blend.c
index e3b3b9936..c22d4c42e 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_blend.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_blend.c
@@ -286,7 +286,7 @@ update_blend( struct st_context *st )
 

    {

       struct pipe_blend_color bc;

-      COPY_4FV(bc.color, st->ctx->Color.BlendColor);

+      COPY_4FV(bc.color, st->ctx->Color.BlendColorUnclamped);

       cso_set_blend_color(st->cso_context, &bc);

    }

 }

diff --git a/mesalib/src/mesa/state_tracker/st_atom_depth.c b/mesalib/src/mesa/state_tracker/st_atom_depth.c
index e8e8db41d..524f8986f 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_depth.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_depth.c
@@ -142,7 +142,7 @@ update_depth_stencil_alpha(struct st_context *st)
    if (ctx->Color.AlphaEnabled) {

       dsa->alpha.enabled = 1;

       dsa->alpha.func = st_compare_func_to_pipe(ctx->Color.AlphaFunc);

-      dsa->alpha.ref_value = ctx->Color.AlphaRef;

+      dsa->alpha.ref_value = ctx->Color.AlphaRefUnclamped;

    }

 

    cso_set_depth_stencil_alpha(st->cso_context, dsa);

diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
index 4fad1f297..89ee4ebca 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -112,6 +112,8 @@ static void update_raster_state( struct st_context *st )
       raster->light_twoside = 1;

    }

 

+   raster->clamp_vertex_color = ctx->Light._ClampVertexColor;

+

    /* _NEW_POLYGON

     */

    if (ctx->Polygon.CullFlag) {

@@ -252,6 +254,9 @@ static void update_raster_state( struct st_context *st )
    if (ctx->Scissor.Enabled)

       raster->scissor = 1;

 

+   /* _NEW_FRAG_CLAMP */

+   raster->clamp_fragment_color = ctx->Color._ClampFragmentColor;

+

    raster->gl_rasterization_rules = 1;

 

    cso_set_rasterizer(st->cso_context, raster);

@@ -267,7 +272,8 @@ const struct st_tracked_state st_update_rasterizer = {
        _NEW_POINT |

        _NEW_POLYGON |

        _NEW_PROGRAM |

-       _NEW_SCISSOR),      /* mesa state dependencies*/

+       _NEW_SCISSOR |

+       _NEW_FRAG_CLAMP),      /* mesa state dependencies*/

       ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */

    },

    update_raster_state     /* update function */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c
index 0130c7a5a..31dcaf681 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_clear.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c
@@ -323,7 +323,7 @@ clear_with_quad(struct gl_context *ctx,
    set_vertex_shader(st);

 

    if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {

-      st_translate_color(ctx->Color.ClearColor,

+      st_translate_color(ctx->Color.ClearColorUnclamped,

                          ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,

                          clearColor);

    }

@@ -585,7 +585,7 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
                             clearColor);

       }

 

-      st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColor,

+      st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColorUnclamped,

                       ctx->Depth.Clear, ctx->Stencil.Clear);

    }

    if (mask & BUFFER_BIT_ACCUM)

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 2909d9d95..f159ed2db 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -296,7 +296,7 @@ base_format(GLenum format)
  * of the given format and type.

  */

 static GLenum

-internal_format(GLenum format, GLenum type)

+internal_format(struct gl_context *ctx, GLenum format, GLenum type)

 {

    switch (format) {

    case GL_DEPTH_COMPONENT:

@@ -326,7 +326,53 @@ internal_format(GLenum format, GLenum type)
          }

       }

       else {

-         return GL_RGBA;

+         switch (type) {

+         case GL_UNSIGNED_BYTE:

+         case GL_UNSIGNED_INT_8_8_8_8:

+         case GL_UNSIGNED_INT_8_8_8_8_REV:

+         default:

+            return GL_RGBA8;

+

+         case GL_UNSIGNED_BYTE_3_3_2:

+         case GL_UNSIGNED_BYTE_2_3_3_REV:

+         case GL_UNSIGNED_SHORT_4_4_4_4:

+         case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+            return GL_RGBA4;

+

+         case GL_UNSIGNED_SHORT_5_6_5:

+         case GL_UNSIGNED_SHORT_5_6_5_REV:

+         case GL_UNSIGNED_SHORT_5_5_5_1:

+         case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+            return GL_RGB5_A1;

+

+         case GL_UNSIGNED_INT_10_10_10_2:

+         case GL_UNSIGNED_INT_2_10_10_10_REV:

+            return GL_RGB10_A2;

+

+         case GL_UNSIGNED_SHORT:

+         case GL_UNSIGNED_INT:

+            return GL_RGBA16;

+

+         case GL_BYTE:

+            return

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA8_SNORM : GL_RGBA8;

+

+         case GL_SHORT:

+         case GL_INT:

+            return

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+

+         case GL_HALF_FLOAT_ARB:

+            return

+               ctx->Extensions.ARB_texture_float ? GL_RGBA16F :

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+

+         case GL_FLOAT:

+         case GL_DOUBLE:

+            return

+               ctx->Extensions.ARB_texture_float ? GL_RGBA32F :

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+         }

       }

    }

 }

@@ -369,7 +415,7 @@ make_texture(struct st_context *st,
    GLenum baseFormat, intFormat;

 

    baseFormat = base_format(format);

-   intFormat = internal_format(format, type);

+   intFormat = internal_format(ctx, format, type);

 

    mformat = st_ChooseTextureFormat_renderable(ctx, intFormat,

                                                format, type, GL_FALSE);

@@ -582,6 +628,7 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
    {

       struct pipe_rasterizer_state rasterizer;

       memset(&rasterizer, 0, sizeof(rasterizer));

+      rasterizer.clamp_fragment_color = ctx->Color._ClampFragmentColor;

       rasterizer.gl_rasterization_rules = 1;

       rasterizer.scissor = ctx->Scissor.Enabled;

       cso_set_rasterizer(cso, &rasterizer);

diff --git a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
index 687a49a57..425019dca 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
@@ -331,7 +331,7 @@ st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei h
    struct st_context *st = st_context(ctx);

    struct pipe_context *pipe = st->pipe;

    GLfloat (*temp)[4];

-   const GLbitfield transferOps = ctx->_ImageTransferState;

+   GLbitfield transferOps = ctx->_ImageTransferState;

    GLsizei i, j;

    GLint yStep, dfStride;

    GLfloat *df;

@@ -391,7 +391,10 @@ st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei h
       return;

    }

 

-   if (format == GL_RGBA && type == GL_FLOAT) {

+   if(ctx->Color._ClampReadColor)

+      transferOps |= IMAGE_CLAMP_BIT;

+

+   if (format == GL_RGBA && type == GL_FLOAT && !transferOps) {

       /* write tile(row) directly into user's buffer */

       df = (GLfloat *) _mesa_image_address2d(&clippedPacking, dest, width,

                                              height, format, type, 0, 0);

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 2153865cf..bb4099a95 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -453,6 +453,12 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

    }

 

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_texture_snorm = GL_TRUE;

+   }

+

    /* ycbcr support */

    if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

                                    PIPE_TEXTURE_2D, 0,

@@ -508,6 +514,35 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.ARB_depth_clamp = GL_TRUE;

    }

 

+   /* This extension does not actually require support of floating point

+    * render targets, just clamping controls.

+    * Advertise this extension if either fragment color clamping is supported

+    * or no render targets having color values outside of the range [0, 1]

+    * are supported, in which case the fragment color clamping has no effect

+    * on rendering.

+    */

+   if (screen->get_param(screen, PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL) ||

+       (!screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM,

+                                             PIPE_TEXTURE_2D, 0,

+                                             PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET))) {

+      ctx->Extensions.ARB_color_buffer_float = GL_TRUE;

+   }

+

    if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {

       ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;

    }

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 0e67a6bc2..e057958e6 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -259,6 +259,39 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
    case MESA_FORMAT_SIGNED_LA_LATC2:

       return PIPE_FORMAT_LATC2_SNORM;

 

+   /* signed normalized formats */

+   case MESA_FORMAT_SIGNED_R8:

+      return PIPE_FORMAT_R8_SNORM;

+   case MESA_FORMAT_SIGNED_RG88_REV:

+      return PIPE_FORMAT_R8G8_SNORM;

+   case MESA_FORMAT_SIGNED_RGBA8888_REV:

+      return PIPE_FORMAT_R8G8B8A8_SNORM;

+

+   case MESA_FORMAT_SIGNED_A8:

+      return PIPE_FORMAT_A8_SNORM;

+   case MESA_FORMAT_SIGNED_L8:

+      return PIPE_FORMAT_L8_SNORM;

+   case MESA_FORMAT_SIGNED_AL88:

+      return PIPE_FORMAT_L8A8_SNORM;

+   case MESA_FORMAT_SIGNED_I8:

+      return PIPE_FORMAT_I8_SNORM;

+

+   case MESA_FORMAT_SIGNED_R16:

+      return PIPE_FORMAT_R16_SNORM;

+   case MESA_FORMAT_SIGNED_GR1616:

+      return PIPE_FORMAT_R16G16_SNORM;

+   case MESA_FORMAT_SIGNED_RGBA_16:

+      return PIPE_FORMAT_R16G16B16A16_SNORM;

+

+   case MESA_FORMAT_SIGNED_A16:

+      return PIPE_FORMAT_A16_SNORM;

+   case MESA_FORMAT_SIGNED_L16:

+      return PIPE_FORMAT_L16_SNORM;

+   case MESA_FORMAT_SIGNED_AL1616:

+      return PIPE_FORMAT_L16A16_SNORM;

+   case MESA_FORMAT_SIGNED_I16:

+      return PIPE_FORMAT_I16_SNORM;

+

    default:

       assert(0);

       return PIPE_FORMAT_NONE;

@@ -318,8 +351,6 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
 

    case PIPE_FORMAT_R16G16B16A16_UNORM:

       return MESA_FORMAT_RGBA_16;

-   case PIPE_FORMAT_R16G16B16A16_SNORM:

-      return MESA_FORMAT_SIGNED_RGBA_16;

 

    case PIPE_FORMAT_Z16_UNORM:

       return MESA_FORMAT_Z16;

@@ -416,6 +447,39 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_LATC2_SNORM:

       return MESA_FORMAT_SIGNED_LA_LATC2;

 

+   /* signed normalized formats */

+   case PIPE_FORMAT_R8_SNORM:

+      return MESA_FORMAT_SIGNED_R8;

+   case PIPE_FORMAT_R8G8_SNORM:

+      return MESA_FORMAT_SIGNED_RG88_REV;

+   case PIPE_FORMAT_R8G8B8A8_SNORM:

+      return MESA_FORMAT_SIGNED_RGBA8888_REV;

+

+   case PIPE_FORMAT_A8_SNORM:

+      return MESA_FORMAT_SIGNED_A8;

+   case PIPE_FORMAT_L8_SNORM:

+      return MESA_FORMAT_SIGNED_L8;

+   case PIPE_FORMAT_L8A8_SNORM:

+      return MESA_FORMAT_SIGNED_AL88;

+   case PIPE_FORMAT_I8_SNORM:

+      return MESA_FORMAT_SIGNED_I8;

+

+   case PIPE_FORMAT_R16_SNORM:

+      return MESA_FORMAT_SIGNED_R16;

+   case PIPE_FORMAT_R16G16_SNORM:

+      return MESA_FORMAT_SIGNED_GR1616;

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      return MESA_FORMAT_SIGNED_RGBA_16;

+

+   case PIPE_FORMAT_A16_SNORM:

+      return MESA_FORMAT_SIGNED_A16;

+   case PIPE_FORMAT_L16_SNORM:

+      return MESA_FORMAT_SIGNED_L16;

+   case PIPE_FORMAT_L16A16_SNORM:

+      return MESA_FORMAT_SIGNED_AL1616;

+   case PIPE_FORMAT_I16_SNORM:

+      return MESA_FORMAT_SIGNED_I16;

+

    default:

       assert(0);

       return MESA_FORMAT_NONE;

@@ -999,6 +1063,170 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
          return PIPE_FORMAT_R32G32B32A32_USCALED;

       return PIPE_FORMAT_NONE;

 

+   /* signed normalized formats */

+   case GL_RED_SNORM:

+   case GL_R8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R8_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_R16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16_SNORM,

+            PIPE_FORMAT_R16G16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RG_SNORM:

+   case GL_RG8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RG16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16G16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RGB_SNORM:

+   case GL_RGB8_SNORM:

+   case GL_RGBA_SNORM:

+   case GL_RGBA8_SNORM:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R8G8B8A8_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RGB16_SNORM:

+   case GL_RGBA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+

+   case GL_ALPHA_SNORM:

+   case GL_ALPHA8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_ALPHA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_A16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE_SNORM:

+   case GL_LUMINANCE8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_L8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE_ALPHA_SNORM:

+   case GL_LUMINANCE8_ALPHA8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L8A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE16_ALPHA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L16A16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_L8A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_INTENSITY_SNORM:

+   case GL_INTENSITY8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_I8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_INTENSITY16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_I16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_I8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

    default:

       return PIPE_FORMAT_NONE;

    }