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: Rename the vkd3d_tessellator_partitioning enumeration.

Browse Source 
To vkd3d_shader_tessellator_partitioning.

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:14 +04:30
committed by Alexandre Julliard
parent 500079a54a
commit 7e4fc14a31
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_shader.h
View File

@ -302,12 +302,14 @@ enum vkd3d_shader_tessellator_output_primitive
VKD3D_FORCE_32_BIT_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_SHADER_TESSELLATOR_PARTITIONING_INTEGER = 0x1,
VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2 = 0x2,
VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 0x3,
VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 0x4,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_PARTITIONING),
}; };
/* Extends vkd3d_shader_spirv_target_info. */ /* Extends vkd3d_shader_spirv_target_info. */
@ -317,7 +319,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info
const void *next; const void *next;
enum vkd3d_shader_tessellator_output_primitive output_primitive; enum vkd3d_shader_tessellator_output_primitive output_primitive;
enum vkd3d_tessellator_partitioning partitioning; enum vkd3d_shader_tessellator_partitioning partitioning;
}; };
/* root signature 1.0 */ /* root signature 1.0 */

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

@ -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, 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; SpvExecutionMode mode;
@ -5661,14 +5661,14 @@ static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_
switch (partitioning) switch (partitioning)
{ {
case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER:
case VKD3D_TESSELLATOR_PARTITIONING_POW2: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2:
mode = SpvExecutionModeSpacingEqual; mode = SpvExecutionModeSpacingEqual;
break; break;
case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD:
mode = SpvExecutionModeSpacingFractionalOdd; mode = SpvExecutionModeSpacingFractionalOdd;
break; break;
case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN:
mode = SpvExecutionModeSpacingFractionalEven; mode = SpvExecutionModeSpacingFractionalEven;
break; break;
default: default:

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

@ -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, static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer,
enum vkd3d_tessellator_partitioning partitioning) enum vkd3d_shader_tessellator_partitioning partitioning)
{ {
switch (partitioning) switch (partitioning)
{ {
case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER:
shader_addline(buffer, "integer"); shader_addline(buffer, "integer");
break; break;
case VKD3D_TESSELLATOR_PARTITIONING_POW2: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2:
shader_addline(buffer, "pow2"); shader_addline(buffer, "pow2");
break; break;
case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD:
shader_addline(buffer, "fractional_odd"); shader_addline(buffer, "fractional_odd");
break; break;
case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN:
shader_addline(buffer, "fractional_even"); shader_addline(buffer, "fractional_even");
break; break;
default: default:

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

@ -774,7 +774,7 @@ struct vkd3d_shader_instruction
struct vkd3d_shader_thread_group_size thread_group_size; struct vkd3d_shader_thread_group_size thread_group_size;
enum vkd3d_tessellator_domain tessellator_domain; enum vkd3d_tessellator_domain tessellator_domain;
enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; 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; float max_tessellation_factor;
struct vkd3d_shader_index_range index_range; struct vkd3d_shader_index_range index_range;
struct vkd3d_shader_indexable_temp indexable_temp; struct vkd3d_shader_indexable_temp indexable_temp;