Zebediah Figura : vkd3d-shader/d3dbc: Return ctx->result from hlsl_sm1_write().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 71afb78126488008f64716ae1df41910a8c5a2ef
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/71afb78126488008f64716ae1df419...

Author: Zebediah Figura 
Date:   Wed Jul 26 18:42:42 2023 -0500

vkd3d-shader/d3dbc: Return ctx->result from hlsl_sm1_write().

---

libs/vkd3d-shader/d3dbc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index 91910850..fe739339 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -2442,7 +2442,6 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b
 int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out)
 {
     struct vkd3d_bytecode_buffer buffer = {0};
-    int ret;

put_u32(&buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version));

@@ -2455,7 +2454,10 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun

put_u32(&buffer, D3DSIO_END);

-    if (!(ret = buffer.status))
+    if (buffer.status)
+        ctx->result = buffer.status;
+
+    if (!ctx->result)
     {
         out->code = buffer.data;
         out->size = buffer.size;
@@ -2464,5 +2466,5 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun
     {
         vkd3d_free(buffer.data);
     }
-    return ret;
+    return ctx->result;
 }