r300: Add more rs_state, fix indents on dsa_state.

2 files changed, 30 insertions, 23 deletions

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 13982784ff1..0cb0ec20d53 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -61,6 +61,8 @@ struct r300_fs_state {
 
 struct r300_rs_state {
     uint32_t vap_control_status;    /* R300_VAP_CNTL_STATUS: 0x2140 */
+    uint32_t point_size;            /* R300_GA_POINT_SIZE: 0x421c */
+    uint32_t line_control;          /* R300_GA_LINE_CNTL: 0x4234 */
     uint32_t depth_scale_front;  /* R300_SU_POLY_OFFSET_FRONT_SCALE: 0x42a4 */
     uint32_t depth_offset_front;/* R300_SU_POLY_OFFSET_FRONT_OFFSET: 0x42a8 */
     uint32_t depth_scale_back;    /* R300_SU_POLY_OFFSET_BACK_SCALE: 0x42ac */
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index ee947feb5af..d81aee94e3d 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -307,8 +307,8 @@ static void*
         }
 
         dsa->z_stencil_control |=
-                (translate_depth_stencil_function(state->depth.func) <<
-                    R300_Z_FUNC_SHIFT);
+            (translate_depth_stencil_function(state->depth.func) <<
+                R300_Z_FUNC_SHIFT);
     }
 
     /* Stencil buffer setup. */
@@ -331,25 +331,25 @@ static void*
         if (state->stencil[1].enabled) {
             dsa->z_buffer_control |= R300_STENCIL_FRONT_BACK;
             dsa->z_stencil_control |=
-                    (translate_depth_stencil_function(state->stencil[1].func) <<
-                        R300_S_BACK_FUNC_SHIFT) |
-                    (translate_stencil_op(state->stencil[1].fail_op) <<
-                        R300_S_BACK_SFAIL_OP_SHIFT) |
-                    (translate_stencil_op(state->stencil[1].zpass_op) <<
-                        R300_S_BACK_ZPASS_OP_SHIFT) |
-                    (translate_stencil_op(state->stencil[1].zfail_op) <<
-                        R300_S_BACK_ZFAIL_OP_SHIFT);
+                (translate_depth_stencil_function(state->stencil[1].func) <<
+                    R300_S_BACK_FUNC_SHIFT) |
+                (translate_stencil_op(state->stencil[1].fail_op) <<
+                    R300_S_BACK_SFAIL_OP_SHIFT) |
+                (translate_stencil_op(state->stencil[1].zpass_op) <<
+                    R300_S_BACK_ZPASS_OP_SHIFT) |
+                (translate_stencil_op(state->stencil[1].zfail_op) <<
+                    R300_S_BACK_ZFAIL_OP_SHIFT);
 
             dsa->stencil_ref_bf = (state->stencil[1].ref_value) |
-                    (state->stencil[1].value_mask << R300_STENCILMASK_SHIFT) |
-                    (state->stencil[1].write_mask << R300_STENCILWRITEMASK_SHIFT);
+                (state->stencil[1].value_mask << R300_STENCILMASK_SHIFT) |
+                (state->stencil[1].write_mask << R300_STENCILWRITEMASK_SHIFT);
         }
     }
 
     /* Alpha test setup. */
     if (state->alpha.enabled) {
         dsa->alpha_function = translate_alpha_function(state->alpha.func) |
-                R300_FG_ALPHA_FUNC_ENABLE;
+            R300_FG_ALPHA_FUNC_ENABLE;
         dsa->alpha_reference = CLAMP(state->alpha.ref * 1023.0f, 0, 1023);
     } else {
         dsa->z_buffer_top = R300_ZTOP_ENABLE;
@@ -437,7 +437,6 @@ struct pipe_rasterizer_state
     unsigned poly_stipple_enable:1;
     unsigned point_smooth:1;
     unsigned point_sprite:1;
-    unsigned point_size_per_vertex:1; /**< size computed in vertex shader */
     unsigned multisample:1;         /* XXX maybe more ms state in future */
     unsigned line_smooth:1;
     unsigned line_last_pixel:1;
@@ -447,14 +446,14 @@ struct pipe_rasterizer_state
     unsigned origin_lower_left:1;  /**< Is (0,0) the lower-left corner? */
     unsigned flatshade_first:1;   /**< take color attribute from the first vertex of a primitive */
     unsigned gl_rasterization_rules:1; /**< enable tweaks for GL rasterization?  */
-
-    float line_width;
-    float point_size;           /**< used when no per-vertex size */
-    float point_size_min;        /* XXX - temporary, will go away */
-    float point_size_max;        /* XXX - temporary, will go away */
     ubyte sprite_coord_mode[PIPE_MAX_SHADER_OUTPUTS]; /**< PIPE_SPRITE_COORD_ */
 };
 #endif
+
+static INLINE int pack_float_16_6x(float f) {
+    return ((int)(f * 6.0) & 0xffff);
+}
+
 /* Create a new rasterizer state based on the CSO rasterizer state.
  *
  * This is a very large chunk of state, and covers most of the graphics
@@ -467,6 +466,16 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
 {
     struct r300_rs_state* rs = CALLOC_STRUCT(r300_rs_state);
 
+    /* XXX this is part of HW TCL */
+    /* XXX endian control */
+    rs->vap_control_status = R300_VAP_TCL_BYPASS;
+
+    rs->point_size = pack_float_16_6x(state->point_size) |
+        (pack_float_16_6x(state->point_size) << R300_POINTSIZE_X_SHIFT);
+
+    rs->line_control = pack_float_16_6x(state->line_width) |
+        R300_GA_LINE_CNTL_END_TYPE_COMP;
+
     /* Radeons don't think in "CW/CCW", they think in "front/back". */
     if (state->front_winding == PIPE_WINDING_CW) {
         rs->cull_mode = R300_FRONT_FACE_CW;
@@ -510,10 +519,6 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
         rs->line_stipple_value = state->line_stipple_pattern;
     }
 
-    /* XXX this is part of HW TCL */
-    /* XXX endian control */
-    rs->vap_control_status = R300_VAP_TCL_BYPASS;
-
     return (void*)rs;
 }