Skip to content
Snippets Groups Projects
Commit 60237cb7 authored by Francisco Casas's avatar Francisco Casas Committed by Alexandre Julliard
Browse files

vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing.

parent 4448d114
No related branches found
No related tags found
1 merge request!106vkd3d-shader/hlsl: packoffset() support.
......@@ -678,6 +678,9 @@ struct hlsl_buffer
unsigned size, used_size;
/* Register of type 'b' on which the buffer is allocated. */
struct hlsl_reg reg;
bool manually_packed_elements;
bool automatically_packed_elements;
};
struct hlsl_ctx
......
......@@ -2990,6 +2990,25 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx)
var1->name, var2->name);
}
}
LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{
buffer = var1->buffer;
if (!buffer)
continue;
if (var1->reg_reservation.offset_type == 'c')
buffer->manually_packed_elements = true;
else
buffer->automatically_packed_elements = true;
if (buffer->manually_packed_elements && buffer->automatically_packed_elements)
{
hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"packoffset() must be specified for all the buffer elements, or none of them.");
break;
}
}
}
static void allocate_buffers(struct hlsl_ctx *ctx)
......
......@@ -305,7 +305,7 @@ draw quad
probe all rgba (512.0, 612.0, 712.0, 812.0)
[pixel shader fail todo]
[pixel shader fail]
// packoffset cannot be used unless all elements use it.
cbuffer buffer
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment