Zebediah Figura : vkd3d-shader/d3dbc: Translate sm1 fragment outputs to system values.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 9417c7cfb713e291dd81541c8a1e4fd40413b426
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/9417c7cfb713e291dd81541c8a1e4f...

Author: Zebediah Figura 
Date:   Wed Sep 20 13:19:04 2023 -0500

vkd3d-shader/d3dbc: Translate sm1 fragment outputs to system values.

---

libs/vkd3d-shader/d3dbc.c | 6 +++---
 tests/vkd3d_shader_api.c  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index d5104ae9..1fd5ab24 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -597,7 +597,7 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser *
         case VKD3DSPR_TEMP:
             if (sm1->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL
                     && sm1->p.shader_version.major == 1 && !register_index)
-                return add_signature_element(sm1, true, "COLOR", 0, VKD3D_SHADER_SV_NONE, 0, is_dcl, mask);
+                return add_signature_element(sm1, true, "COLOR", 0, VKD3D_SHADER_SV_TARGET, 0, is_dcl, mask);
             return true;

case VKD3DSPR_INPUT:
@@ -641,11 +641,11 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser *

case VKD3DSPR_COLOROUT:
             return add_signature_element(sm1, true, "COLOR", register_index,
-                    VKD3D_SHADER_SV_NONE, register_index, is_dcl, mask);
+                    VKD3D_SHADER_SV_TARGET, register_index, is_dcl, mask);

case VKD3DSPR_DEPTHOUT:
             return add_signature_element(sm1, true, "DEPTH", 0,
-                    VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1);
+                    VKD3D_SHADER_SV_DEPTH, register_index, is_dcl, 0x1);

case VKD3DSPR_RASTOUT:
             switch (register_index)
diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c
index 3182fe0d..106bc21c 100644
--- a/tests/vkd3d_shader_api.c
+++ b/tests/vkd3d_shader_api.c
@@ -587,7 +587,7 @@ static void test_scan_signatures(void)

static const struct vkd3d_shader_signature_element ps2_outputs[] =
     {
-        {"COLOR",       0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
+        {"COLOR",       0, 0, VKD3D_SHADER_SV_TARGET,   VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
     };

static const char ps3_source[] =
@@ -609,8 +609,8 @@ static void test_scan_signatures(void)

static const struct vkd3d_shader_signature_element ps3_outputs[] =
     {
-        {"COLOR",       0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
-        {"DEPTH",       0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 0, 0x1, 0x1},
+        {"COLOR",       0, 0, VKD3D_SHADER_SV_TARGET,   VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
+        {"DEPTH",       0, 0, VKD3D_SHADER_SV_DEPTH,    VKD3D_SHADER_COMPONENT_FLOAT, 0, 0x1, 0x1},
     };

static const char ps4_source[] =