From ea2f4877abde7433204245d6f49c0f7c8b816375 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 9 Jan 2025 14:13:18 +0200 Subject: [PATCH] intel: fix generation shader on Gfx9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This probably interacts badly with the LLVM17+ opaque pointer workaround. Hopefully I can move this all over Alyssa's pass. Signed-off-by: Lionel Landwerlin Fixes: b52e25d3a8 ("anv: rewrite internal shaders using OpenCL") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12413 Reviewed-by: Tapani Pälli (cherry picked from commit 58b604abdf4094d6c0cb22334a2e56475e4b643f) Part-of: --- .pick_status.json | 2 +- src/intel/shaders/generate.cl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 11a81d47eae..1211d0f3d95 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1704,7 +1704,7 @@ "description": "intel: fix generation shader on Gfx9", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b52e25d3a8eee702ff5d21e4cdb9a4dc0736282a", "notes": null diff --git a/src/intel/shaders/generate.cl b/src/intel/shaders/generate.cl index d41b57fc187..94b6fea903d 100644 --- a/src/intel/shaders/generate.cl +++ b/src/intel/shaders/generate.cl @@ -9,9 +9,9 @@ void genX(write_3DSTATE_VERTEX_BUFFERS)(global void *dst_ptr, { struct GENX(3DSTATE_VERTEX_BUFFERS) v = { GENX(3DSTATE_VERTEX_BUFFERS_header), + .DWordLength = 1 + (buffer_count * 4) - + GENX(3DSTATE_VERTEX_BUFFERS_length_bias), }; - v.DWordLength = 1 + (buffer_count * 4) - - GENX(3DSTATE_VERTEX_BUFFERS_length_bias); GENX(3DSTATE_VERTEX_BUFFERS_pack)(dst_ptr, &v); }