=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d-shader: Fix SV_Position.w in pixel shaders.
Alexandre Julliard
julliard at winehq.org
Mon Apr 1 14:57:27 CDT 2019
Module: vkd3d
Branch: master
Commit: acc9430abe5ab5997acc5c0a7d6a6452b80ccc9e
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=acc9430abe5ab5997acc5c0a7d6a6452b80ccc9e
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Apr 1 11:19:44 2019 +0200
vkd3d-shader: Fix SV_Position.w in pixel shaders.
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 | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index f8ba598..6cacf7c 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -1158,6 +1158,12 @@ static uint32_t vkd3d_spirv_build_op_composite_insert(struct vkd3d_spirv_builder
result_type, object_id, composite_id, indexes, index_count);
}
+static uint32_t vkd3d_spirv_build_op_composite_insert1(struct vkd3d_spirv_builder *builder,
+ uint32_t result_type, uint32_t object_id, uint32_t composite_id, uint32_t index)
+{
+ return vkd3d_spirv_build_op_composite_insert(builder, result_type, object_id, composite_id, &index, 1);
+}
+
static uint32_t vkd3d_spirv_build_op_load(struct vkd3d_spirv_builder *builder,
uint32_t result_type, uint32_t pointer_id, uint32_t memory_access)
{
@@ -3215,6 +3221,21 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler,
return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id);
}
+/* frag_coord.w = 1.0f / frag_coord.w */
+static uint32_t frag_coord_fixup(struct vkd3d_dxbc_compiler *compiler,
+ uint32_t frag_coord_id)
+{
+ struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
+ uint32_t type_id, w_id;
+
+ type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1);
+ w_id = vkd3d_spirv_build_op_composite_extract1(builder, type_id, frag_coord_id, 3);
+ w_id = vkd3d_spirv_build_op_fdiv(builder, type_id,
+ vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), w_id);
+ type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);
+ return vkd3d_spirv_build_op_composite_insert1(builder, type_id, w_id, frag_coord_id, 3);
+}
+
struct vkd3d_spirv_builtin
{
enum vkd3d_component_type component_type;
@@ -3273,7 +3294,7 @@ vkd3d_system_value_builtins[] =
};
static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin =
{
- VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord,
+ VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, frag_coord_fixup,
};
static const struct
{
@@ -6906,8 +6927,8 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil
dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0);
/* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);
- coordinate_id = vkd3d_spirv_build_op_composite_insert(builder,
- type_id, dref_id, coordinate_id, &image.resource_type_info->coordinate_component_count, 1);
+ coordinate_id = vkd3d_spirv_build_op_composite_insert1(builder,
+ type_id, dref_id, coordinate_id, image.resource_type_info->coordinate_component_count);
val_id = vkd3d_spirv_build_op_image_sample_dref(builder, op, sampled_type_id,
image.sampled_image_id, coordinate_id, dref_id, operands_mask,
image_operands, image_operand_count);
More information about the wine-cvs
mailing list