[PATCH 0/2] MR720: vkd3d-shader/glsl: Generate comments for unhandled instructions.

[PATCH 1/2] vkd3d-shader/glsl: Trace the generated shader.

[Henri Verbeet]

From: Henri Verbeet

Even if compilation ultimately failed.
---
 libs/vkd3d-shader/glsl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c
index da90782c8..2971f577a 100644
--- a/libs/vkd3d-shader/glsl.c
+++ b/libs/vkd3d-shader/glsl.c
@@ -92,11 +92,14 @@ static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator,
         vkd3d_glsl_handle_instruction(generator, &instructions->elements[i]);
     }

+    vkd3d_string_buffer_printf(&generator->buffer, "}\n");
+
+    if (TRACE_ON())
+        vkd3d_string_buffer_trace(&generator->buffer);
+
     if (generator->failed)
         return VKD3D_ERROR_INVALID_SHADER;

-    vkd3d_string_buffer_printf(&generator->buffer, "}\n");
-
     if ((code = vkd3d_malloc(generator->buffer.buffer_size)))
     {
         memcpy(code, generator->buffer.buffer, generator->buffer.content_size);

[PATCH 2/2] vkd3d-shader/glsl: Generate comments for unhandled instructions.

[Henri Verbeet]

From: Henri Verbeet

Mostly for debugging purposes; we'll fail compilation, but will still trace
the shader that would have been generated.
---
 libs/vkd3d-shader/glsl.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c
index 2971f577a..23ea89c47 100644
--- a/libs/vkd3d-shader/glsl.c
+++ b/libs/vkd3d-shader/glsl.c
@@ -39,6 +39,13 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error(
     generator->failed = true;
 }

+static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)
+{
+    vkd3d_string_buffer_printf(&gen->buffer, "/* <unhandled instruction %#x> */\n", ins->handler_idx);
+    vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
+            "Internal compiler error: Unhandled instruction %#x.", ins->handler_idx);
+}
+
 static void shader_glsl_ret(struct vkd3d_glsl_generator *generator,
         const struct vkd3d_shader_instruction *ins)
 {
@@ -69,9 +76,7 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator
             shader_glsl_ret(generator, instruction);
             break;
         default:
-            vkd3d_glsl_compiler_error(generator,
-                    VKD3D_SHADER_ERROR_GLSL_INTERNAL,
-                    "Unhandled instruction %#x", instruction->handler_idx);
+            shader_glsl_unhandled(generator, instruction);
             break;
     }
 }

[PATCH 0/2] MR720: vkd3d-shader/glsl: Generate comments for unhandled instructions. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.