From e79f4e0b121b16780506a7ebf680ada294c5d1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Tue, 24 Jan 2023 10:52:10 +0100 Subject: [PATCH] intel/compiler/mesh: handle const data in task & mesh programs Started showing up when nir_opt_large_constants call was moved in 88756cee8da. Fixes dEQP-VK.mesh_shader.ext.smoke.monolithic.fullscreen_gradient* Suggested-by: Kenneth Graunke Fixes: 88756cee8da ("intel/compiler: Run nir_opt_large_constants before scalarizing consts") Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 536a2acfc20ab6b21d83f8ca7a1829087ba98032) --- .pick_status.json | 2 +- src/intel/compiler/brw_mesh.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index dae95ebe379..203fdc43dde 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1129,7 +1129,7 @@ "description": "intel/compiler/mesh: handle const data in task & mesh programs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "88756cee8da77a742fc031ac83f2e5a197023ef8" }, diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp index 1e60d9d97b3..cea5aef677d 100644 --- a/src/intel/compiler/brw_mesh.cpp +++ b/src/intel/compiler/brw_mesh.cpp @@ -339,6 +339,7 @@ brw_compile_task(const struct brw_compiler *compiler, g.generate_code(selected->cfg, selected->dispatch_width, selected->shader_stats, selected->performance_analysis.require(), params->stats); + g.add_const_data(nir->constant_data, nir->constant_data_size); delete v[0]; delete v[1]; @@ -856,6 +857,7 @@ brw_compile_mesh(const struct brw_compiler *compiler, g.generate_code(selected->cfg, selected->dispatch_width, selected->shader_stats, selected->performance_analysis.require(), params->stats); + g.add_const_data(nir->constant_data, nir->constant_data_size); delete v[0]; delete v[1];