mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-04-13 05:43:18 -07:00
vkd3d-shader: Fix SV_VertexID.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
committed by
Alexandre Julliard
parent
b452ff0b0a
commit
da3e283717
@@ -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,
|
typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *compiler,
|
||||||
uint32_t val_id);
|
uint32_t val_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_var_id, base_id, type_id;
|
||||||
|
|
||||||
|
vkd3d_spirv_enable_capability(builder, SpvCapabilityDrawParameters);
|
||||||
|
|
||||||
|
base_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream,
|
||||||
|
SpvStorageClassInput, VKD3D_TYPE_INT, 1);
|
||||||
|
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_id = vkd3d_spirv_build_op_load(builder,
|
||||||
|
type_id, base_var_id, SpvMemoryAccessMaskNone);
|
||||||
|
|
||||||
|
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. */
|
/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */
|
||||||
static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler,
|
static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler,
|
||||||
uint32_t instance_index_id)
|
uint32_t instance_index_id)
|
||||||
{
|
{
|
||||||
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
|
return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler,
|
||||||
uint32_t base_instance_var_id, base_instance_id, type_id;
|
instance_index_id, SpvBuiltInBaseInstance);
|
||||||
|
|
||||||
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,
|
|
||||||
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);
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
return vkd3d_spirv_build_op_isub(builder,
|
|
||||||
type_id, instance_index_id, base_instance_id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler,
|
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_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5},
|
||||||
|
|
||||||
{VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}},
|
{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_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}},
|
||||||
|
|
||||||
{VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}},
|
{VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}},
|
||||||
|
Reference in New Issue
Block a user