[PATCH 0/1] MR573: vkd3d-shader/spirv: Normalise the shader before allocating registers.

[Giovanni Mascellani (＠giomasce)]

So registers are allocated after normalisation (which could require
additional registers).

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/573

[PATCH 1/1] vkd3d-shader/spirv: Normalise the shader before allocating registers.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

So registers are allocated after normalisation (which could require
additional registers).
---
 libs/vkd3d-shader/spirv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 5798f262c..184144ccc 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -9675,6 +9675,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
     enum vkd3d_result result = VKD3D_OK;
     unsigned int i;
 
+    if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0)
+        return result;
+
     if (parser->shader_desc.temp_count)
         spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count);
     if (parser->shader_desc.ssa_count)
@@ -9685,9 +9688,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
     compiler->location.column = 0;
     compiler->location.line = 1;
 
-    if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0)
-        return result;
-
     if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count))
         return VKD3D_ERROR_OUT_OF_MEMORY;
 
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/573

[PATCH 0/1] MR573: vkd3d-shader/spirv: Normalise the shader before allocating registers. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/573

[PATCH 0/1] MR573: vkd3d-shader/spirv: Normalise the shader before allocating registers. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/573