Skip to content

[WIP] Compute shader #14

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

Open
whitebelyash wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] Compute shader #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
684d744
Feat[egl]: expose ARB_shader_image_store on ES3.1+
whitebelyash Nov 28, 2025
fcf7822
Feat[compute]: add experimental compute shader support
whitebelyash Nov 28, 2025
302b59f
Merge branch 'master' into feat/compute
whitebelyash Jan 6, 2026
ccf4ac6
WIP[shader_wrapper]: DO NOT USE, unfinished compute implementation
artdeell Jan 8, 2026
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
7 changes: 5 additions & 2 deletions ltw/src/main/tinywrapper/egl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,11 @@ void build_extension_string(context_t* context) {
// Required by Iris. Indexed variants are available since ES3.2 or with OES/EXT_draw_buffers_indexed extensions
if(context->blending.available)
add_extra_extension(context, &length, "GL_ARB_draw_buffers_blend");
// Used by Minecraft for the GPU usage counter (see Blaze3D TimerQuery)
add_extra_extension(context, &length, "GL_ARB_timer_query");
// Compute shaders are ES3.1+. No reason to support older devices
if(context->es31) {
add_extra_extension(context, &length, "GL_ARB_shader_image_load_store");
add_extra_extension(context, &length, "GL_ARB_compute_shader");
}
// More extensions are possible, but will need way more wraps and tracking.
fin_extra_extensions(context, length);
}
Expand Down
4 changes: 3 additions & 1 deletion ltw/src/main/tinywrapper/es3_extended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ GLESFUNC(glTexBufferRangeEXT, PFNGLTEXBUFFERRANGEEXTPROC)
GLESFUNC(glMultiDrawElementsIndirectEXT, PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC)
GLESFUNC(glGetQueryObjecti64vEXT, PFNGLGETQUERYOBJECTI64VEXTPROC)
GLESFUNC(glGetQueryObjectui64vEXT, PFNGLGETQUERYOBJECTUI64VEXTPROC)
GLESFUNC(glQueryCounterEXT, PFNGLQUERYCOUNTEREXTPROC)
GLESFUNC(glQueryCounterEXT, PFNGLQUERYCOUNTEREXTPROC)
GLESFUNC(glDispatchCompute, PFNGLDISPATCHCOMPUTEPROC)
GLESFUNC(glDispatchComputeIndirect, PFNGLDISPATCHCOMPUTEINDIRECTPROC)
3 changes: 3 additions & 0 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/code/GlslConvert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ char * GlslConvert::Optimize(
if (!state->translation_unit.is_empty())
_mesa_ast_to_hir(ir, state);

if(!state->error)
_mesa_set_shader_inout_layout(shader, state);

if (!state->error)
{
// Link built-in functions
Expand Down
177 changes: 115 additions & 62 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/code/ir_print_glsl_visitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,22 @@ const char* str_primtype(GLenum type, bool out) {
case GL_TRIANGLE_STRIP_ADJACENCY:
case GL_TRIANGLES_ADJACENCY: return "triangles_adjacency";
default:
printf("Unhandled geom shader input primtype: %x\n", type);
printf("ir_print_glsl_visitor: Unhandled geom shader input primtype: %x\n", type);
return "unknown";
}
else switch(type) {
case GL_POINTS: return "points";
case GL_LINE_STRIP: return "line_strip";
case GL_TRIANGLE_STRIP: return "triangle_strip";
default:
printf("Unhandled geom shader output primtype: %x\n", type);
printf("ir_print_glsl_visitor: Unhandled geom shader output primtype: %x\n", type);
return "unknown";
}
}

bool should_print_layout(const ast_type_qualifier* qual) {
return qual->flags.q.prim_type ||
qual->flags.q.max_vertices ||
qual->flags.q.local_size;
qual->flags.q.max_vertices;
}

void print_layout(sbuffer& str, struct _mesa_glsl_parse_state* state, ast_type_qualifier* qual, bool out) {
Expand All @@ -167,7 +166,6 @@ void print_layout(sbuffer& str, struct _mesa_glsl_parse_state* state, ast_type_q
block \
}
#define LAYOUT_QUALIFIER(name, block) I_LAYOUT_QUALIFIER(qual->flags.q.name, block)
#define LAYOUT_QUALIFIER_MASK(name, bit, block) I_LAYOUT_QUALIFIER(qual->flags.q.name & (bit), block)
str.append("layout(");
LAYOUT_QUALIFIER(prim_type,{
str.append("%s", str_primtype(qual->prim_type, out));
Expand All @@ -178,15 +176,12 @@ void print_layout(sbuffer& str, struct _mesa_glsl_parse_state* state, ast_type_q
&qual_max_vertices, true);
str.append("max_vertices=%u", qual_max_vertices);
})
LAYOUT_QUALIFIER_MASK(local_size, 1 << 0, {
str.append("local_size_x=", state->cs_input_local_size[0]);
})
LAYOUT_QUALIFIER_MASK(local_size, 1 << 1, {
str.append("local_size_y=", state->cs_input_local_size[1]);
})
LAYOUT_QUALIFIER_MASK(local_size, 1 << 2, {
str.append("local_size_z=", state->cs_input_local_size[2]);
})
if(!out && state->cs_input_local_size_specified) {
auto& local_size = state->cs_input_local_size;
I_LAYOUT_QUALIFIER(local_size[0] != 0, str.append("local_size_x=%u",local_size[0]);)
I_LAYOUT_QUALIFIER(local_size[1] != 0, str.append("local_size_y=%u",local_size[1]);)
I_LAYOUT_QUALIFIER(local_size[2] != 0, str.append("local_size_z=%u",local_size[2]);)
}
str.append(") ");
}

Expand Down Expand Up @@ -345,7 +340,7 @@ char * IR_TO_GLSL::Convert(
}
res.append("};\n");
}
if(should_print_layout(state->in_qualifier)) {
if(should_print_layout(state->in_qualifier) || state->cs_input_local_size_specified) {
print_layout(res, state, state->in_qualifier, false);
res.append("in;\n");
}
Expand Down Expand Up @@ -550,6 +545,92 @@ IR_TO_GLSL::visit(ir_rvalue*)
generated_source.append("error");
}

static const char* image_load_store_format(pipe_format format) {
switch (format) {
case PIPE_FORMAT_R32G32B32A32_FLOAT: return "rgba32f";
case PIPE_FORMAT_R16G16B16A16_FLOAT: return "rgba16f";
case PIPE_FORMAT_R32G32_FLOAT: return "rg32f";
case PIPE_FORMAT_R16G16_FLOAT: return "rg16f";
case PIPE_FORMAT_R11G11B10_FLOAT: return "r11f_g11f_b10f";
case PIPE_FORMAT_R32_FLOAT: return "r32f";
case PIPE_FORMAT_R16_FLOAT: return "r16f";
case PIPE_FORMAT_R16G16B16A16_SSCALED: return "rgba16";
case PIPE_FORMAT_R10G10B10A2_SSCALED: return "rgb10_a2";
case PIPE_FORMAT_R8G8B8A8_SSCALED: return "rgba8";
case PIPE_FORMAT_R16G16_SSCALED: return "rg16";
case PIPE_FORMAT_R8G8_SSCALED: return "rg8";
case PIPE_FORMAT_R16_SSCALED: return "r16";
case PIPE_FORMAT_R8_SSCALED: return "r8";
case PIPE_FORMAT_R16G16B16A16_SNORM: return "rgba16_snorm";
case PIPE_FORMAT_R8G8B8A8_SNORM: return "rgba8_snorm";
case PIPE_FORMAT_R16G16_SNORM: return "rg16_snorm";
case PIPE_FORMAT_R8G8_SNORM: return "rg8_snorm";
case PIPE_FORMAT_R16_SNORM: return "r16_snorm";
case PIPE_FORMAT_R8_SNORM: return "r8_snorm";
case PIPE_FORMAT_R32G32B32A32_SINT: return "rgba32i";
case PIPE_FORMAT_R16G16B16A16_SINT: return "rgba16i";
case PIPE_FORMAT_R8G8B8A8_SINT: return "rgba8i";
case PIPE_FORMAT_R32G32_SINT: return "rg32i";
case PIPE_FORMAT_R16G16_SINT: return "rg16i";
case PIPE_FORMAT_R8G8_SINT: return "rg8i";
case PIPE_FORMAT_R32_SINT: return "r32i";
case PIPE_FORMAT_R16_SINT: return "r16i";
case PIPE_FORMAT_R8_SINT: return "r8i";
case PIPE_FORMAT_R32G32B32A32_UINT: return "rgba32ui";
case PIPE_FORMAT_R16G16B16A16_UINT: return "rgba16ui";
case PIPE_FORMAT_R10G10B10A2_UINT: return "rgb10_a2ui";
case PIPE_FORMAT_R8G8B8A8_UINT: return "rgba8ui";
case PIPE_FORMAT_R32G32_UINT: return "rg32ui";
case PIPE_FORMAT_R16G16_UINT: return "rg16ui";
case PIPE_FORMAT_R8G8_UINT: return "rg8ui";
case PIPE_FORMAT_R32_UINT: return "r32ui";
case PIPE_FORMAT_R16_UINT: return "r16ui";
case PIPE_FORMAT_R8_UINT: return "r8ui";
default:
printf("ir_print_glsl_visitor: Unknown image load store format: %u\n", format);
return "unknown";
}
}
void IR_TO_GLSL::print_generic_layout_block(ir_variable* ir) {
auto &data = ir->data;
bool should_print = data.binding || data.explicit_location || data.explicit_component || data.image_format;
if(!should_print) return;
bool packed_stream = data.stream & (1u << 31);
if(packed_stream) {
generated_source.append("// GS packed stream: %u,%u,%u,%u",
ir->data.stream & 3, (ir->data.stream >> 2) & 3,
(ir->data.stream >> 4) & 3, (ir->data.stream >> 6) & 3);
}

bool first = true;
#define SEPARATE { if(!first) { generated_source.append(","); } else { first = false; } }
generated_source.append("layout(");
if(data.binding) {
SEPARATE generated_source.append("binding=%i", data.binding);
}
if(data.explicit_location) {
const int binding_base = (this->state->stage == MESA_SHADER_VERTEX ? (int)VERT_ATTRIB_GENERIC0 : (int)FRAG_RESULT_DATA0);
const int location = data.location - binding_base;
SEPARATE generated_source.append("location=%i", location);
}
if(data.explicit_component) {
SEPARATE generated_source.append("component=%u", data.location_frac);
}
if(data.stream) {
SEPARATE if(packed_stream) {
generated_source.append("LTW_PACKED_STREAM_REPORT_TO_DEVS");
}else {
generated_source.append("stream=%u", data.stream);
}

}
if(data.image_format) {
SEPARATE generated_source.append(image_load_store_format(data.image_format));
}
generated_source.append(") ");
#undef SEPARATE
}

void
IR_TO_GLSL::visit(ir_variable* ir)
{
Expand All @@ -562,25 +643,14 @@ IR_TO_GLSL::visit(ir_variable* ir)
visit_uniform_block( ir );
return;
}
char binding[32] = { 0 };
if (ir->data.binding)
snprintf(binding, sizeof(binding), "binding=%i ", ir->data.binding);

char loc[100] = { 0 };
if (this->state->language_version >= 300 && ir->data.explicit_location)
{
const int binding_base = (this->state->stage == MESA_SHADER_VERTEX ? (int)VERT_ATTRIB_GENERIC0 : (int)FRAG_RESULT_DATA0);
const int location = ir->data.location - binding_base;
snprintf(loc, sizeof(loc), "layout(location=%d) ", location);
} else if(!ir->data.explicit_location && ir->data.mode == ir_var_shader_out && this->state->stage == MESA_SHADER_FRAGMENT) {
if(!ir->data.explicit_location && ir->data.mode == ir_var_shader_out && this->state->stage == MESA_SHADER_FRAGMENT) {
generated_source.append("/* LTW INSERT LOCATION ");
print_var_name(ir);
generated_source.append(" LTW */");
} else {
print_generic_layout_block(ir);
}
else if (ir->data.location != -1)
{
snprintf(loc, sizeof(loc), "location=%i ", ir->data.location);
}

int decormode = this->mode;
// GLSL 1.30 and up use "in" and "out" for everything
Expand Down Expand Up @@ -626,29 +696,6 @@ IR_TO_GLSL::visit(ir_variable* ir)
}
}

char component[32] = { 0 };
if (ir->data.explicit_component || ir->data.location_frac != 0)
snprintf(component, sizeof(component), "component=%i ",
ir->data.location_frac);

char stream[32] = { 0 };
if (ir->data.stream & (1u << 31)) {
if (ir->data.stream & ~(1u << 31)) {
snprintf(stream, sizeof(stream), "stream(%u,%u,%u,%u) ",
ir->data.stream & 3, (ir->data.stream >> 2) & 3,
(ir->data.stream >> 4) & 3, (ir->data.stream >> 6) & 3);
}
}
else if (ir->data.stream) {
snprintf(stream, sizeof(stream), "stream%u ", ir->data.stream);
}

char image_format[32] = { 0 };
if (ir->data.image_format) {
snprintf(image_format, sizeof(image_format), "format=%x ",
ir->data.image_format);
}

const char* const cent = (ir->data.centroid) ? "centroid " : "";
const char* const samp = (ir->data.sample) ? "sample " : "";
const char* const patc = (ir->data.patch) ? "patch " : "";
Expand All @@ -664,9 +711,9 @@ IR_TO_GLSL::visit(ir_variable* ir)
const char* const memory_restrict = (ir->data.memory_restrict) ? "restrict " : "";
const char* const mode[3][ir_var_mode_count] =
{
{ "", "uniform ", "shader_storage", "shader_shared", "in ", "out ", "in ", "out ", "inout ", "const_in ", "sys ", "" },
{ "", "uniform ", "shader_storage", "shader_shared", "attribute ", "varying ", "in ", "out ", "inout ", "const_in ", "sys ", "" },
{ "", "uniform ", "shader_storage", "shader_shared", "varying ", "out ", "in ", "out ", "inout ", "const_in ", "sys ", "" }
{ "", "uniform ", "shader_storage", "shared ", "in ", "out ", "in ", "out ", "inout ", "const_in ", "sys ", "" },
{ "", "uniform ", "shader_storage", "shared ", "attribute ", "varying ", "in ", "out ", "inout ", "const_in ", "sys ", "" },
{ "", "uniform ", "shader_storage", "shared ", "varying ", "out ", "in ", "out ", "inout ", "const_in ", "sys ", "" }
};
const char* const interp[] = { "", "smooth ", "flat ", "noperspective ", "EXPLICIT ", "COLOR " };
STATIC_ASSERT(ARRAY_SIZE(interp) == INTERP_MODE_COUNT);
Expand All @@ -679,12 +726,10 @@ IR_TO_GLSL::visit(ir_variable* ir)
return;
}

generated_source.append("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
binding, loc, component, cent, bindless, bound,
image_format, memory_read_only, memory_write_only,
generated_source.append("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",cent, bindless, bound,memory_read_only, memory_write_only,
memory_coherent, memory_volatile, memory_restrict,
samp, patc, inv, explicit_inv, prec, interp[ir->data.interpolation], mode[decormode][ir->data.mode],
precision[ir->data.precision], stream);
precision[ir->data.precision]);

print_type(generated_source, ir->type, false);
generated_source.append(" ");
Expand Down Expand Up @@ -1242,9 +1287,17 @@ IR_TO_GLSL::visit(ir_expression* ir)
if (ir->operands[1])
ir->operands[1]->accept(this);
generated_source.append(")");
}
else
{
} else if(ir->operation == ir_triop_fma && state->es_shader && state->language_version < 320) {
// unfuse the FMA. Technically some es310 devices support FMA with GL_OES_gpu_shader5 but im
// too lazy to implement checks for that
generated_source.append("((");
ir->operands[0]->accept(this);
generated_source.append(") * (");
ir->operands[1]->accept(this);
generated_source.append(") + (");
ir->operands[2]->accept(this);
generated_source.append("))");
} else {
// ternary op
generated_source.append("%s (", operator_glsl_strs[ir->operation]);
if (ir->operands[0])
Expand Down
1 change: 1 addition & 0 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/code/ir_print_glsl_visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class IR_TO_GLSL : public ir_visitor
void newline_indent();
void newline_deindent();
void print_var_name(ir_variable* v);
void print_generic_layout_block(ir_variable* v);
const char *unique_name(ir_variable *var);
void emit_assignment_part(ir_dereference* lhs, ir_rvalue* rhs, unsigned write_mask, ir_rvalue* dstIndex);
bool can_emit_canonical_for(loop_variable_state *ls);
Expand Down
5 changes: 4 additions & 1 deletion ltw/src/main/tinywrapper/glsl_optimizer/src/compiler/glsl/builtin_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5537,7 +5537,10 @@ builtin_builder::add_image_function(const char *name,
void
builtin_builder::add_image_functions(bool glsl)
{
const unsigned flags = (glsl ? IMAGE_FUNCTION_EMIT_STUB : 0);
//const unsigned flags = (glsl ? IMAGE_FUNCTION_EMIT_STUB : 0);
// Don't emit stubs. These get inlined on the optimization stage and then cause the printer to
// print the intrinsic instead of the actual function.
const unsigned flags = 0;

add_image_function(glsl ? "imageLoad" : "__intrinsic_image_load",
"__intrinsic_image_load",
Expand Down
5 changes: 2 additions & 3 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/compiler/glsl/glsl_parser_extras.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,8 +1771,7 @@ void ast_subroutine_list::print(void) const
}
}

static void
set_shader_inout_layout(struct gl_shader *shader,
void _mesa_set_shader_inout_layout(struct gl_shader *shader,
struct _mesa_glsl_parse_state *state)
{
/* Should have been prevented by the parser. */
Expand Down Expand Up @@ -2290,7 +2289,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
ralloc_free(shader->InfoLog);

if (!state->error)
set_shader_inout_layout(shader, state);
_mesa_set_shader_inout_layout(shader, state);

shader->symbols = new(shader->ir) glsl_symbol_table;
shader->CompileStatus = state->error ? COMPILE_FAILURE : COMPILE_SUCCESS;
Expand Down
3 changes: 3 additions & 0 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/compiler/glsl/glsl_parser_extras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,6 +1086,9 @@ _mesa_glsl_copy_symbols_from_table(struct exec_list *shader_ir,
struct glsl_symbol_table *src,
struct glsl_symbol_table *dest);

extern void _mesa_set_shader_inout_layout(struct gl_shader *shader,
struct _mesa_glsl_parse_state *state);

#ifdef __cplusplus
}
#endif
Expand Down