[PATCH vkd3d 4/7] vkd3d-shader: Use proper vkd3d_spirv_builtin for PS fragment coordinates.
Józef Kucia
joseph.kucia at gmail.com
Fri Jan 25 06:23:30 CST 2019
From: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
libs/vkd3d-shader/spirv.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 1140f5080c44..d0cbf56769b3 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2977,10 +2977,6 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com
switch (builtin)
{
- case SpvBuiltInPosition:
- if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL)
- builtin = SpvBuiltInFragCoord;
- break;
case SpvBuiltInFragDepth:
vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0);
break;
@@ -3110,6 +3106,10 @@ vkd3d_system_value_builtins[] =
{VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, 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
{
enum vkd3d_shader_register_type reg_type;
@@ -3160,6 +3160,10 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval(
if (!sysval)
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);
for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i)
{
--
2.19.2
More information about the wine-devel
mailing list