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

libs/vkd3d-shader: Translate dcl_maxout instructions.

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
2018-01-11 17:03:51 +01:00
committed by Alexandre Julliard
parent 54dd321729
commit 4ad1f9683e
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,6 +227,10 @@ struct vkd3d_spirv_builder
uint32_t local_size[3]; uint32_t local_size[3];
} compute; } compute;
struct struct
{
uint32_t output_vertices;
} geometry;
struct
{ {
bool depth_replacing; bool depth_replacing;
} fragment; } fragment;
@ -318,6 +322,15 @@ static void vkd3d_spirv_set_local_size(struct vkd3d_spirv_builder *builder,
builder->u.compute.local_size[2] = z; builder->u.compute.local_size[2] = z;
} }
static void vkd3d_spirv_set_output_vertices(struct vkd3d_spirv_builder *builder,
unsigned int output_vertex_count)
{
assert(builder->execution_model == SpvExecutionModelGeometry);
assert(output_vertex_count > 0);
builder->u.geometry.output_vertices = output_vertex_count;
}
static void vkd3d_spirv_enable_depth_replacing(struct vkd3d_spirv_builder *builder) static void vkd3d_spirv_enable_depth_replacing(struct vkd3d_spirv_builder *builder)
{ {
assert(builder->execution_model == SpvExecutionModelFragment); assert(builder->execution_model == SpvExecutionModelFragment);
@ -1513,16 +1526,24 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder)
static void vkd3d_spirv_build_execution_mode_declarations(struct vkd3d_spirv_builder *builder, static void vkd3d_spirv_build_execution_mode_declarations(struct vkd3d_spirv_builder *builder,
struct vkd3d_spirv_stream *stream) struct vkd3d_spirv_stream *stream)
{ {
const uint32_t function_id = builder->main_function_id;
switch (builder->execution_model) switch (builder->execution_model)
{ {
case SpvExecutionModelGeometry:
if (builder->u.geometry.output_vertices)
vkd3d_spirv_build_op_execution_mode(stream, function_id,
SpvExecutionModeOutputVertices, &builder->u.geometry.output_vertices, 1);
break;
case SpvExecutionModelFragment: case SpvExecutionModelFragment:
if (builder->u.fragment.depth_replacing) if (builder->u.fragment.depth_replacing)
vkd3d_spirv_build_op_execution_mode(stream, builder->main_function_id, vkd3d_spirv_build_op_execution_mode(stream, function_id,
SpvExecutionModeDepthReplacing, NULL, 0); SpvExecutionModeDepthReplacing, NULL, 0);
break; break;
case SpvExecutionModelGLCompute: case SpvExecutionModelGLCompute:
vkd3d_spirv_build_op_execution_mode(stream, builder->main_function_id, vkd3d_spirv_build_op_execution_mode(stream, function_id,
SpvExecutionModeLocalSize, builder->u.compute.local_size, SpvExecutionModeLocalSize, builder->u.compute.local_size,
ARRAY_SIZE(builder->u.compute.local_size)); ARRAY_SIZE(builder->u.compute.local_size));
break; break;
@ -3548,6 +3569,14 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler *
instruction->declaration.register_semantic.sysval_semantic); instruction->declaration.register_semantic.sysval_semantic);
} }
static void vkd3d_dxbc_compiler_emit_dcl_vertices_out(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_instruction *instruction)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
vkd3d_spirv_set_output_vertices(builder, instruction->declaration.count);
}
static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@ -5426,6 +5455,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler
case VKD3DSIH_DCL_OUTPUT_SIV: case VKD3DSIH_DCL_OUTPUT_SIV:
vkd3d_dxbc_compiler_emit_dcl_output_siv(compiler, instruction); vkd3d_dxbc_compiler_emit_dcl_output_siv(compiler, instruction);
break; break;
case VKD3DSIH_DCL_VERTICES_OUT:
vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction);
break;
case VKD3DSIH_DCL_THREAD_GROUP: case VKD3DSIH_DCL_THREAD_GROUP:
vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction);
break; break;