i965/vec4: Make with_writemask() non-static.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_clip.c

diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
index 8929160acd9d25fd9c79cf2dafabce5040e704d3..95b7d15a4273220a251452fdd2ca39e1742edd2b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_clip.c
+++ b/src/mesa/drivers/dri/i965/brw_clip.c
@@ -51,12 +51,10 @@
 static void compile_clip_prog( struct brw_context *brw,
                             struct brw_clip_prog_key *key )
 {
-   struct intel_context *intel = &brw->intel;
    struct brw_clip_compile c;
    const GLuint *program;
    void *mem_ctx;
    GLuint program_size;
-   GLuint delta;
    GLuint i;
 
    memset(&c, 0, sizeof(c));
@@ -70,28 +68,12 @@ static void compile_clip_prog( struct brw_context *brw,
    c.func.single_program_flow = 1;
 
    c.key = *key;
-   brw_compute_vue_map(&c.vue_map, intel, c.key.nr_userclip,
-                       c.key.do_twoside_color, c.key.attrs);
+   c.vue_map = brw->vue_map_geom_out;
 
-   /* Need to locate the two positions present in vertex + header.
-    * These are currently hardcoded:
-    */
-   if (intel->gen == 5)
-      c.header_regs = 3;
-   else
-      c.header_regs = 1;
-
-   delta = c.header_regs * REG_SIZE;
-
-   for (i = 0; i < VERT_RESULT_MAX; i++) {
-      if (c.key.attrs & BITFIELD64_BIT(i)) {
-        c.offset[i] = delta;
-        delta += ATTR_SIZE;
-
-        c.idx_to_attr[c.nr_attrs] = i;
-        c.nr_attrs++;
-      }
-   }
+   c.has_flat_shading =
+      brw_any_flat_varyings(&key->interpolation_mode);
+   c.has_noperspective_shading =
+      brw_any_noperspective_varyings(&key->interpolation_mode);
 
    /* nr_regs is the number of registers filled by reading data from the VUE.
     * This program accesses the entire VUE, so nr_regs needs to be the size of
@@ -100,8 +82,6 @@ static void compile_clip_prog( struct brw_context *brw,
     */
    c.nr_regs = (c.vue_map.num_slots + 1)/2;
 
-   c.nr_bytes = c.nr_regs * REG_SIZE;
-
    c.prog_data.clip_mode = c.key.clip_mode; /* XXX */
 
    /* For some reason the thread is spawned with only 4 channels
@@ -141,7 +121,7 @@ static void compile_clip_prog( struct brw_context *brw,
       printf("clip:\n");
       for (i = 0; i < program_size / sizeof(struct brw_instruction); i++)
         brw_disasm(stdout, &((struct brw_instruction *)program)[i],
-                   intel->gen);
+                   brw->gen);
       printf("\n");
    }
 
@@ -156,28 +136,32 @@ static void compile_clip_prog( struct brw_context *brw,
 
 /* Calculate interpolants for triangle and line rasterization.
  */
-static void upload_clip_prog(struct brw_context *brw)
+static void
+brw_upload_clip_prog(struct brw_context *brw)
 {
-   struct intel_context *intel = &brw->intel;
-   struct gl_context *ctx = &intel->ctx;
+   struct gl_context *ctx = &brw->ctx;
    struct brw_clip_prog_key key;
 
    memset(&key, 0, sizeof(key));
 
    /* Populate the key:
     */
+
+   /* BRW_NEW_INTERPOLATION_MAP */
+   key.interpolation_mode = brw->interpolation_mode;
+
    /* BRW_NEW_REDUCED_PRIMITIVE */
-   key.primitive = brw->intel.reduced_primitive;
-   /* CACHE_NEW_VS_PROG */
-   key.attrs = brw->vs.prog_data->outputs_written;
+   key.primitive = brw->reduced_primitive;
+   /* BRW_NEW_VUE_MAP_GEOM_OUT */
+   key.attrs = brw->vue_map_geom_out.slots_valid;
+
    /* _NEW_LIGHT */
-   key.do_flat_shading = (ctx->Light.ShadeModel == GL_FLAT);
    key.pv_first = (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION);
-   key.do_twoside_color = (ctx->Light.Enabled && ctx->Light.Model.TwoSide);
-   /* _NEW_TRANSFORM */
-   key.nr_userclip = brw_count_bits(ctx->Transform.ClipPlanesEnabled);
+   /* _NEW_TRANSFORM (also part of VUE map)*/
+   if (ctx->Transform.ClipPlanesEnabled)
+      key.nr_userclip = _mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1;
 
-   if (intel->gen == 5)
+   if (brw->gen == 5)
        key.clip_mode = BRW_CLIPMODE_KERNEL_CLIP;
    else
        key.clip_mode = BRW_CLIPMODE_NORMAL;
@@ -240,7 +224,7 @@ static void upload_clip_prog(struct brw_context *brw)
 
            if (offset_back || offset_front) {
               /* _NEW_POLYGON, _NEW_BUFFERS */
-              key.offset_units = ctx->Polygon.OffsetUnits * brw->intel.polygon_offset_scale;
+              key.offset_units = ctx->Polygon.OffsetUnits * ctx->DrawBuffer->_MRD * 2;
               key.offset_factor = ctx->Polygon.OffsetFactor * ctx->DrawBuffer->_MRD;
            }
 
@@ -282,8 +266,9 @@ const struct brw_tracked_state brw_clip_prog = {
                _NEW_TRANSFORM |
                _NEW_POLYGON | 
                _NEW_BUFFERS),
-      .brw   = (BRW_NEW_REDUCED_PRIMITIVE),
-      .cache = CACHE_NEW_VS_PROG
+      .brw   = (BRW_NEW_REDUCED_PRIMITIVE |
+                BRW_NEW_VUE_MAP_GEOM_OUT |
+                BRW_NEW_INTERPOLATION_MAP)
    },
-   .prepare = upload_clip_prog
+   .emit = brw_upload_clip_prog
 };