To vkd3d_shader_tessellator_partitioning.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66793dc..d49fecd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -302,12 +302,14 @@ enum vkd3d_shader_tessellator_output_primitive VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), };
-enum vkd3d_tessellator_partitioning +enum vkd3d_shader_tessellator_partitioning { - VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, - VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER = 0x1, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2 = 0x2, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 0x3, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_PARTITIONING), };
/* Extends vkd3d_shader_spirv_target_info. */ @@ -317,7 +319,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info const void *next;
enum vkd3d_shader_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_partitioning partitioning; + enum vkd3d_shader_tessellator_partitioning partitioning; };
/* root signature 1.0 */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7c8ddab..7636316 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5652,7 +5652,7 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d }
static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { SpvExecutionMode mode;
@@ -5661,14 +5661,14 @@ static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_
switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: mode = SpvExecutionModeSpacingEqual; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: mode = SpvExecutionModeSpacingFractionalOdd; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: mode = SpvExecutionModeSpacingFractionalEven; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ee9b45c..1b59e4c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -524,20 +524,20 @@ static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer }
static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: shader_addline(buffer, "integer"); break; - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: shader_addline(buffer, "pow2"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: shader_addline(buffer, "fractional_odd"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: shader_addline(buffer, "fractional_even"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c8734ef..dfbbdfd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; - enum vkd3d_tessellator_partitioning tessellator_partitioning; + enum vkd3d_shader_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; struct vkd3d_shader_indexable_temp indexable_temp;
-
Henri Verbeet