=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d-shader: Fix SV_VertexID.
Alexandre Julliard
julliard at winehq.org
Tue Jan 15 14:20:15 CST 2019
Module: vkd3d
Branch: master
Commit: da3e28371780ff731e6fb6cfa259e1bed91dd2b1
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da3e28371780ff731e6fb6cfa259e1bed91dd2b1
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Jan 15 12:09:41 2019 +0100
vkd3d-shader: Fix SV_VertexID.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/spirv.c | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 9d1a0df..fa94340 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -3003,31 +3003,40 @@ static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler
typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *compiler,
uint32_t val_id);
-/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */
-static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler,
- uint32_t instance_index_id)
+static uint32_t vkd3d_dxbc_compiler_emit_draw_parameter_fixup(struct vkd3d_dxbc_compiler *compiler,
+ uint32_t index_id, SpvBuiltIn base)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
- uint32_t base_instance_var_id, base_instance_id, type_id;
+ uint32_t base_var_id, base_id, type_id;
vkd3d_spirv_enable_capability(builder, SpvCapabilityDrawParameters);
- /* The Vulkan spec states:
- *
- * "The variable decorated with BaseInstance must be declared as a scalar
- * 32-bit integer.
- */
- base_instance_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream,
+ base_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream,
SpvStorageClassInput, VKD3D_TYPE_INT, 1);
- vkd3d_spirv_add_iface_variable(builder, base_instance_var_id);
- vkd3d_dxbc_compiler_decorate_builtin(compiler, base_instance_var_id, SpvBuiltInBaseInstance);
+ vkd3d_spirv_add_iface_variable(builder, base_var_id);
+ vkd3d_dxbc_compiler_decorate_builtin(compiler, base_var_id, base);
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1);
- base_instance_id = vkd3d_spirv_build_op_load(builder,
- type_id, base_instance_var_id, SpvMemoryAccessMaskNone);
+ base_id = vkd3d_spirv_build_op_load(builder,
+ type_id, base_var_id, SpvMemoryAccessMaskNone);
- return vkd3d_spirv_build_op_isub(builder,
- type_id, instance_index_id, base_instance_id);
+ return vkd3d_spirv_build_op_isub(builder, type_id, index_id, base_id);
+}
+
+/* Substitute "VertexIndex - BaseVertex" for SV_VertexID. */
+static uint32_t sv_vertex_id_fixup(struct vkd3d_dxbc_compiler *compiler,
+ uint32_t vertex_index_id)
+{
+ return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler,
+ vertex_index_id, SpvBuiltInBaseVertex);
+}
+
+/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */
+static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler,
+ uint32_t instance_index_id)
+{
+ return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler,
+ instance_index_id, SpvBuiltInBaseInstance);
}
static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler,
@@ -3061,7 +3070,7 @@ vkd3d_system_value_builtins[] =
{VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5},
{VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}},
- {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}},
+ {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}},
{VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}},
{VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}},
More information about the wine-cvs
mailing list