Skip to content

vcc glsl backend upgrades #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

vcc glsl backend upgrades #37

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f83ae5c
Fixed prefix for AsUniformConstant when emitting GLSL
JuanDiegoMontoya May 6, 2024
3fb5d50
Added more address spaces to avoid emitting initializers for.
JuanDiegoMontoya May 7, 2024
59f6544
Emit location qualifier when targeting GLSL
JuanDiegoMontoya May 7, 2024
006f80a
Reorganize qualifier-emitting code
JuanDiegoMontoya May 9, 2024
599e8a1
Support for UBOs and SSBOs of fixed lengths
JuanDiegoMontoya May 9, 2024
04884c9
Restore gitignore
JuanDiegoMontoya May 9, 2024
06de81e
Simplify annotation helper
JuanDiegoMontoya May 10, 2024
58611db
Hack to strip illegal identifiers (containing double underscores) fro…
JuanDiegoMontoya May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions src/shady/emit/c/emit_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static bool has_forward_declarations(CDialect dialect) {
}
}

static void emit_global_variable_definition(Emitter* emitter, AddressSpace as, String decl_center, const Type* type, bool constant, String init) {
static void emit_global_variable_definition(Emitter* emitter, AddressSpace as, String decl_center, const Type* type, bool constant, String init, const Nodes* annotations) {
String prefix = NULL;

// GLSL wants 'const' to go on the left to start the declaration, but in C const should go on the right (east const convention)
Expand Down Expand Up @@ -188,10 +188,34 @@ static void emit_global_variable_definition(Emitter* emitter, AddressSpace as, S
decl_center = format_string_arena(emitter->arena->arena, "varying %s", decl_center);
}

String qualifiers = "";

if (emitter->config.dialect == CDialect_GLSL) {
// Binding and location qualifiers are allowed together on opaque uniform constants, but it's not very useful.
// For uniform constants, explicit locations require version 430 or ARB_explicit_uniform_location.
if (as == AsUniformConstant || as == AsInput || as == AsUInput || as == AsOutput) {
const Node* a_location = lookup_annotation_list(*annotations, "Location");
if (a_location) {
assert(is_annotation(a_location));
if (a_location->tag == AnnotationValue_TAG) {
const Node* value = a_location->payload.annotation_value.value;
if (value->tag == IntLiteral_TAG) {
uint64_t location = value->payload.int_literal.value;
qualifiers = format_string_arena(emitter->arena->arena, "layout(location = %" PRIu64 ") ", location);
} else {
warn_print("warning: location must be an integer literal\n");
}
} else {
warn_print("warning: location annotations must contain exactly one integer value\n");
}
}
}
}

if (init)
print(emitter->fn_decls, "\n%s%s = %s;", prefix, emit_type(emitter, type, decl_center), init);
print(emitter->fn_decls, "\n%s%s%s = %s;", qualifiers, prefix, emit_type(emitter, type, decl_center), init);
else
print(emitter->fn_decls, "\n%s%s;", prefix, emit_type(emitter, type, decl_center));
print(emitter->fn_decls, "\n%s%s%s;", qualifiers, prefix, emit_type(emitter, type, decl_center));

//if (!has_forward_declarations(emitter->config.dialect) || !init)
// return;
Expand Down Expand Up @@ -254,7 +278,7 @@ CTerm emit_value(Emitter* emitter, Printer* block_printer, const Node* value) {
if (emitter->config.dialect == CDialect_GLSL)
return emit_value(emitter, block_printer, get_default_zero_value(emitter->arena, value->payload.undef.type));
String name = unique_name(emitter->arena, "undef");
emit_global_variable_definition(emitter, AsGlobal, name, value->payload.undef.type, true, NULL);
emit_global_variable_definition(emitter, AsGlobal, name, value->payload.undef.type, true, NULL, NULL);
emitted = name;
break;
}
Expand Down Expand Up @@ -574,7 +598,8 @@ void emit_decl(Emitter* emitter, const Node* decl) {
if (decl->payload.global_variable.init)
init = to_cvalue(emitter, emit_value(emitter, NULL, decl->payload.global_variable.init));
AddressSpace ass = decl->payload.global_variable.address_space;
if (ass == AsInput || ass == AsOutput)
// Address spaces for which initializers are illegal
if (ass == AsInput || ass == AsOutput || ass == AsUniform || ass == AsShaderStorageBufferObject || ass == AsImage)
init = NULL;

const GlobalVariable* gvar = &decl->payload.global_variable;
Expand All @@ -601,8 +626,9 @@ void emit_decl(Emitter* emitter, const Node* decl) {
}
register_emitted(emitter, decl, emit_as);

const Nodes* annotations = &decl->payload.global_variable.annotations;
AddressSpace as = decl->payload.global_variable.address_space;
emit_global_variable_definition(emitter, as, decl_center, decl_type, false, init);
emit_global_variable_definition(emitter, as, decl_center, decl_type, false, init, annotations);
return;
}
case Function_TAG: {
Expand Down Expand Up @@ -648,7 +674,7 @@ void emit_decl(Emitter* emitter, const Node* decl) {
const Node* init_value = get_quoted_value(decl->payload.constant.instruction);
assert(init_value && "TODO: support some measure of constant expressions");
String init = to_cvalue(emitter, emit_value(emitter, NULL, init_value));
emit_global_variable_definition(emitter, AsGlobal, decl_center, decl->type, true, init);
emit_global_variable_definition(emitter, AsGlobal, decl_center, decl->type, true, init, NULL);
return;
}
case NominalType_TAG: {
Expand Down