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/state.c

diff --git a/icd/intel/state.c b/icd/intel/state.c
index c40211b..5fe0cd3 100644
--- a/icd/intel/state.c
+++ b/icd/intel/state.c
@@ -96,31 +96,26 @@
 {
     INTEL_GPU_ASSERT(gpu, 6, 7.5);
 
-    state->viewport_count = info->viewportCount;
-    state->has_scissor_rects = (info->scissorCount > 0);
+    state->viewport_count = info->viewportAndScissorCount;
 
-    assert(info->viewportCount < INTEL_MAX_RENDER_TARGETS);
-    assert(info->scissorCount < INTEL_MAX_RENDER_TARGETS);
-    assert(!state->has_scissor_rects || info->scissorCount == info->viewportCount);
+    assert(info->viewportAndScissorCount < INTEL_MAX_RENDER_TARGETS);
 
     if (intel_gpu_gen(gpu) >= INTEL_GEN(7)) {
-        state->cmd_len = 16 * info->viewportCount;
+        state->cmd_len = 16 * info->viewportAndScissorCount;
 
         state->cmd_clip_pos = 8;
     } else {
-        state->cmd_len = 8 * info->viewportCount;
+        state->cmd_len = 8 * info->viewportAndScissorCount;
 
         state->cmd_clip_pos = state->cmd_len;
-        state->cmd_len += 4 * info->viewportCount;
+        state->cmd_len += 4 * info->viewportAndScissorCount;
     }
 
     state->cmd_cc_pos = state->cmd_len;
-    state->cmd_len += 2 * info->viewportCount;
+    state->cmd_len += 2 * info->viewportAndScissorCount;
 
-    if (state->has_scissor_rects) {
-        state->cmd_scissor_rect_pos = state->cmd_len;
-        state->cmd_len += 2 * info->viewportCount;
-    }
+    state->cmd_scissor_rect_pos = state->cmd_len;
+    state->cmd_len += 2 * info->viewportAndScissorCount;
 
     state->cmd = icd_alloc(sizeof(uint32_t) * state->cmd_len,
             0, XGL_SYSTEM_ALLOC_INTERNAL);
@@ -152,7 +147,7 @@
     cc_viewport = state->cmd + state->cmd_cc_pos;
     scissor_rect = state->cmd + state->cmd_scissor_rect_pos;
 
-    for (i = 0; i < info->viewportCount; i++) {
+    for (i = 0; i < info->viewportAndScissorCount; i++) {
         const XGL_VIEWPORT *viewport = &info->pViewports[i];
         uint32_t *dw = NULL;
         float translate[3], scale[3];
@@ -195,7 +190,7 @@
         cc_viewport += 2;
     }
 
-    for (i = 0; i < info->scissorCount; i++) {
+    for (i = 0; i < info->viewportAndScissorCount; i++) {
         const XGL_RECT *scissor = &info->pScissors[i];
         /* SCISSOR_RECT */
         int16_t max_x, max_y;