diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-06 08:28:23 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-08 11:13:41 -0700 |
| commit | ce980541d5dc9b114c3aa69b3560fcb6023ccf32 (patch) | |
| tree | 71e0ce1b8ff2fa9d1e9fcedcca7b355b84e8e9a2 /src/intel/vulkan/gen7_pipeline.c | |
| parent | 960e8a1260b34e8e34d2f39b91b11ea85ec483b1 (diff) | |
| download | external_mesa3d-ce980541d5dc9b114c3aa69b3560fcb6023ccf32.zip external_mesa3d-ce980541d5dc9b114c3aa69b3560fcb6023ccf32.tar.gz external_mesa3d-ce980541d5dc9b114c3aa69b3560fcb6023ccf32.tar.bz2 | |
anv/pipeline: Unify 3DSTATE_RASTER and 3DSTATE_SF setup between gen7 and gen8
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/intel/vulkan/gen7_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/gen7_pipeline.c | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index 6b57dd6..df8fa28 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -34,47 +34,6 @@ #include "genX_pipeline_util.h" -static void -gen7_emit_rs_state(struct anv_pipeline *pipeline, - const VkPipelineRasterizationStateCreateInfo *info, - const struct anv_graphics_pipeline_create_info *extra) -{ - struct GENX(3DSTATE_SF) sf = { - GENX(3DSTATE_SF_header), - - /* LegacyGlobalDepthBiasEnable */ - - .StatisticsEnable = true, - .FrontFaceFillMode = vk_to_gen_fillmode[info->polygonMode], - .BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode], - .ViewportTransformEnable = !(extra && extra->use_rectlist), - .FrontWinding = vk_to_gen_front_face[info->frontFace], - /* bool AntiAliasingEnable; */ - - .CullMode = vk_to_gen_cullmode[info->cullMode], - - /* uint32_t LineEndCapAntialiasingRegionWidth; */ - .ScissorRectangleEnable = !(extra && extra->use_rectlist), - - /* uint32_t MultisampleRasterizationMode; */ - /* bool LastPixelEnable; */ - - .TriangleStripListProvokingVertexSelect = 0, - .LineStripListProvokingVertexSelect = 0, - .TriangleFanProvokingVertexSelect = 1, - - /* uint32_t AALineDistanceMode; */ - /* uint32_t VertexSubPixelPrecisionSelect; */ - .PointWidthSource = Vertex, - .PointWidth = 1.0, - .GlobalDepthOffsetEnableSolid = info->depthBiasEnable, - .GlobalDepthOffsetEnableWireframe = info->depthBiasEnable, - .GlobalDepthOffsetEnablePoint = info->depthBiasEnable, - }; - - GENX(3DSTATE_SF_pack)(NULL, &pipeline->gen7.sf, &sf); -} - VkResult genX(graphics_pipeline_create)( VkDevice _device, @@ -108,7 +67,7 @@ genX(graphics_pipeline_create)( emit_vertex_input(pipeline, pCreateInfo->pVertexInputState, extra); assert(pCreateInfo->pRasterizationState); - gen7_emit_rs_state(pipeline, pCreateInfo->pRasterizationState, extra); + emit_rs_state(pipeline, pCreateInfo->pRasterizationState, extra); emit_ds_state(pipeline, pCreateInfo->pDepthStencilState, pass, subpass); |