[PATCH 0/2] MR2776: wined3d: Do not declare resources as multisampled if the sample count is 1.

[PATCH 1/2] wined3d: Read the sm4 sample count in DCL instructions.

[Zebediah Figura]

From: Zebediah Figura

Based on vkd3d commit ee52ad810635cf504a49d5267a5942fffb16836e.
---
 dlls/wined3d/shader_sm4.c      | 10 ++++++++++
 dlls/wined3d/wined3d_private.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index b87d45b0fb7..78abdbe81ac 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -49,6 +49,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode);
 #define WINED3D_SM4_RESOURCE_TYPE_SHIFT         11
 #define WINED3D_SM4_RESOURCE_TYPE_MASK          (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT)

+#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT 16
+#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK  (0xfu << WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT)
+
 #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT        11
 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK         (0x3fu << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT)

@@ -592,6 +595,13 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins,
     {
         ins->declaration.semantic.resource_type = resource_type_table[resource_type];
     }
+
+    if (ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS
+            || ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY)
+    {
+        ins->declaration.semantic.sample_count = (opcode_token & WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK) >> WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT;
+    }
+
     reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV;
     shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], reg_data_type, &ins->declaration.semantic.reg);

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f793c6c0cde..d28a86f77c2 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1311,6 +1311,7 @@ struct wined3d_shader_semantic
     enum wined3d_decl_usage usage;
     UINT usage_idx;
     enum wined3d_shader_resource_type resource_type;
+    unsigned int sample_count;
     enum wined3d_data_type resource_data_type;
     struct wined3d_shader_dst_param reg;
 };

[PATCH 2/2] wined3d: Do not declare resources as multisampled if the sample count is 1.

[Zebediah Figura]

From: Zebediah Figura

Based on vkd3d commit d8ef0c69a817d059b1d4fc62520131eed80aba29.
---
 dlls/wined3d/shader.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 7ee68a3436d..b4df79508ec 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1070,6 +1070,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co
                         break;
                     }
                     reg_maps->resource_info[reg_idx].type = semantic->resource_type;
+                    if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS && semantic->sample_count == 1)
+                        reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2D;
+                    if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY && semantic->sample_count == 1)
+                        reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY;
                     reg_maps->resource_info[reg_idx].data_type = semantic->resource_data_type;
                     wined3d_bitmap_set(reg_maps->resource_map, reg_idx);
                     break;

[PATCH 0/2] MR2776: wined3d: Do not declare resources as multisampled if the sample count is 1. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.