commit f5bd2253ff4114ac446f8eb820e78d56f711020f
author Cody Northrop <cody@lunarg.com> Mon Aug 17 11:10:49 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Aug 26 09:59:59 2015 -0600
tree e71e8887e6f9a10717bb33734cf2a259251acd81
parent 10442c1f0417f4a2458c959fcf2e4706f5013771

Bug 14323: RasterLine and RasterDepthBias changes

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 662f31c..10c6057 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -365,7 +365,8 @@
     VkPipeline pipeline;
 
     VkDynamicViewportState viewport;
-    VkDynamicRasterState raster;
+    VkDynamicRasterLineState raster_line;
+    VkDynamicRasterDepthBiasState raster_depth_bias;
     VkDynamicColorBlendState color_blend;
     VkDynamicDepthStencilState depth_stencil;
 
@@ -540,7 +541,8 @@
             0, 1, &demo->desc_set, 0, NULL);
 
     vkCmdBindDynamicViewportState(cmd_buf, demo->viewport);
-    vkCmdBindDynamicRasterState(cmd_buf,  demo->raster);
+    vkCmdBindDynamicRasterLineState(cmd_buf,  demo->raster_line);
+    vkCmdBindDynamicRasterDepthBiasState(cmd_buf,  demo->raster_depth_bias);
     vkCmdBindDynamicColorBlendState(cmd_buf, demo->color_blend);
     vkCmdBindDynamicDepthStencilState(cmd_buf, demo->depth_stencil);
 
@@ -1587,6 +1589,8 @@
     rs.cullMode = VK_CULL_MODE_BACK;
     rs.frontFace = VK_FRONT_FACE_CCW;
     rs.depthClipEnable = VK_TRUE;
+    rs.rasterizerDiscardEnable = VK_FALSE;
+    rs.depthBiasEnable = VK_FALSE;
 
     memset(&cb, 0, sizeof(cb));
     cb.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
@@ -1662,7 +1666,8 @@
 static void demo_prepare_dynamic_states(struct demo *demo)
 {
     VkDynamicViewportStateCreateInfo viewport_create;
-    VkDynamicRasterStateCreateInfo raster;
+    VkDynamicRasterLineStateCreateInfo raster_line;
+    VkDynamicRasterDepthBiasStateCreateInfo raster_depth_bias;
     VkDynamicColorBlendStateCreateInfo color_blend;
     VkDynamicDepthStencilStateCreateInfo depth_stencil;
     VkResult U_ASSERT_ONLY err;
@@ -1685,9 +1690,15 @@
     scissor.offset.y = 0;
     viewport_create.pScissors = &scissor;
 
-    memset(&raster, 0, sizeof(raster));
-    raster.sType = VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO;
-    raster.lineWidth = 1.0;
+    memset(&raster_line, 0, sizeof(raster_line));
+    raster_line.sType = VK_STRUCTURE_TYPE_DYNAMIC_RASTER_LINE_STATE_CREATE_INFO;
+    raster_line.lineWidth = 1.0;
+
+    memset(&raster_depth_bias, 0, sizeof(raster_depth_bias));
+    raster_depth_bias.sType = VK_STRUCTURE_TYPE_DYNAMIC_RASTER_DEPTH_BIAS_STATE_CREATE_INFO;
+    raster_depth_bias.depthBias = 0.0f;
+    raster_depth_bias.depthBiasClamp = 0.0f;
+    raster_depth_bias.slopeScaledDepthBias = 0.0f;
 
     memset(&color_blend, 0, sizeof(color_blend));
     color_blend.sType = VK_STRUCTURE_TYPE_DYNAMIC_COLOR_BLEND_STATE_CREATE_INFO;
@@ -1708,7 +1719,10 @@
     err = vkCreateDynamicViewportState(demo->device, &viewport_create, &demo->viewport);
     assert(!err);
 
-    err = vkCreateDynamicRasterState(demo->device, &raster, &demo->raster);
+    err = vkCreateDynamicRasterLineState(demo->device, &raster_line, &demo->raster_line);
+    assert(!err);
+
+    err = vkCreateDynamicRasterDepthBiasState(demo->device, &raster_depth_bias, &demo->raster_depth_bias);
     assert(!err);
 
     err = vkCreateDynamicColorBlendState(demo->device,
@@ -1879,7 +1893,8 @@
     vkDestroyDescriptorPool(demo->device, demo->desc_pool);
 
     vkDestroyDynamicViewportState(demo->device, demo->viewport);
-    vkDestroyDynamicRasterState(demo->device, demo->raster);
+    vkDestroyDynamicRasterLineState(demo->device, demo->raster_line);
+    vkDestroyDynamicRasterDepthBiasState(demo->device, demo->raster_depth_bias);
     vkDestroyDynamicColorBlendState(demo->device, demo->color_blend);
     vkDestroyDynamicDepthStencilState(demo->device, demo->depth_stencil);