wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Rename VKD3D_DATA_INT to VSIR_DATA_I32.

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-17 16:29:38 +02:00
parent 8f05fbc75d
commit a04e4e4010
Notes: Henri Verbeet 2025-07-22 17:20:45 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1633
11 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/glsl.c
View File

@@ -345,7 +345,7 @@ static void shader_glsl_print_bitcast(struct vkd3d_string_buffer *dst, struct vk
{
switch (dst_data_type)
{
case VKD3D_DATA_INT:
case VSIR_DATA_I32:
vkd3d_string_buffer_printf(dst, "floatBitsToInt(%s)", src);
return;
case VKD3D_DATA_UINT:
@@ -363,7 +363,7 @@ static void shader_glsl_print_bitcast(struct vkd3d_string_buffer *dst, struct vk
case VSIR_DATA_F32:
vkd3d_string_buffer_printf(dst, "uintBitsToFloat(%s)", src);
return;
case VKD3D_DATA_INT:
case VSIR_DATA_I32:
if (size == 1)
vkd3d_string_buffer_printf(dst, "int(%s)", src);
else
@@ -522,7 +522,7 @@ static void VKD3D_PRINTF_FUNC(4, 0) shader_glsl_vprint_assignment(struct vkd3d_g
case VSIR_DATA_F32:
close = false;
break;
case VKD3D_DATA_INT:
case VSIR_DATA_I32:
vkd3d_string_buffer_printf(buffer, "intBitsToFloat(");
break;
case VKD3D_DATA_UINT:
@@ -1167,7 +1167,7 @@ static void shader_glsl_store_uav_typed(struct vkd3d_glsl_generator *gen, const
case VKD3D_DATA_UINT:
vkd3d_string_buffer_printf(image_data, "uvec4(");
break;
case VKD3D_DATA_INT:
case VSIR_DATA_I32:
vkd3d_string_buffer_printf(image_data, "ivec4(");
break;
default:
@@ -1770,7 +1770,7 @@ static void shader_glsl_generate_uav_declaration(struct vkd3d_glsl_generator *ge
image_type_prefix = "u";
read_format = "r32ui";
break;
case VKD3D_DATA_INT:
case VSIR_DATA_I32:
image_type_prefix = "i";
read_format = "r32i";
break;
@@ -1998,14 +1998,14 @@ static void shader_glsl_generate_sampler_declaration(struct vkd3d_glsl_generator
case VKD3D_DATA_UINT:
sampler_type_prefix = "u";
break;
case VKD3D_DATA_INT:
sampler_type_prefix = "i";
break;
case VSIR_DATA_F32:
case VKD3D_DATA_UNORM:
case VKD3D_DATA_SNORM:
sampler_type_prefix = "";
break;
case VSIR_DATA_I32:
sampler_type_prefix = "i";
break;
default:
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled data type %#x for combined resource/sampler "