wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Use proper vkd3d_spirv_builtin for PS fragment coordinates.

Browse Source 
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:
Józef Kucia
2019-01-25 13:23:30 +01:00
committed by Alexandre Julliard
parent 495d4b9474
commit bcd91910e4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2977,10 +2977,6 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com
switch (builtin) switch (builtin)
{ {
case SpvBuiltInPosition:
if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL)
builtin = SpvBuiltInFragCoord;
break;
case SpvBuiltInFragDepth: case SpvBuiltInFragDepth:
vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0);
break; break;
@@ -3110,6 +3106,10 @@ vkd3d_system_value_builtins[] =
{VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}},
{VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}},
}; };
static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin =
{
VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord,
};
static const struct static const struct
{ {
enum vkd3d_shader_register_type reg_type; enum vkd3d_shader_register_type reg_type;
@@ -3160,6 +3160,10 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval(
if (!sysval) if (!sysval)
return NULL; return NULL;
/* In pixel shaders, SV_Position is mapped to SpvBuiltInFragCoord. */
if (sysval == VKD3D_SIV_POSITION && compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL)
return &vkd3d_pixel_shader_position_builtin;
target = vkd3d_dxbc_compiler_get_target(compiler); target = vkd3d_dxbc_compiler_get_target(compiler);
for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i)
{ {