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.
diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index e8ce14d..9fc0786 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -121,18 +121,23 @@
     XGL_RESULT err;
 
     XGL_VIEWPORT viewport;
+    XGL_RECT scissor;
 
     XGL_DYNAMIC_VP_STATE_CREATE_INFO viewportCreate = {};
     viewportCreate.sType = XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO;
-    viewportCreate.viewportCount         = 1;
-    viewportCreate.scissorCount          = 0;
+    viewportCreate.viewportAndScissorCount         = 1;
     viewport.originX  = 0;
     viewport.originY  = 0;
     viewport.width    = 1.f * width;
     viewport.height   = 1.f * height;
     viewport.minDepth = 0.f;
     viewport.maxDepth = 1.f;
+    scissor.extent.width = width;
+    scissor.extent.height = height;
+    scissor.offset.x = 0;
+    scissor.offset.y = 0;
     viewportCreate.pViewports = &viewport;
+    viewportCreate.pScissors = &scissor;
 
     err = xglCreateDynamicViewportState( device(), &viewportCreate, &m_stateViewport );
     ASSERT_XGL_SUCCESS( err );