wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Add support for specialization constants.

Browse Source 
Allows reusing the same SPIR-V binary with different shader parameters.

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-04-26 12:37:05 +02:00 committed by Alexandre Julliard
parent f510e93948
commit 63d12751bb
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1062,6 +1062,13 @@ static uint32_t vkd3d_spirv_get_op_constant_composite(struct vkd3d_spirv_builder
constituents, constituent_count, vkd3d_spirv_build_op_constant_composite); constituents, constituent_count, vkd3d_spirv_build_op_constant_composite);
} }
static uint32_t vkd3d_spirv_build_op_spec_constant(struct vkd3d_spirv_builder *builder,
uint32_t result_type, uint32_t value)
{
return vkd3d_spirv_build_op_tr1(builder, &builder->global_stream,
SpvOpSpecConstant, result_type, value);
}
static uint32_t vkd3d_spirv_build_op_variable(struct vkd3d_spirv_builder *builder, static uint32_t vkd3d_spirv_build_op_variable(struct vkd3d_spirv_builder *builder,
struct vkd3d_spirv_stream *stream, uint32_t type_id, uint32_t storage_class, uint32_t initializer) struct vkd3d_spirv_stream *stream, uint32_t type_id, uint32_t storage_class, uint32_t initializer)
{ {
@ -2492,12 +2499,25 @@ static const struct vkd3d_shader_parameter *vkd3d_dxbc_compiler_get_shader_param
return NULL; return NULL;
} }
static uint32_t vkd3d_shader_get_default_spec_constant_value(enum vkd3d_shader_parameter_name name)
{
switch (name)
{
case VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT:
return 1;
default:
FIXME("Unhandled parameter name %#x.\n", name);
return 0;
}
}
static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler, static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc_compiler *compiler,
enum vkd3d_shader_parameter_name name) enum vkd3d_shader_parameter_name name)
{ {
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_parameter *parameter; const struct vkd3d_shader_parameter *parameter;
uint32_t id; uint32_t type_id, id;
if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name)))
{ {
@ -2509,12 +2529,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc
{ {
return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32);
} }
else if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT)
{
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1);
id = vkd3d_spirv_build_op_spec_constant(builder,
type_id, vkd3d_shader_get_default_spec_constant_value(name));
vkd3d_spirv_build_op_decorate1(builder,
id, SpvDecorationSpecId, parameter->u.specialization_constant.id);
return id;
}
FIXME("Unhandled parameter type %#x.\n", parameter->type); FIXME("Unhandled parameter type %#x.\n", parameter->type);
fail: fail:
id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1);
return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, id); return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id);
} }
static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler, static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler,