wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.

Browse Source 
To vkd3d_shader_tessellator_output_primitive, consistent with vkd3d-shader
naming conventions.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-06-23 13:50:13 +04:30 committed by Alexandre Julliard
parent 95fa257a37
commit 500079a54a
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_shader.h
View File

@ -292,12 +292,14 @@ struct vkd3d_shader_spirv_target_info
unsigned int output_swizzle_count;
};
enum vkd3d_tessellator_output_primitive
enum vkd3d_shader_tessellator_output_primitive
{
VKD3D_TESSELLATOR_OUTPUT_POINT = 1,
VKD3D_TESSELLATOR_OUTPUT_LINE = 2,
VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3,
VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4,
VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT = 0x1,
VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE = 0x2,
VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW = 0x3,
VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 0x4,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE),
};
enum vkd3d_tessellator_partitioning
@ -314,7 +316,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info
enum vkd3d_shader_structure_type type;
const void *next;
enum vkd3d_tessellator_output_primitive output_primitive;
enum vkd3d_shader_tessellator_output_primitive output_primitive;
enum vkd3d_tessellator_partitioning partitioning;
};

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

@ -5623,7 +5623,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co
}
static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler,
enum vkd3d_tessellator_output_primitive primitive)
enum vkd3d_shader_tessellator_output_primitive primitive)
{
SpvExecutionMode mode;
@ -5632,15 +5632,15 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d
switch (primitive)
{
case VKD3D_TESSELLATOR_OUTPUT_POINT:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT:
mode = SpvExecutionModePointMode;
break;
case VKD3D_TESSELLATOR_OUTPUT_LINE:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE:
return;
case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW:
mode = SpvExecutionModeVertexOrderCw;
break;
case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
mode = SpvExecutionModeVertexOrderCcw;
break;
default:

10
libs/vkd3d-shader/trace.c
View File

@ -501,20 +501,20 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer,
}
static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer,
enum vkd3d_tessellator_output_primitive output_primitive)
enum vkd3d_shader_tessellator_output_primitive output_primitive)
{
switch (output_primitive)
{
case VKD3D_TESSELLATOR_OUTPUT_POINT:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT:
shader_addline(buffer, "point");
break;
case VKD3D_TESSELLATOR_OUTPUT_LINE:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE:
shader_addline(buffer, "line");
break;
case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW:
shader_addline(buffer, "triangle_cw");
break;
case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
shader_addline(buffer, "triangle_ccw");
break;
default:

2
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -773,7 +773,7 @@ struct vkd3d_shader_instruction
struct vkd3d_shader_tgsm_structured tgsm_structured;
struct vkd3d_shader_thread_group_size thread_group_size;
enum vkd3d_tessellator_domain tessellator_domain;
enum vkd3d_tessellator_output_primitive tessellator_output_primitive;
enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive;
enum vkd3d_tessellator_partitioning tessellator_partitioning;
float max_tessellation_factor;
struct vkd3d_shader_index_range index_range;