wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d-shader: Fix SV_Position in pixel shaders.

Browse Source
This commit is contained in:
Józef Kucia 2017-06-21 22:00:19 +02:00
parent 9880d78058
commit f5e3b248df
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/vkd3d-shader/spirv.c
View File

@ -886,6 +886,8 @@ struct vkd3d_dxbc_compiler
uint32_t temp_id; uint32_t temp_id;
unsigned int temp_count; unsigned int temp_count;
uint32_t position_id; uint32_t position_id;
enum vkd3d_shader_type shader_type;
}; };
struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version,
@ -926,6 +928,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader
ERR("Invalid shader type %#x.\n", shader_version->type); ERR("Invalid shader type %#x.\n", shader_version->type);
} }
compiler->shader_type = shader_version->type;
return compiler; return compiler;
} }
@ -1321,14 +1325,18 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi
vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone); vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone);
} }
static void vkd3d_dxbc_compiler_decorate_sysval(struct vkd3d_spirv_builder *builder, static void vkd3d_dxbc_compiler_decorate_sysval(struct vkd3d_dxbc_compiler *compiler,
uint32_t target_id, enum vkd3d_shader_input_sysval_semantic sysval) uint32_t target_id, enum vkd3d_shader_input_sysval_semantic sysval)
{ {
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
SpvBuiltIn builtin; SpvBuiltIn builtin;
switch (sysval) switch (sysval)
{ {
case VKD3D_SIV_POSITION: case VKD3D_SIV_POSITION:
if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL)
builtin = SpvBuiltInFragCoord;
else
builtin = SpvBuiltInPosition; builtin = SpvBuiltInPosition;
break; break;
case VKD3D_SIV_VERTEX_ID: case VKD3D_SIV_VERTEX_ID:
@ -1357,7 +1365,7 @@ static void vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler,
storage_class, component_type, component_count); storage_class, component_type, component_count);
vkd3d_spirv_add_iface_variable(builder, var_id); vkd3d_spirv_add_iface_variable(builder, var_id);
if (sysval) if (sysval)
vkd3d_dxbc_compiler_decorate_sysval(builder, var_id, sysval); vkd3d_dxbc_compiler_decorate_sysval(compiler, var_id, sysval);
else else
vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationLocation, dst->reg.idx[0].offset); vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationLocation, dst->reg.idx[0].offset);
@ -1407,7 +1415,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp
storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);
vkd3d_spirv_add_iface_variable(builder, id); vkd3d_spirv_add_iface_variable(builder, id);
if (sysval) if (sysval)
vkd3d_dxbc_compiler_decorate_sysval(builder, id, sysval); vkd3d_dxbc_compiler_decorate_sysval(compiler, id, sysval);
else else
vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset);

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -833,6 +833,7 @@ static inline enum vkd3d_component_type vkd3d_component_type_for_semantic(
switch (sysval) switch (sysval)
{ {
case VKD3D_SIV_NONE: case VKD3D_SIV_NONE:
case VKD3D_SIV_POSITION:
return VKD3D_TYPE_FLOAT; return VKD3D_TYPE_FLOAT;
case VKD3D_SIV_VERTEX_ID: case VKD3D_SIV_VERTEX_ID:
return VKD3D_TYPE_INT; return VKD3D_TYPE_INT;