[PATCH v3 0/2] MR46: vkd3d-shader/spirv: Do not write the point size if shaderTessellationAndGeometryPointSize is disabled.

[Zebediah Figura (＠zfigura)]

--
  v3: vkd3d: Do not write the point size for SPIR-V shaders.
      vkd3d-shader/spirv: Introduce an option to control whether point size is written.

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

[PATCH v3 1/2] vkd3d-shader/spirv: Introduce an option to control whether point size is written.

[Zebediah Figura]

From: Zebediah Figura

---
 include/vkd3d_shader.h    | 12 ++++++++++++
 libs/vkd3d-shader/spirv.c | 22 ++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 7b9c0ff7..86ffb9d5 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -150,6 +150,18 @@ enum vkd3d_shader_compile_option_name
     VKD3D_SHADER_COMPILE_OPTION_API_VERSION = 0x00000004,
     /** \a value is a member of enum vkd3d_shader_compile_option_typed_uav. \since 1.5 */
     VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV   = 0x00000005,
+    /**
+     * If \a value is nonzero, write the point size for Vulkan tessellation and
+     * geometry shaders. This option should be enabled if and only if the
+     * shaderTessellationAndGeometryPointSize feature is enabled. The default
+     * value is nonzero, i.e. write the point size.
+     *
+     * This option is supported by vkd3d_shader_compile() for the SPIR-V target
+     * type and Vulkan targets; it should not be enabled otherwise.
+     *
+     * \since 1.6
+     */
+    VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE = 0x00000006,

VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME),
 };
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 417cdc92..f0cfee47 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2285,6 +2285,7 @@ struct spirv_compiler
     struct vkd3d_shader_spec_constant *spec_constants;
     size_t spec_constants_size;
     enum vkd3d_shader_compile_option_formatting_flags formatting;
+    bool write_tess_geom_point_size;

struct vkd3d_string_buffer_cache string_buffers;
 };
@@ -2351,6 +2352,7 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *

compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT
             | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER;
+    compiler->write_tess_geom_point_size = true;

for (i = 0; i < compile_info->option_count; ++i)
     {
@@ -2389,6 +2391,10 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *
                 else
                     WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name);
                 break;
+
+            case VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE:
+                compiler->write_tess_geom_point_size = option->value;
+                break;
         }
     }

@@ -6348,10 +6354,18 @@ static void spirv_compiler_emit_point_size(struct spirv_compiler *compiler)
     /* Set the point size. Point sprites are not supported in d3d10+, but
      * point primitives can still be used with e.g. stream output. Vulkan
      * requires the point size to always be explicitly defined when outputting
-     * points. */
-    vkd3d_spirv_build_op_store(&compiler->spirv_builder,
-            spirv_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0),
-            spirv_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone);
+     * points.
+     *
+     * If shaderTessellationAndGeometryPointSize is disabled, we must not write
+     * PointSize for tessellation and geometry shaders. In that case the point
+     * size defaults to 1.0. */
+    if (spirv_compiler_is_opengl_target(compiler) || compiler->shader_type == VKD3D_SHADER_TYPE_VERTEX
+            || compiler->write_tess_geom_point_size)
+    {
+        vkd3d_spirv_build_op_store(&compiler->spirv_builder,
+                spirv_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0),
+                spirv_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone);
+    }
 }

static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compiler,

[PATCH v3 2/2] vkd3d: Do not write the point size for SPIR-V shaders.

[Zebediah Figura]

From: Zebediah Figura

We disable shaderTessellationAndGeometryPointSize.
---
 libs/vkd3d/state.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 5ba5eb81..02f739d2 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1966,6 +1966,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device,
     {
         {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_6},
         {VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV, typed_uav_compile_option(device)},
+        {VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE, 0},
     };

stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;

[Zebediah Figura (＠zfigura)]

I've rewritten this with an option instead, to avoid changing the default value.

[PATCH v3 0/2] MR46: vkd3d-shader/spirv: Do not write the point size if shaderTessellationAndGeometryPointSize is disabled. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.