commit c6e32f9d619fab533e3088ed9dc51e38e97e6486
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 11 14:13:34 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Feb 17 10:20:49 2015 -0700
tree 9a3548a0eea38d7f241874f5424a08ae553bfeae
parent 47469d923a10265faa0ef26ed2d528f44cfca8d5

intel: Remove scissor enable and scissor count

bug #12925
header version: r29511
Remove separate scissor enable and scissor count. Scissor always
enabled and must always provide scissor rect for every viewport.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 2e400de..6e211a2 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -410,6 +410,9 @@
 
     dw2 = pipeline->cmd_sf_cull;
 
+    /* Scissor is always enabled */
+    dw2 |= GEN7_SF_DW2_SCISSOR_ENABLE;
+
     if (pipeline->sample_count > 1) {
           dw2 |= 128 << GEN7_SF_DW2_LINE_WIDTH__SHIFT |
                  GEN7_SF_DW2_MSRASTMODE_ON_PATTERN;
@@ -418,9 +421,6 @@
                  GEN7_SF_DW2_MSRASTMODE_OFF_PIXEL;
     }
 
-    if (pipeline->scissor_enable)
-        dw2 |= GEN7_SF_DW2_SCISSOR_ENABLE;
-
     /* in U8.3 */
     point_width = (int) (raster->rs_info.pointSize * 8.0f + 0.5f);
     point_width = U_CLAMP(point_width, 1, 2047);
@@ -1307,8 +1307,7 @@
         return;
 
     assert(viewport->cmd_len == (8 + 4 + 2) *
-            viewport->viewport_count + (viewport->has_scissor_rects) ?
-               (viewport->viewport_count * 2) : 0);
+            /* viewports */ viewport->viewport_count + (/* scissor */ viewport->viewport_count * 2));
 
     sf_offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SF_VIEWPORT,
             GEN6_ALIGNMENT_SF_VIEWPORT, 8 * viewport->viewport_count,
@@ -1322,13 +1321,9 @@
             GEN6_ALIGNMENT_SF_VIEWPORT, 2 * viewport->viewport_count,
             &viewport->cmd[viewport->cmd_cc_pos]);
 
-    if (viewport->has_scissor_rects) {
-        scissor_offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SCISSOR_RECT,
-                GEN6_ALIGNMENT_SCISSOR_RECT, 2 * viewport->viewport_count,
-                &viewport->cmd[viewport->cmd_scissor_rect_pos]);
-    } else {
-        scissor_offset = 0;
-    }
+    scissor_offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SCISSOR_RECT,
+            GEN6_ALIGNMENT_SCISSOR_RECT, 2 * viewport->viewport_count,
+            &viewport->cmd[viewport->cmd_scissor_rect_pos]);
 
     gen6_3DSTATE_VIEWPORT_STATE_POINTERS(cmd,
             clip_offset, sf_offset, cc_offset);
@@ -1379,14 +1374,12 @@
 static void gen7_viewport_states(struct intel_cmd *cmd)
 {
     const struct intel_dynamic_vp *viewport = cmd->bind.state.viewport;
-    const struct intel_pipeline *pipeline = cmd->bind.pipeline.graphics;
     uint32_t offset;
 
     if (!viewport)
         return;
 
-    assert(viewport->cmd_len == (16 + 2 + 2 * pipeline->scissor_enable) *
-            viewport->viewport_count);
+    assert(viewport->cmd_len == (16 + 2 + 2) * viewport->viewport_count);
 
     offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SF_VIEWPORT,
             GEN7_ALIGNMENT_SF_CLIP_VIEWPORT, 16 * viewport->viewport_count,
@@ -1402,14 +1395,12 @@
             GEN7_RENDER_OPCODE_3DSTATE_VIEWPORT_STATE_POINTERS_CC,
             offset);
 
-    if (pipeline->scissor_enable) {
-        offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SCISSOR_RECT,
-                GEN6_ALIGNMENT_SCISSOR_RECT, 2 * viewport->viewport_count,
-                &viewport->cmd[viewport->cmd_scissor_rect_pos]);
-        gen7_3dstate_pointer(cmd,
-                GEN6_RENDER_OPCODE_3DSTATE_SCISSOR_STATE_POINTERS,
-                offset);
-    }
+    offset = cmd_state_write(cmd, INTEL_CMD_ITEM_SCISSOR_RECT,
+                             GEN6_ALIGNMENT_SCISSOR_RECT, 2 * viewport->viewport_count,
+                             &viewport->cmd[viewport->cmd_scissor_rect_pos]);
+    gen7_3dstate_pointer(cmd,
+                         GEN6_RENDER_OPCODE_3DSTATE_SCISSOR_STATE_POINTERS,
+                         offset);
 }
 
 static void gen6_pcb(struct intel_cmd *cmd, int subop,