Skip to content

Commit

Permalink
sokol_gfx_imgui.h: fixes for sokol_gfx.h compute shader update
Browse files Browse the repository at this point in the history
  • Loading branch information
@floooh
floooh committed Feb 18, 2025
1 parent a260dfa commit db9f9a0
Showing 1 changed file with 89 additions and 34 deletions.
123 changes: 89 additions & 34 deletions util/sokol_gfx_imgui.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ typedef enum sgimgui_cmd_t {
SGIMGUI_CMD_APPLY_BINDINGS,
SGIMGUI_CMD_APPLY_UNIFORMS,
SGIMGUI_CMD_DRAW,
SGIMGUI_CMD_DISPATCH,
SGIMGUI_CMD_END_PASS,
SGIMGUI_CMD_COMMIT,
SGIMGUI_CMD_ALLOC_BUFFER,
Expand Down Expand Up @@ -498,6 +499,12 @@ typedef struct sgimgui_args_draw_t {
int num_instances;
} sgimgui_args_draw_t;

typedef struct sgimgui_args_dispatch_t {
int num_groups_x;
int num_groups_y;
int num_groups_z;
} sgimgui_args_dispatch_t;

typedef struct sgimgui_args_alloc_buffer_t {
sg_buffer result;
} sgimgui_args_alloc_buffer_t;
Expand Down Expand Up @@ -645,6 +652,7 @@ typedef union sgimgui_args_t {
sgimgui_args_apply_bindings_t apply_bindings;
sgimgui_args_apply_uniforms_t apply_uniforms;
sgimgui_args_draw_t draw;
sgimgui_args_dispatch_t dispatch;
sgimgui_args_alloc_buffer_t alloc_buffer;
sgimgui_args_alloc_image_t alloc_image;
sgimgui_args_alloc_sampler_t alloc_sampler;
Expand Down Expand Up @@ -1476,6 +1484,7 @@ _SOKOL_PRIVATE const char* _sgimgui_shaderstage_string(sg_shader_stage stage) {
switch (stage) {
case SG_SHADERSTAGE_VERTEX: return "SG_SHADERSTAGE_VERTEX";
case SG_SHADERSTAGE_FRAGMENT: return "SG_SHADERSTAGE_FRAGMENT";
case SG_SHADERSTAGE_COMPUTE: return "SG_SHADERSTAGE_COMPUTE";
default: return "???";
}
}
Expand Down Expand Up @@ -1962,6 +1971,14 @@ _SOKOL_PRIVATE sgimgui_str_t _sgimgui_capture_item_string(sgimgui_t* ctx, int in
item->args.draw.num_instances);
break;

case SGIMGUI_CMD_DISPATCH:
_sgimgui_snprintf(&str, "%d: sg_dispatch(num_groups_x=%d, num_groups_y=%d, num_groups_z=%d)",
index,
item->args.dispatch.num_groups_x,
item->args.dispatch.num_groups_y,
item->args.dispatch.num_groups_z);
break;

case SGIMGUI_CMD_END_PASS:
_sgimgui_snprintf(&str, "%d: sg_end_pass()", index);
break;
Expand Down Expand Up @@ -2575,6 +2592,22 @@ _SOKOL_PRIVATE void _sgimgui_draw(int base_element, int num_elements, int num_in
}
}

_SOKOL_PRIVATE void _sgimgui_dispatch(int num_groups_x, int num_groups_y, int num_groups_z, void* user_data) {
sgimgui_t* ctx = (sgimgui_t*) user_data;
SOKOL_ASSERT(ctx);
sgimgui_capture_item_t* item = _sgimgui_capture_next_write_item(ctx);
if (item) {
item->cmd = SGIMGUI_CMD_DISPATCH;
item->color = _SGIMGUI_COLOR_DRAW;
item->args.dispatch.num_groups_x = num_groups_x;
item->args.dispatch.num_groups_y = num_groups_y;
item->args.dispatch.num_groups_z = num_groups_z;
}
if (ctx->hooks.dispatch) {
ctx->hooks.dispatch(num_groups_x, num_groups_y, num_groups_z, ctx->hooks.user_data);
}
}

_SOKOL_PRIVATE void _sgimgui_end_pass(void* user_data) {
sgimgui_t* ctx = (sgimgui_t*) user_data;
SOKOL_ASSERT(ctx);
Expand Down Expand Up @@ -3427,6 +3460,9 @@ _SOKOL_PRIVATE void _sgimgui_draw_sampler_panel(sgimgui_t* ctx, sg_sampler smp)

_SOKOL_PRIVATE void _sgimgui_draw_shader_func(const char* title, const sg_shader_function* func) {
SOKOL_ASSERT(func);
if ((func->source == 0) && (func->bytecode.ptr == 0)) {
return;
}
igPushID(title);
igText("%s", title);
if (func->entry) {
Expand Down Expand Up @@ -3540,7 +3576,11 @@ _SOKOL_PRIVATE void _sgimgui_draw_shader_panel(sgimgui_t* ctx, sg_shader shd) {
igText("- slot: %d", i);
igText(" stage: %s", _sgimgui_shaderstage_string(sbuf->stage));
igText(" readonly: %s", sbuf->readonly ? "true" : "false");
igText(" hlsl_register_t_n: %d", sbuf->hlsl_register_t_n);
if (sbuf->readonly) {
igText(" hlsl_register_t_n: %d", sbuf->hlsl_register_t_n);
} else {
igText(" hlsl_register_u_n: %d", sbuf->hlsl_register_u_n);
}
igText(" msl_buffer_n: %d", sbuf->msl_buffer_n);
igText(" wgsl_group1_binding_n: %d", sbuf->wgsl_group1_binding_n);
igText(" glsl_binding_n: %d", sbuf->glsl_binding_n);
Expand Down Expand Up @@ -3602,6 +3642,7 @@ _SOKOL_PRIVATE void _sgimgui_draw_shader_panel(sgimgui_t* ctx, sg_shader shd) {
}
_sgimgui_draw_shader_func("Vertex Function", &shd_ui->desc.vertex_func);
_sgimgui_draw_shader_func("Fragment Function", &shd_ui->desc.fragment_func);
_sgimgui_draw_shader_func("Compute Function", &shd_ui->desc.compute_func);
} else {
igText("Shader 0x%08X not valid!", shd.id);
}
Expand Down Expand Up @@ -3695,39 +3736,42 @@ _SOKOL_PRIVATE void _sgimgui_draw_pipeline_panel(sgimgui_t* ctx, sg_pipeline pip
igText("Label: %s", pip_ui->label.buf[0] ? pip_ui->label.buf : "---");
_sgimgui_draw_resource_slot(&info.slot);
igSeparator();
igText("Shader: "); igSameLine();
igText("Compute: %s", _sgimgui_bool_string(pip_ui->desc.compute));
igText("Shader: "); igSameLine();
if (_sgimgui_draw_shader_link(ctx, pip_ui->desc.shader)) {
_sgimgui_show_shader(ctx, pip_ui->desc.shader);
}
if (igTreeNode("Vertex Layout State")) {
_sgimgui_draw_vertex_layout_state(&pip_ui->desc.layout);
igTreePop();
}
if (igTreeNode("Depth State")) {
_sgimgui_draw_depth_state(&pip_ui->desc.depth);
igTreePop();
}
if (igTreeNode("Stencil State")) {
_sgimgui_draw_stencil_state(&pip_ui->desc.stencil);
igTreePop();
}
igText("Color Count: %d", pip_ui->desc.color_count);
for (int i = 0; i < pip_ui->desc.color_count; i++) {
sgimgui_str_t str;
_sgimgui_snprintf(&str, "Color Target %d", i);
if (igTreeNode(str.buf)) {
_sgimgui_draw_color_target_state(&pip_ui->desc.colors[i]);
if (!pip_ui->desc.compute) {
if (igTreeNode("Vertex Layout State")) {
_sgimgui_draw_vertex_layout_state(&pip_ui->desc.layout);
igTreePop();
}
if (igTreeNode("Depth State")) {
_sgimgui_draw_depth_state(&pip_ui->desc.depth);
igTreePop();
}
if (igTreeNode("Stencil State")) {
_sgimgui_draw_stencil_state(&pip_ui->desc.stencil);
igTreePop();
}
igText("Color Count: %d", pip_ui->desc.color_count);
for (int i = 0; i < pip_ui->desc.color_count; i++) {
sgimgui_str_t str;
_sgimgui_snprintf(&str, "Color Target %d", i);
if (igTreeNode(str.buf)) {
_sgimgui_draw_color_target_state(&pip_ui->desc.colors[i]);
igTreePop();
}
}
igText("Prim Type: %s", _sgimgui_primitivetype_string(pip_ui->desc.primitive_type));
igText("Index Type: %s", _sgimgui_indextype_string(pip_ui->desc.index_type));
igText("Cull Mode: %s", _sgimgui_cullmode_string(pip_ui->desc.cull_mode));
igText("Face Winding: %s", _sgimgui_facewinding_string(pip_ui->desc.face_winding));
igText("Sample Count: %d", pip_ui->desc.sample_count);
sgimgui_str_t blend_color_str;
igText("Blend Color: %s", _sgimgui_color_string(&blend_color_str, pip_ui->desc.blend_color));
igText("Alpha To Coverage: %s", _sgimgui_bool_string(pip_ui->desc.alpha_to_coverage_enabled));
}
igText("Prim Type: %s", _sgimgui_primitivetype_string(pip_ui->desc.primitive_type));
igText("Index Type: %s", _sgimgui_indextype_string(pip_ui->desc.index_type));
igText("Cull Mode: %s", _sgimgui_cullmode_string(pip_ui->desc.cull_mode));
igText("Face Winding: %s", _sgimgui_facewinding_string(pip_ui->desc.face_winding));
igText("Sample Count: %d", pip_ui->desc.sample_count);
sgimgui_str_t blend_color_str;
igText("Blend Color: %s", _sgimgui_color_string(&blend_color_str, pip_ui->desc.blend_color));
igText("Alpha To Coverage: %s", _sgimgui_bool_string(pip_ui->desc.alpha_to_coverage_enabled));
} else {
igText("Pipeline 0x%08X not valid.", pip.id);
}
Expand Down Expand Up @@ -4112,12 +4156,15 @@ _SOKOL_PRIVATE void _sgimgui_draw_capture_panel(sgimgui_t* ctx) {
_sgimgui_draw_buffer_panel(ctx, item->args.update_buffer.buffer);
break;
case SGIMGUI_CMD_BEGIN_PASS:
_sgimgui_draw_passaction_panel(ctx, item->args.begin_pass.pass.attachments, &item->args.begin_pass.pass.action);
igSeparator();
if (item->args.begin_pass.pass.attachments.id != SG_INVALID_ID) {
_sgimgui_draw_attachments_panel(ctx, item->args.begin_pass.pass.attachments);
} else {
_sgimgui_draw_swapchain_panel(&item->args.begin_pass.pass.swapchain);
igText("Compute: %s", _sgimgui_bool_string(item->args.begin_pass.pass.compute));
if (!item->args.begin_pass.pass.compute) {
_sgimgui_draw_passaction_panel(ctx, item->args.begin_pass.pass.attachments, &item->args.begin_pass.pass.action);
igSeparator();
if (item->args.begin_pass.pass.attachments.id != SG_INVALID_ID) {
_sgimgui_draw_attachments_panel(ctx, item->args.begin_pass.pass.attachments);
} else {
_sgimgui_draw_swapchain_panel(&item->args.begin_pass.pass.swapchain);
}
}
break;
case SGIMGUI_CMD_APPLY_VIEWPORT:
Expand All @@ -4133,6 +4180,7 @@ _SOKOL_PRIVATE void _sgimgui_draw_capture_panel(sgimgui_t* ctx) {
_sgimgui_draw_uniforms_panel(ctx, &item->args.apply_uniforms);
break;
case SGIMGUI_CMD_DRAW:
case SGIMGUI_CMD_DISPATCH:
case SGIMGUI_CMD_END_PASS:
case SGIMGUI_CMD_COMMIT:
break;
Expand Down Expand Up @@ -4265,6 +4313,7 @@ _SOKOL_PRIVATE void _sgimgui_draw_frame_stats_panel(sgimgui_t* ctx) {
_sgimgui_frame_stats(num_apply_bindings);
_sgimgui_frame_stats(num_apply_uniforms);
_sgimgui_frame_stats(num_draw);
_sgimgui_frame_stats(num_dispatch);
_sgimgui_frame_stats(num_update_buffer);
_sgimgui_frame_stats(num_append_buffer);
_sgimgui_frame_stats(num_update_image);
Expand Down Expand Up @@ -4345,12 +4394,17 @@ _SOKOL_PRIVATE void _sgimgui_draw_frame_stats_panel(sgimgui_t* ctx) {
_sgimgui_frame_stats(d3d11.pipeline.num_vs_set_constant_buffers);
_sgimgui_frame_stats(d3d11.pipeline.num_ps_set_shader);
_sgimgui_frame_stats(d3d11.pipeline.num_ps_set_constant_buffers);
_sgimgui_frame_stats(d3d11.pipeline.num_cs_set_shader);
_sgimgui_frame_stats(d3d11.pipeline.num_cs_set_constant_buffers);
_sgimgui_frame_stats(d3d11.bindings.num_ia_set_vertex_buffers);
_sgimgui_frame_stats(d3d11.bindings.num_ia_set_index_buffer);
_sgimgui_frame_stats(d3d11.bindings.num_vs_set_shader_resources);
_sgimgui_frame_stats(d3d11.bindings.num_ps_set_shader_resources);
_sgimgui_frame_stats(d3d11.bindings.num_cs_set_shader_resources);
_sgimgui_frame_stats(d3d11.bindings.num_vs_set_samplers);
_sgimgui_frame_stats(d3d11.bindings.num_ps_set_samplers);
_sgimgui_frame_stats(d3d11.bindings.num_cs_set_samplers);
_sgimgui_frame_stats(d3d11.bindings.num_cs_set_unordered_access_views);
_sgimgui_frame_stats(d3d11.uniforms.num_update_subresource);
_sgimgui_frame_stats(d3d11.draw.num_draw_indexed_instanced);
_sgimgui_frame_stats(d3d11.draw.num_draw_indexed);
Expand Down Expand Up @@ -4409,6 +4463,7 @@ SOKOL_API_IMPL void sgimgui_init(sgimgui_t* ctx, const sgimgui_desc_t* desc) {
hooks.apply_bindings = _sgimgui_apply_bindings;
hooks.apply_uniforms = _sgimgui_apply_uniforms;
hooks.draw = _sgimgui_draw;
hooks.dispatch = _sgimgui_dispatch;
hooks.end_pass = _sgimgui_end_pass;
hooks.commit = _sgimgui_commit;
hooks.alloc_buffer = _sgimgui_alloc_buffer;
Expand Down

0 comments on commit db9f9a0

Please sign in to comment.