omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add renderer texture binding contract

Browse Source
This commit is contained in:
omigamedev
2026-06-02 15:34:57 +02:00
parent ee3fb36047
commit 5dbeb0504d
9 changed files with 163 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
tests/renderer_api/renderer_api_tests.cpp
View File

@@ -36,6 +36,7 @@ using pp::renderer::TextureFormat;
using pp::renderer::Viewport;
using pp::renderer::max_shader_source_bytes;
using pp::renderer::max_texture_dimension;
using pp::renderer::max_texture_slots;
using pp::renderer::panopainter_shader_catalog;
using pp::renderer::primitive_topology_name;
using pp::renderer::readback_byte_size;
@@ -50,6 +51,7 @@ using pp::renderer::validate_mesh_desc;
using pp::renderer::validate_readback_region;
using pp::renderer::validate_shader_catalog;
using pp::renderer::validate_shader_program_desc;
using pp::renderer::validate_texture_slot;
using pp::renderer::validate_viewport;
namespace {
@@ -146,6 +148,26 @@ public:
return pp::foundation::Status::success();
}
[[nodiscard]] pp::foundation::Status bind_texture(
std::uint32_t slot,
pp::renderer::ITexture2D& texture) noexcept override
{
if (!in_render_pass) {
return pp::foundation::Status::invalid_argument("render pass has not begun");
}
const auto slot_status = validate_texture_slot(slot);
if (!slot_status.ok()) {
return slot_status;
}
const auto bytes = texture_byte_size(texture.desc());
if (!bytes) {
return bytes.status();
}
last_texture_slot = slot;
last_texture_bytes = bytes.value();
return pp::foundation::Status::success();
}
[[nodiscard]] pp::foundation::Status bind_mesh(IMesh& mesh) noexcept override
{
return validate_mesh_desc(mesh.desc());
@@ -243,6 +265,8 @@ public:
bool in_render_pass = false;
const char* shader_name = nullptr;
std::uint32_t last_texture_slot = 0;
std::uint64_t last_texture_bytes = 0;
std::uint64_t last_upload_bytes = 0;
std::uint64_t last_readback_bytes = 0;
std::uint64_t last_capture_bytes = 0;
@@ -439,6 +463,12 @@ void validates_viewports_and_mesh_descriptors(pp::tests::Harness& h)
PP_EXPECT(h, bad_depth.code == StatusCode::out_of_range);
PP_EXPECT(h, !empty_mesh.ok());
PP_EXPECT(h, empty_mesh.code == StatusCode::invalid_argument);
PP_EXPECT(h, validate_texture_slot(0).ok());
PP_EXPECT(h, validate_texture_slot(max_texture_slots - 1U).ok());
const auto invalid_slot = validate_texture_slot(max_texture_slots);
PP_EXPECT(h, !invalid_slot.ok());
PP_EXPECT(h, invalid_slot.code == StatusCode::out_of_range);
}
void validates_shader_program_descriptors(pp::tests::Harness& h)
@@ -569,6 +599,7 @@ void renderer_interfaces_support_backend_neutral_dispatch(pp::tests::Harness& h)
PP_EXPECT(h, context.begin_render_pass(target, ClearColor { .r = 0.1F, .g = 0.2F, .b = 0.3F, .a = 1.0F }).ok());
PP_EXPECT(h, context.set_viewport(Viewport { .x = 0, .y = 0, .width = 64, .height = 32 }).ok());
PP_EXPECT(h, context.bind_shader(shader).ok());
PP_EXPECT(h, context.bind_texture(2, texture).ok());
PP_EXPECT(h, context.bind_mesh(mesh).ok());
PP_EXPECT(h, context.draw().ok());
context.end_render_pass();
@@ -595,6 +626,8 @@ void renderer_interfaces_support_backend_neutral_dispatch(pp::tests::Harness& h)
BlitFilter::linear)
.ok());
PP_EXPECT(h, device.context.shader_name == std::string_view("fake-shader"));
PP_EXPECT(h, device.context.last_texture_slot == 2U);
PP_EXPECT(h, device.context.last_texture_bytes == 8192U);
PP_EXPECT(h, device.context.last_upload_bytes == 80U);
PP_EXPECT(h, device.context.last_readback_bytes == 80U);
PP_EXPECT(h, device.context.last_capture_bytes == 8192U);
@@ -633,12 +666,13 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
PP_EXPECT(h, context.begin_render_pass(target, ClearColor { .r = 0.2F, .g = 0.3F, .b = 0.4F, .a = 1.0F }).ok());
PP_EXPECT(h, context.set_viewport(Viewport { .x = 0, .y = 0, .width = 64, .height = 32 }).ok());
PP_EXPECT(h, context.bind_shader(shader).ok());
PP_EXPECT(h, context.bind_texture(1, texture).ok());
PP_EXPECT(h, context.bind_mesh(mesh).ok());
PP_EXPECT(h, context.draw().ok());
context.end_render_pass();
const auto commands = device.commands();
PP_EXPECT(h, commands.size() == 7U);
PP_EXPECT(h, commands.size() == 8U);
PP_EXPECT(h, commands[0].kind == RecordedRenderCommandKind::trace_marker);
PP_EXPECT(h, commands[0].component == std::string_view("renderer"));
PP_EXPECT(h, commands[0].name == std::string_view("frame"));
@@ -649,11 +683,15 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
PP_EXPECT(h, commands[2].viewport.height == 32U);
PP_EXPECT(h, commands[3].kind == RecordedRenderCommandKind::bind_shader);
PP_EXPECT(h, commands[3].name == std::string_view("recorded-shader"));
PP_EXPECT(h, commands[4].kind == RecordedRenderCommandKind::bind_mesh);
PP_EXPECT(h, commands[4].mesh_desc.vertex_count == 3U);
PP_EXPECT(h, commands[5].kind == RecordedRenderCommandKind::draw);
PP_EXPECT(h, commands[6].kind == RecordedRenderCommandKind::end_render_pass);
PP_EXPECT(h, recorded_render_command_kind_name(commands[5].kind) == std::string_view("draw"));
PP_EXPECT(h, commands[4].kind == RecordedRenderCommandKind::bind_texture);
PP_EXPECT(h, commands[4].texture_slot == 1U);
PP_EXPECT(h, commands[4].texture_desc.extent.height == 32U);
PP_EXPECT(h, recorded_render_command_kind_name(commands[4].kind) == std::string_view("bind_texture"));
PP_EXPECT(h, commands[5].kind == RecordedRenderCommandKind::bind_mesh);
PP_EXPECT(h, commands[5].mesh_desc.vertex_count == 3U);
PP_EXPECT(h, commands[6].kind == RecordedRenderCommandKind::draw);
PP_EXPECT(h, commands[7].kind == RecordedRenderCommandKind::end_render_pass);
PP_EXPECT(h, recorded_render_command_kind_name(commands[6].kind) == std::string_view("draw"));
PP_EXPECT(h, context.upload_texture(
texture,
@@ -661,12 +699,12 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
upload_bytes)
.ok());
const auto commands_after_upload = device.commands();
PP_EXPECT(h, commands_after_upload.size() == 8U);
PP_EXPECT(h, commands_after_upload[7].kind == RecordedRenderCommandKind::upload_texture);
PP_EXPECT(h, commands_after_upload[7].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_upload[7].readback_region.x == 4U);
PP_EXPECT(h, commands_after_upload[7].upload_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_upload[7].kind) == std::string_view("upload_texture"));
PP_EXPECT(h, commands_after_upload.size() == 9U);
PP_EXPECT(h, commands_after_upload[8].kind == RecordedRenderCommandKind::upload_texture);
PP_EXPECT(h, commands_after_upload[8].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_upload[8].readback_region.x == 4U);
PP_EXPECT(h, commands_after_upload[8].upload_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_upload[8].kind) == std::string_view("upload_texture"));
PP_EXPECT(h, context.read_texture(
texture,
@@ -674,22 +712,22 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
readback_buffer)
.ok());
const auto commands_after_readback = device.commands();
PP_EXPECT(h, commands_after_readback.size() == 9U);
PP_EXPECT(h, commands_after_readback[8].kind == RecordedRenderCommandKind::read_texture);
PP_EXPECT(h, commands_after_readback[8].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_readback[8].readback_region.x == 4U);
PP_EXPECT(h, commands_after_readback[8].readback_region.height == 3U);
PP_EXPECT(h, commands_after_readback[8].readback_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_readback[8].kind) == std::string_view("read_texture"));
PP_EXPECT(h, commands_after_readback.size() == 10U);
PP_EXPECT(h, commands_after_readback[9].kind == RecordedRenderCommandKind::read_texture);
PP_EXPECT(h, commands_after_readback[9].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_readback[9].readback_region.x == 4U);
PP_EXPECT(h, commands_after_readback[9].readback_region.height == 3U);
PP_EXPECT(h, commands_after_readback[9].readback_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_readback[9].kind) == std::string_view("read_texture"));
PP_EXPECT(h, context.capture_frame(target, readback_buffer).ok());
const auto commands_after_capture = device.commands();
PP_EXPECT(h, commands_after_capture.size() == 10U);
PP_EXPECT(h, commands_after_capture[9].kind == RecordedRenderCommandKind::capture_frame);
PP_EXPECT(h, commands_after_capture[9].target_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_capture[9].target_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_capture[9].capture_bytes == 8192U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_capture[9].kind) == std::string_view("capture_frame"));
PP_EXPECT(h, commands_after_capture.size() == 11U);
PP_EXPECT(h, commands_after_capture[10].kind == RecordedRenderCommandKind::capture_frame);
PP_EXPECT(h, commands_after_capture[10].target_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_capture[10].target_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_capture[10].capture_bytes == 8192U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_capture[10].kind) == std::string_view("capture_frame"));
PP_EXPECT(h, context.blit_render_target(
target,
@@ -699,16 +737,16 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
BlitFilter::linear)
.ok());
const auto commands_after_blit = device.commands();
PP_EXPECT(h, commands_after_blit.size() == 11U);
PP_EXPECT(h, commands_after_blit[10].kind == RecordedRenderCommandKind::blit_render_target);
PP_EXPECT(h, commands_after_blit[10].source_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_blit[10].destination_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_blit[10].source_region.width == 16U);
PP_EXPECT(h, commands_after_blit[10].destination_region.x == 2U);
PP_EXPECT(h, commands_after_blit[10].blit_filter == BlitFilter::linear);
PP_EXPECT(h, commands_after_blit[10].blit_source_bytes == 512U);
PP_EXPECT(h, commands_after_blit[10].blit_destination_bytes == 128U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_blit[10].kind) == std::string_view("blit_render_target"));
PP_EXPECT(h, commands_after_blit.size() == 12U);
PP_EXPECT(h, commands_after_blit[11].kind == RecordedRenderCommandKind::blit_render_target);
PP_EXPECT(h, commands_after_blit[11].source_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_blit[11].destination_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_blit[11].source_region.width == 16U);
PP_EXPECT(h, commands_after_blit[11].destination_region.x == 2U);
PP_EXPECT(h, commands_after_blit[11].blit_filter == BlitFilter::linear);
PP_EXPECT(h, commands_after_blit[11].blit_source_bytes == 512U);
PP_EXPECT(h, commands_after_blit[11].blit_destination_bytes == 128U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_blit[11].kind) == std::string_view("blit_render_target"));
device.clear();
PP_EXPECT(h, device.commands().empty());
@@ -792,6 +830,11 @@ void recording_renderer_rejects_invalid_command_order_and_targets(pp::tests::Har
PP_EXPECT(h, draw_without_bindings.code == StatusCode::invalid_argument);
PP_EXPECT(h, context.bind_shader(shader).ok());
const auto bind_texture_bad_slot = context.bind_texture(max_texture_slots, texture);
PP_EXPECT(h, !bind_texture_bad_slot.ok());
PP_EXPECT(h, bind_texture_bad_slot.code == StatusCode::out_of_range);
PP_EXPECT(h, context.bind_texture(0, texture).ok());
const auto draw_without_mesh = context.draw();
PP_EXPECT(h, !draw_without_mesh.ok());
PP_EXPECT(h, draw_without_mesh.code == StatusCode::invalid_argument);
@@ -808,6 +851,10 @@ void recording_renderer_rejects_invalid_command_order_and_targets(pp::tests::Har
PP_EXPECT(h, !viewport_after_end.ok());
PP_EXPECT(h, viewport_after_end.code == StatusCode::invalid_argument);
const auto bind_texture_after_end = context.bind_texture(0, texture);
PP_EXPECT(h, !bind_texture_after_end.ok());
PP_EXPECT(h, bind_texture_after_end.code == StatusCode::invalid_argument);
const auto read_outside_bounds = context.read_texture(
texture,
ReadbackRegion { .x = 31, .y = 15, .width = 2, .height = 1 },