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/glsl: Implement VKD3DSIH_AND.

Browse Source
This commit is contained in:
Atharva Nimbalkar 2021-08-25 23:51:09 +05:30 committed by Henri Verbeet
parent c8acf285cb
commit f8d403f330
Notes: Henri Verbeet 2024-09-19 14:46:44 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1084
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,12 @@ static void shader_glsl_print_bitcast(struct vkd3d_string_buffer *dst, struct vk
return; return;
} }
if (src_data_type == VKD3D_DATA_FLOAT && dst_data_type == VKD3D_DATA_UINT)
{
vkd3d_string_buffer_printf(dst, "floatBitsToUint(%s)", src);
return;
}
if (src_data_type == VKD3D_DATA_UINT && dst_data_type == VKD3D_DATA_FLOAT) if (src_data_type == VKD3D_DATA_UINT && dst_data_type == VKD3D_DATA_FLOAT)
{ {
vkd3d_string_buffer_printf(dst, "uintBitsToFloat(%s)", src); vkd3d_string_buffer_printf(dst, "uintBitsToFloat(%s)", src);
@ -317,6 +323,9 @@ static uint32_t glsl_dst_init(struct glsl_dst *glsl_dst, struct vkd3d_glsl_gener
static void VKD3D_PRINTF_FUNC(3, 4) shader_glsl_print_assignment( static void VKD3D_PRINTF_FUNC(3, 4) shader_glsl_print_assignment(
struct vkd3d_glsl_generator *gen, struct glsl_dst *dst, const char *format, ...) struct vkd3d_glsl_generator *gen, struct glsl_dst *dst, const char *format, ...)
{ {
const struct vkd3d_shader_register *dst_reg = &dst->vsir->reg;
struct vkd3d_string_buffer *buffer = gen->buffer;
bool close = true;
va_list args; va_list args;
if (dst->vsir->shift) if (dst->vsir->shift)
@ -326,14 +335,28 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_glsl_print_assignment(
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination modifier(s) %#x.", dst->vsir->modifiers); "Internal compiler error: Unhandled destination modifier(s) %#x.", dst->vsir->modifiers);
shader_glsl_print_indent(gen->buffer, gen->indent); shader_glsl_print_indent(buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer); vkd3d_string_buffer_printf(buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer);
switch (dst_reg->data_type)
{
default:
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination register data type %#x.", dst_reg->data_type);
/* fall through */
case VKD3D_DATA_FLOAT:
close = false;
break;
case VKD3D_DATA_UINT:
vkd3d_string_buffer_printf(buffer, "uintBitsToFloat(");
break;
}
va_start(args, format); va_start(args, format);
vkd3d_string_buffer_vprintf(gen->buffer, format, args); vkd3d_string_buffer_vprintf(buffer, format, args);
va_end(args); va_end(args);
vkd3d_string_buffer_printf(gen->buffer, ";\n"); vkd3d_string_buffer_printf(buffer, "%s;\n", close ? ")" : "");
} }
static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins) static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)
@ -524,6 +547,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
case VKD3DSIH_ADD: case VKD3DSIH_ADD:
shader_glsl_binop(gen, ins, "+"); shader_glsl_binop(gen, ins, "+");
break; break;
case VKD3DSIH_AND:
shader_glsl_binop(gen, ins, "&");
break;
case VKD3DSIH_DCL_INPUT: case VKD3DSIH_DCL_INPUT:
case VKD3DSIH_DCL_OUTPUT: case VKD3DSIH_DCL_OUTPUT:
case VKD3DSIH_DCL_OUTPUT_SIV: case VKD3DSIH_DCL_OUTPUT_SIV: