svn merge ^/branches/released .

6 files changed, 64 insertions, 56 deletions

diff --git a/mesalib/src/mesa/program/arbprogparse.c b/mesalib/src/mesa/program/arbprogparse.c
index ebbc195bc..08b57930b 100644
--- a/mesalib/src/mesa/program/arbprogparse.c
+++ b/mesalib/src/mesa/program/arbprogparse.c
@@ -144,7 +144,10 @@ _mesa_parse_arb_fragment_program(struct gl_context* ctx, GLenum target,
     * from the fragment shader.

     */

    if (program->FogOption != GL_NONE) {

-      _mesa_append_fog_code(ctx, program);

+      /* XXX: we should somehow recompile this to remove clamping if disabled

+       * On the ATI driver, this is unclampled if fragment clamping is disabled

+       */

+      _mesa_append_fog_code(ctx, program, GL_TRUE);

       program->FogOption = GL_NONE;

    }

 

diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index c1b28ec3f..dc5b5353b 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -754,27 +754,8 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
 

    if (ir->mode == ir_var_uniform && strncmp(ir->name, "gl_", 3) == 0) {

       unsigned int i;

-      const struct gl_builtin_uniform_desc *statevar;

-

-      for (i = 0; _mesa_builtin_uniform_desc[i].name; i++) {

-	 if (strcmp(ir->name, _mesa_builtin_uniform_desc[i].name) == 0)

-	    break;

-      }

-

-      if (!_mesa_builtin_uniform_desc[i].name) {

-	 fail_link(this->shader_program,

-		   "Failed to find builtin uniform `%s'\n", ir->name);

-	 return;

-      }

-

-      statevar = &_mesa_builtin_uniform_desc[i];

-

-      int array_count;

-      if (ir->type->is_array()) {

-	 array_count = ir->type->length;

-      } else {

-	 array_count = 1;

-      }

+      const ir_state_slot *const slots = ir->state_slots;

+      assert(ir->state_slots != NULL);

 

       /* Check if this statevar's setup in the STATE file exactly

        * matches how we'll want to reference it as a

@@ -782,21 +763,27 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
        * temporary storage and hope that it'll get copy-propagated

        * out.

        */

-      for (i = 0; i < statevar->num_elements; i++) {

-	 if (statevar->elements[i].swizzle != SWIZZLE_XYZW) {

+      for (i = 0; i < ir->num_state_slots; i++) {

+	 if (slots[i].swizzle != SWIZZLE_XYZW) {

 	    break;

 	 }

       }

 

       struct variable_storage *storage;

       ir_to_mesa_dst_reg dst;

-      if (i == statevar->num_elements) {

+      if (i == ir->num_state_slots) {

 	 /* We'll set the index later. */

 	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_STATE_VAR, -1);

 	 this->variables.push_tail(storage);

 

 	 dst = ir_to_mesa_undef_dst;

       } else {

+	 /* The variable_storage constructor allocates slots based on the size

+	  * of the type.  However, this had better match the number of state

+	  * elements that we're going to copy into the new temporary.

+	  */

+	 assert(ir->num_state_slots == type_size(ir->type));

+

 	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_TEMPORARY,

 						 this->next_temp);

 	 this->variables.push_tail(storage);

@@ -808,37 +795,27 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
       }

 

 

-      for (int a = 0; a < array_count; a++) {

-	 for (unsigned int i = 0; i < statevar->num_elements; i++) {

-	    struct gl_builtin_uniform_element *element = &statevar->elements[i];

-	    int tokens[STATE_LENGTH];

-

-	    memcpy(tokens, element->tokens, sizeof(element->tokens));

-	    if (ir->type->is_array()) {

-	       tokens[1] = a;

-	    }

+      for (unsigned int i = 0; i < ir->num_state_slots; i++) {

+	 int index = _mesa_add_state_reference(this->prog->Parameters,

+					       (gl_state_index *)slots[i].tokens);

 

-	    int index = _mesa_add_state_reference(this->prog->Parameters,

-						  (gl_state_index *)tokens);

-

-	    if (storage->file == PROGRAM_STATE_VAR) {

-	       if (storage->index == -1) {

-		  storage->index = index;

-	       } else {

-		  assert(index ==

-                         (int)(storage->index + a * statevar->num_elements + i));

-	       }

+	 if (storage->file == PROGRAM_STATE_VAR) {

+	    if (storage->index == -1) {

+	       storage->index = index;

 	    } else {

-	       ir_to_mesa_src_reg src(PROGRAM_STATE_VAR, index, NULL);

-	       src.swizzle = element->swizzle;

-	       ir_to_mesa_emit_op1(ir, OPCODE_MOV, dst, src);

-	       /* even a float takes up a whole vec4 reg in a struct/array. */

-	       dst.index++;

+	       assert(index == storage->index + (int)i);

 	    }

+	 } else {

+	    ir_to_mesa_src_reg src(PROGRAM_STATE_VAR, index, NULL);

+	    src.swizzle = slots[i].swizzle;

+	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, dst, src);

+	    /* even a float takes up a whole vec4 reg in a struct/array. */

+	    dst.index++;

 	 }

       }

+

       if (storage->file == PROGRAM_TEMPORARY &&

-	  dst.index != storage->index + type_size(ir->type)) {

+	  dst.index != storage->index + ir->num_state_slots) {

 	 fail_link(this->shader_program,

 		   "failed to load builtin uniform `%s'  (%d/%d regs loaded)\n",

 		   ir->name, dst.index - storage->index,

diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index df3c76d18..11176208c 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -237,11 +237,17 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
       {

          /* state[1] is the texture unit */

          const GLuint unit = (GLuint) state[1];

-         COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);

+         if(ctx->Color._ClampFragmentColor)

+            COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);

+         else

+            COPY_4V(value, ctx->Texture.Unit[unit].EnvColorUnclamped);

       }

       return;

    case STATE_FOG_COLOR:

-      COPY_4V(value, ctx->Fog.Color);

+      if(ctx->Color._ClampFragmentColor)

+         COPY_4V(value, ctx->Fog.Color);

+      else

+         COPY_4V(value, ctx->Fog.ColorUnclamped);

       return;

    case STATE_FOG_PARAMS:

       value[0] = ctx->Fog.Density;

@@ -399,6 +405,22 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
          }

          return;

 

+      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:

+         {

+            const GLuint idx = (GLuint) state[2];

+            if(ctx->Light._ClampVertexColor &&

+               (idx == VERT_ATTRIB_COLOR0 ||

+                idx == VERT_ATTRIB_COLOR1)) {

+               value[0] = CLAMP(ctx->Current.Attrib[idx][0], 0.0f, 1.0f);

+               value[1] = CLAMP(ctx->Current.Attrib[idx][1], 0.0f, 1.0f);

+               value[2] = CLAMP(ctx->Current.Attrib[idx][2], 0.0f, 1.0f);

+               value[3] = CLAMP(ctx->Current.Attrib[idx][3], 0.0f, 1.0f);

+            }

+            else

+               COPY_4V(value, ctx->Current.Attrib[idx]);

+         }

+         return;

+

       case STATE_NORMAL_SCALE:

          ASSIGN_4V(value, 

                    ctx->_ModelViewInvScale, 

@@ -649,10 +671,12 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
       return _NEW_LIGHT;

 

    case STATE_TEXGEN:

-   case STATE_TEXENV_COLOR:

       return _NEW_TEXTURE;

+   case STATE_TEXENV_COLOR:

+      return _NEW_TEXTURE | _NEW_BUFFERS | _NEW_FRAG_CLAMP;

 

    case STATE_FOG_COLOR:

+      return _NEW_FOG | _NEW_BUFFERS | _NEW_FRAG_CLAMP;

    case STATE_FOG_PARAMS:

       return _NEW_FOG;

 

@@ -688,6 +712,8 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
       switch (state[1]) {

       case STATE_CURRENT_ATTRIB:

          return _NEW_CURRENT_ATTRIB;

+      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:

+         return _NEW_CURRENT_ATTRIB | _NEW_LIGHT | _NEW_BUFFERS;

 

       case STATE_NORMAL_SCALE:

          return _NEW_MODELVIEW;

diff --git a/mesalib/src/mesa/program/prog_statevars.h b/mesalib/src/mesa/program/prog_statevars.h
index a92b77855..53cb1d1c2 100644
--- a/mesalib/src/mesa/program/prog_statevars.h
+++ b/mesalib/src/mesa/program/prog_statevars.h
@@ -106,6 +106,7 @@ typedef enum gl_state_index_ {
 

    STATE_INTERNAL,		/* Mesa additions */

    STATE_CURRENT_ATTRIB,        /* ctx->Current vertex attrib value */

+   STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED,        /* ctx->Current vertex attrib value after passthrough vertex processing */

    STATE_NORMAL_SCALE,

    STATE_TEXRECT_SCALE,

    STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */

diff --git a/mesalib/src/mesa/program/programopt.c b/mesalib/src/mesa/program/programopt.c
index 6601f7416..de311fd16 100644
--- a/mesalib/src/mesa/program/programopt.c
+++ b/mesalib/src/mesa/program/programopt.c
@@ -238,7 +238,7 @@ _mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog)
  * to vertex programs too.

  */

 void

-_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog)

+_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate)

 {

    static const gl_state_index fogPStateOpt[STATE_LENGTH]

       = { STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED, 0, 0, 0 };

@@ -290,7 +290,7 @@ _mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog)
          /* change the instruction to write to colorTemp w/ clamping */

          inst->DstReg.File = PROGRAM_TEMPORARY;

          inst->DstReg.Index = colorTemp;

-         inst->SaturateMode = SATURATE_ZERO_ONE;

+         inst->SaturateMode = saturate;

          /* don't break (may be several writes to result.color) */

       }

       inst++;

@@ -300,6 +300,7 @@ _mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog)
    _mesa_init_instructions(inst, 5);

 

    /* emit instructions to compute fog blending factor */

+   /* this is always clamped to [0, 1] regardless of fragment clamping */

    if (fprog->FogOption == GL_LINEAR) {

       /* MAD fogFactorTemp.x, fragment.fogcoord.x, fogPRefOpt.x, fogPRefOpt.y; */

       inst->Opcode = OPCODE_MAD;

diff --git a/mesalib/src/mesa/program/programopt.h b/mesalib/src/mesa/program/programopt.h
index 2e07d8989..90fa5fc51 100644
--- a/mesalib/src/mesa/program/programopt.h
+++ b/mesalib/src/mesa/program/programopt.h
@@ -32,7 +32,7 @@ extern void
 _mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog);

 

 extern void

-_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog);

+_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate);

 

 extern void

 _mesa_count_texture_indirections(struct gl_program *prog);