diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-06 08:42:51 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-08 11:13:33 -0700 |
| commit | 12e653adecc3c287329c6501fab3bc5d04e8eb3d (patch) | |
| tree | 8158713f818ae82cdf9d380b7ec3fbd15c9b7b58 /src/intel/vulkan/gen8_pipeline.c | |
| parent | 1df511b6f07455b68b3500aa230c457eaa8e2a87 (diff) | |
| download | external_mesa3d-12e653adecc3c287329c6501fab3bc5d04e8eb3d.zip external_mesa3d-12e653adecc3c287329c6501fab3bc5d04e8eb3d.tar.gz external_mesa3d-12e653adecc3c287329c6501fab3bc5d04e8eb3d.tar.bz2 | |
anv/pipeline/gen8: Unconditionally set DXMultisampleRasterizaitonEnable
The multisample rasterization mode is computed based on this field,
3DSTATE_RASTER::DXMultisampleRasterizationMode (only for forced
multisampling), 3DSTATE_RASTER::APIMode, and the number of samples. There
are two tables in the SKL PRM that describe how the final multisample mode
is calculated: "Windower (WM) Stage >> Multisampling >> Multisample
ModeState >> Table 1" and the formula for "SF_INT::Multisample
Rasterization Mode".
The "DX Multisample Rasterization Enable" bit changes whether multisample
mode is set to OFF_PIXEL or ON_PATTERN in the samples > 1 case. In the
samples == 1 case, the bit has no effect. Since Vulkan has no concept of
disabling multisampling for samples > 1, we can just set the bit.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/intel/vulkan/gen8_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/gen8_pipeline.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 7f8734a..4d198dc 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -47,14 +47,8 @@ emit_ia_state(struct anv_pipeline *pipeline, static void emit_rs_state(struct anv_pipeline *pipeline, const VkPipelineRasterizationStateCreateInfo *info, - const VkPipelineMultisampleStateCreateInfo *ms_info, const struct anv_graphics_pipeline_create_info *extra) { - uint32_t samples = 1; - - if (ms_info) - samples = ms_info->rasterizationSamples; - struct GENX(3DSTATE_SF) sf = { GENX(3DSTATE_SF_header), }; @@ -75,7 +69,7 @@ emit_rs_state(struct anv_pipeline *pipeline, /* For details on 3DSTATE_RASTER multisample state, see the BSpec table * "Multisample Modes State". */ - raster.DXMultisampleRasterizationEnable = samples > 1; + raster.DXMultisampleRasterizationEnable = true; raster.ForcedSampleCount = FSC_NUMRASTSAMPLES_0; raster.ForceMultisampling = false; @@ -173,8 +167,7 @@ genX(graphics_pipeline_create)( assert(pCreateInfo->pInputAssemblyState); emit_ia_state(pipeline, pCreateInfo->pInputAssemblyState, extra); assert(pCreateInfo->pRasterizationState); - emit_rs_state(pipeline, pCreateInfo->pRasterizationState, - pCreateInfo->pMultisampleState, extra); + emit_rs_state(pipeline, pCreateInfo->pRasterizationState, extra); emit_ms_state(pipeline, pCreateInfo->pMultisampleState); emit_ds_state(pipeline, pCreateInfo->pDepthStencilState, pass, subpass); emit_cb_state(pipeline, pCreateInfo->pColorBlendState, |