Re: [Mesa-dev] [PATCH 3/3] anv/gen7_pipeline: Set multisample state using shared function
On Tue, Aug 9, 2016 at 11:04 AM, Anuj Phogat wrote: > On Mon, Aug 8, 2016 at 5:09 PM, Jason Ekstrand > wrote: > > Does this fix any tests? If so, we should say so in the commit message. > > With that updated, > > > No it doesn't. It surprised me too but it looks like cts don't have enough > multisampling tests. > That's an understatement In that case, it looks like this is a strict improvement, so go ahead with my R-B. > > > Reviewed-by: Jason Ekstrand > > > > On Mon, Aug 8, 2016 at 2:57 PM, Anuj Phogat > wrote: > >> > >> Signed-off-by: Anuj Phogat > >> --- > >> src/intel/vulkan/gen7_pipeline.c | 16 +--- > >> 1 file changed, 1 insertion(+), 15 deletions(-) > >> > >> diff --git a/src/intel/vulkan/gen7_pipeline.c > >> b/src/intel/vulkan/gen7_pipeline.c > >> index 5395e79..17d7ccc 100644 > >> --- a/src/intel/vulkan/gen7_pipeline.c > >> +++ b/src/intel/vulkan/gen7_pipeline.c > >> @@ -81,21 +81,7 @@ genX(graphics_pipeline_create)( > >> pCreateInfo->pRasterizationState, extra); > >> emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); > >> > >> - if (pCreateInfo->pMultisampleState && > >> - pCreateInfo->pMultisampleState->rasterizationSamples > 1) > >> - > >> anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_ > STATE_CREATE_INFO"); > >> - > >> - uint32_t samples = 1; > >> - uint32_t log2_samples = __builtin_ffs(samples) - 1; > >> - > >> - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) { > >> - ms.PixelLocation= PIXLOC_CENTER; > >> - ms.NumberofMultisamples = log2_samples; > >> - } > >> - > >> - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SAMPLE_MASK), sm) { > >> - sm.SampleMask = 0xff; > >> - } > >> + emit_ms_state(pipeline, pCreateInfo->pMultisampleState); > >> > >> const struct brw_vs_prog_data *vs_prog_data = > >> get_vs_prog_data(pipeline); > >> > >> -- > >> 2.5.5 > >> > >> ___ > >> mesa-dev mailing list > >> mesa-dev@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/mesa-dev > > > > > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/3] anv/gen7_pipeline: Set multisample state using shared function
On Mon, Aug 8, 2016 at 5:09 PM, Jason Ekstrand wrote: > Does this fix any tests? If so, we should say so in the commit message. > With that updated, > No it doesn't. It surprised me too but it looks like cts don't have enough multisampling tests. > Reviewed-by: Jason Ekstrand > > On Mon, Aug 8, 2016 at 2:57 PM, Anuj Phogat wrote: >> >> Signed-off-by: Anuj Phogat >> --- >> src/intel/vulkan/gen7_pipeline.c | 16 +--- >> 1 file changed, 1 insertion(+), 15 deletions(-) >> >> diff --git a/src/intel/vulkan/gen7_pipeline.c >> b/src/intel/vulkan/gen7_pipeline.c >> index 5395e79..17d7ccc 100644 >> --- a/src/intel/vulkan/gen7_pipeline.c >> +++ b/src/intel/vulkan/gen7_pipeline.c >> @@ -81,21 +81,7 @@ genX(graphics_pipeline_create)( >> pCreateInfo->pRasterizationState, extra); >> emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); >> >> - if (pCreateInfo->pMultisampleState && >> - pCreateInfo->pMultisampleState->rasterizationSamples > 1) >> - >> anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"); >> - >> - uint32_t samples = 1; >> - uint32_t log2_samples = __builtin_ffs(samples) - 1; >> - >> - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) { >> - ms.PixelLocation= PIXLOC_CENTER; >> - ms.NumberofMultisamples = log2_samples; >> - } >> - >> - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SAMPLE_MASK), sm) { >> - sm.SampleMask = 0xff; >> - } >> + emit_ms_state(pipeline, pCreateInfo->pMultisampleState); >> >> const struct brw_vs_prog_data *vs_prog_data = >> get_vs_prog_data(pipeline); >> >> -- >> 2.5.5 >> >> ___ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/mesa-dev > > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/3] anv/gen7_pipeline: Set multisample state using shared function
Does this fix any tests? If so, we should say so in the commit message. With that updated, Reviewed-by: Jason Ekstrand On Mon, Aug 8, 2016 at 2:57 PM, Anuj Phogat wrote: > Signed-off-by: Anuj Phogat > --- > src/intel/vulkan/gen7_pipeline.c | 16 +--- > 1 file changed, 1 insertion(+), 15 deletions(-) > > diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_ > pipeline.c > index 5395e79..17d7ccc 100644 > --- a/src/intel/vulkan/gen7_pipeline.c > +++ b/src/intel/vulkan/gen7_pipeline.c > @@ -81,21 +81,7 @@ genX(graphics_pipeline_create)( > pCreateInfo->pRasterizationState, extra); > emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); > > - if (pCreateInfo->pMultisampleState && > - pCreateInfo->pMultisampleState->rasterizationSamples > 1) > - anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_ > STATE_CREATE_INFO"); > - > - uint32_t samples = 1; > - uint32_t log2_samples = __builtin_ffs(samples) - 1; > - > - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) { > - ms.PixelLocation= PIXLOC_CENTER; > - ms.NumberofMultisamples = log2_samples; > - } > - > - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SAMPLE_MASK), sm) { > - sm.SampleMask = 0xff; > - } > + emit_ms_state(pipeline, pCreateInfo->pMultisampleState); > > const struct brw_vs_prog_data *vs_prog_data = > get_vs_prog_data(pipeline); > > -- > 2.5.5 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 3/3] anv/gen7_pipeline: Set multisample state using shared function
Signed-off-by: Anuj Phogat --- src/intel/vulkan/gen7_pipeline.c | 16 +--- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index 5395e79..17d7ccc 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -81,21 +81,7 @@ genX(graphics_pipeline_create)( pCreateInfo->pRasterizationState, extra); emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); - if (pCreateInfo->pMultisampleState && - pCreateInfo->pMultisampleState->rasterizationSamples > 1) - anv_finishme("VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"); - - uint32_t samples = 1; - uint32_t log2_samples = __builtin_ffs(samples) - 1; - - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) { - ms.PixelLocation= PIXLOC_CENTER; - ms.NumberofMultisamples = log2_samples; - } - - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SAMPLE_MASK), sm) { - sm.SampleMask = 0xff; - } + emit_ms_state(pipeline, pCreateInfo->pMultisampleState); const struct brw_vs_prog_data *vs_prog_data = get_vs_prog_data(pipeline); -- 2.5.5 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev