Module: Mesa Branch: staging/20.0 Commit: 7b7a921c1c4152cf1965b5c622e67a51bed9f8da URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b7a921c1c4152cf1965b5c622e67a51bed9f8da
Author: D Scott Phillips <[email protected]> Date: Thu Apr 30 23:12:07 2020 +0000 anv,iris: Fix input vertex max for tcs on gen12 gen12 does away with the single patch dispatch mode for tcs, and increases some limits so that 8_patch mode can always work. Make the necessary changes so we don't try to fall back to single patch mode. Fixes KHR-GL46.tessellation_shader.single.max_patch_vertices and others Fixes: 44754279ace7 ("intel/fs/gen12: Use TCS 8_PATCH mode.") Reviewed-by: Kenneth Graunke <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4843> (cherry picked from commit 65b05ebdda18c1cebd88c72cc8f50530addb80c6) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_state.c | 2 ++ src/intel/compiler/brw_vec4_tcs.cpp | 2 +- src/intel/genxml/gen12.xml | 2 +- src/intel/vulkan/genX_pipeline.c | 7 ++++++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ff73080a43e..3f7aaa9da11 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -787,7 +787,7 @@ "description": "anv,iris: Fix input vertex max for tcs on gen12", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "44754279ace72bc36b016f9ca519141ea4cad038" }, diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 5f34c06447b..7f4ec3d0b75 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -4190,6 +4190,8 @@ iris_store_tcs_state(struct iris_context *ice, * more than 2 times the number of instance count. */ assert((devinfo->max_tcs_threads / 2) > tcs_prog_data->instances); + hs.DispatchGRFStartRegisterForURBData = prog_data->dispatch_grf_start_reg & 0x1f; + hs.DispatchGRFStartRegisterForURBData5 = prog_data->dispatch_grf_start_reg >> 5; #endif hs.InstanceCount = tcs_prog_data->instances - 1; diff --git a/src/intel/compiler/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp index d9df1fcfaf7..6a4ec2fb262 100644 --- a/src/intel/compiler/brw_vec4_tcs.cpp +++ b/src/intel/compiler/brw_vec4_tcs.cpp @@ -364,7 +364,7 @@ brw_compile_tcs(const struct brw_compiler *compiler, if (compiler->use_tcs_8_patch && nir->info.tess.tcs_vertices_out <= (devinfo->gen >= 12 ? 32 : 16) && - 2 + has_primitive_id + key->input_vertices <= 31) { + 2 + has_primitive_id + key->input_vertices <= (devinfo->gen >= 12 ? 63 : 31)) { /* 3DSTATE_HS imposes two constraints on using 8_PATCH mode. First, the * "Instance" field limits the number of output vertices to [1, 16] on * gen11 and below, or [1, 32] on gen12 and above. Secondly, the diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml index 4fd7e66251b..18eb15fad7e 100644 --- a/src/intel/genxml/gen12.xml +++ b/src/intel/genxml/gen12.xml @@ -1964,7 +1964,7 @@ <value name="9-12 Samplers" value="3"/> <value name="13-16 Samplers" value="4"/> </field> - <field name="Instance Count" start="64" end="67" type="uint"/> + <field name="Instance Count" start="64" end="68" type="uint"/> <field name="Maximum Number of Threads" start="72" end="80" type="uint"/> <field name="Statistics Enable" start="93" end="93" type="bool"/> <field name="Enable" start="95" end="95" type="bool"/> diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 848e829000b..fbac29a5359 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1626,7 +1626,12 @@ emit_3dstate_hs_te_ds(struct anv_pipeline *pipeline, hs.VertexURBEntryReadLength = 0; hs.VertexURBEntryReadOffset = 0; hs.DispatchGRFStartRegisterForURBData = - tcs_prog_data->base.base.dispatch_grf_start_reg; + tcs_prog_data->base.base.dispatch_grf_start_reg & 0x1f; +#if GEN_GEN >= 12 + hs.DispatchGRFStartRegisterForURBData5 = + tcs_prog_data->base.base.dispatch_grf_start_reg >> 5; +#endif + hs.PerThreadScratchSpace = get_scratch_space(tcs_bin); hs.ScratchSpaceBasePointer = _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
