Move canvas depth renderbuffers into GL backend

This commit is contained in:
2026-06-04 20:50:44 +02:00
parent f55b1882c0
commit b9dbcd10d7
6 changed files with 357 additions and 44 deletions

View File

@@ -63,6 +63,13 @@ struct RecordedOpenGlFramebufferAttachmentCall {
std::int32_t level = 0;
};
struct RecordedOpenGlRenderbufferStorageCall {
std::uint32_t target = 0;
std::uint32_t internal_format = 0;
std::int32_t width = 0;
std::int32_t height = 0;
};
struct RecordedOpenGlReadPixelsCall {
std::int32_t x = 0;
std::int32_t y = 0;
@@ -184,6 +191,10 @@ std::vector<std::uint32_t> recorded_generated_framebuffer_counts;
std::vector<std::uint32_t> recorded_deleted_framebuffers;
std::vector<RecordedOpenGlFramebufferAttachmentCall> recorded_framebuffer_attachment_calls;
std::vector<std::uint32_t> recorded_framebuffer_status_queries;
std::vector<std::uint32_t> recorded_generated_renderbuffer_counts;
std::vector<std::uint32_t> recorded_deleted_renderbuffers;
std::vector<std::uint32_t> recorded_bound_renderbuffers;
std::vector<RecordedOpenGlRenderbufferStorageCall> recorded_renderbuffer_storage_calls;
std::vector<RecordedOpenGlReadPixelsCall> recorded_read_pixels_calls;
std::vector<RecordedOpenGlBlitFramebufferCall> recorded_blit_framebuffer_calls;
std::vector<std::uint32_t> recorded_generated_sampler_counts;
@@ -220,6 +231,7 @@ std::vector<RecordedOpenGlVertexAttribPointerCall> recorded_vertex_attrib_pointe
std::vector<RecordedOpenGlMeshDrawCall> recorded_mesh_draw_calls;
std::uint32_t next_texture_id = 91U;
std::uint32_t next_framebuffer_id = 44U;
std::uint32_t next_renderbuffer_id = 81U;
std::uint32_t next_sampler_id = 71U;
std::uint32_t next_shader_id = 301U;
std::uint32_t next_program_id = 401U;
@@ -532,6 +544,41 @@ void record_delete_framebuffers(std::uint32_t count, const std::uint32_t* ids) n
}
}
void record_gen_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept
{
recorded_generated_renderbuffer_counts.push_back(count);
for (std::uint32_t i = 0U; i < count; ++i) {
ids[i] = next_renderbuffer_id + i;
}
}
void record_delete_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept
{
for (std::uint32_t i = 0U; i < count; ++i) {
recorded_deleted_renderbuffers.push_back(ids[i]);
}
}
void record_bind_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept
{
recorded_bound_renderbuffers.push_back(target);
recorded_bound_renderbuffers.push_back(renderbuffer);
}
void record_renderbuffer_storage(
std::uint32_t target,
std::uint32_t internal_format,
std::int32_t width,
std::int32_t height) noexcept
{
recorded_renderbuffer_storage_calls.push_back(RecordedOpenGlRenderbufferStorageCall {
.target = target,
.internal_format = internal_format,
.width = width,
.height = height,
});
}
void record_framebuffer_texture_2d(
std::uint32_t target,
std::uint32_t attachment,
@@ -548,6 +595,20 @@ void record_framebuffer_texture_2d(
});
}
void record_framebuffer_renderbuffer(
std::uint32_t target,
std::uint32_t attachment,
std::uint32_t renderbuffer_target,
std::uint32_t renderbuffer) noexcept
{
recorded_framebuffer_attachment_calls.push_back(RecordedOpenGlFramebufferAttachmentCall {
.target = target,
.attachment = attachment,
.texture_target = renderbuffer_target,
.texture = renderbuffer,
});
}
std::uint32_t record_check_framebuffer_status(std::uint32_t target) noexcept
{
recorded_framebuffer_status_queries.push_back(target);
@@ -4060,6 +4121,99 @@ void rejects_incomplete_framebuffer_binding_dispatch(pp::tests::Harness& h)
PP_EXPECT(h, restore.code == pp::foundation::StatusCode::invalid_argument);
}
void allocates_attaches_and_deletes_depth_renderbuffer(pp::tests::Harness& h)
{
recorded_generated_renderbuffer_counts.clear();
recorded_bound_renderbuffers.clear();
recorded_renderbuffer_storage_calls.clear();
recorded_framebuffer_attachment_calls.clear();
recorded_deleted_renderbuffers.clear();
next_renderbuffer_id = 81U;
const auto renderbuffer = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
64,
32,
pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
.gen_renderbuffers = record_gen_renderbuffers,
.bind_renderbuffer = record_bind_renderbuffer,
.renderbuffer_storage = record_renderbuffer_storage,
});
const auto attach = pp::renderer::gl::attach_opengl_depth_renderbuffer(
renderbuffer.ok() ? renderbuffer.value() : 0U,
pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {
.framebuffer_renderbuffer = record_framebuffer_renderbuffer,
});
const auto detach = pp::renderer::gl::attach_opengl_depth_renderbuffer(
0U,
pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {
.framebuffer_renderbuffer = record_framebuffer_renderbuffer,
});
const auto deleted = pp::renderer::gl::delete_opengl_renderbuffer(
renderbuffer.ok() ? renderbuffer.value() : 0U,
pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {
.delete_renderbuffers = record_delete_renderbuffers,
});
PP_EXPECT(h, renderbuffer.ok());
PP_EXPECT(h, renderbuffer.value() == 81U);
PP_EXPECT(h, recorded_generated_renderbuffer_counts.size() == 1U);
PP_EXPECT(h, recorded_generated_renderbuffer_counts[0] == 1U);
PP_EXPECT(h, recorded_bound_renderbuffers.size() == 4U);
PP_EXPECT(h, recorded_bound_renderbuffers[0] == 0x8D41U);
PP_EXPECT(h, recorded_bound_renderbuffers[1] == 81U);
PP_EXPECT(h, recorded_bound_renderbuffers[2] == 0x8D41U);
PP_EXPECT(h, recorded_bound_renderbuffers[3] == 0U);
PP_EXPECT(h, recorded_renderbuffer_storage_calls.size() == 1U);
PP_EXPECT(h, recorded_renderbuffer_storage_calls[0].target == 0x8D41U);
PP_EXPECT(h, recorded_renderbuffer_storage_calls[0].internal_format == 0x81A6U);
PP_EXPECT(h, recorded_renderbuffer_storage_calls[0].width == 64);
PP_EXPECT(h, recorded_renderbuffer_storage_calls[0].height == 32);
PP_EXPECT(h, attach.ok());
PP_EXPECT(h, detach.ok());
PP_EXPECT(h, recorded_framebuffer_attachment_calls.size() == 2U);
PP_EXPECT(h, recorded_framebuffer_attachment_calls[0].target == 0x8D40U);
PP_EXPECT(h, recorded_framebuffer_attachment_calls[0].attachment == 0x8D00U);
PP_EXPECT(h, recorded_framebuffer_attachment_calls[0].texture_target == 0x8D41U);
PP_EXPECT(h, recorded_framebuffer_attachment_calls[0].texture == 81U);
PP_EXPECT(h, recorded_framebuffer_attachment_calls[1].texture == 0U);
PP_EXPECT(h, deleted.ok());
PP_EXPECT(h, recorded_deleted_renderbuffers.size() == 1U);
PP_EXPECT(h, recorded_deleted_renderbuffers[0] == 81U);
}
void rejects_invalid_depth_renderbuffer_dispatch(pp::tests::Harness& h)
{
const auto missing_allocate_dispatch = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
64,
32,
pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
.gen_renderbuffers = record_gen_renderbuffers,
});
const auto invalid_dimensions = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
0,
32,
pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
.gen_renderbuffers = record_gen_renderbuffers,
.bind_renderbuffer = record_bind_renderbuffer,
.renderbuffer_storage = record_renderbuffer_storage,
});
const auto missing_attach_dispatch = pp::renderer::gl::attach_opengl_depth_renderbuffer(
81U,
pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {});
const auto missing_delete_dispatch = pp::renderer::gl::delete_opengl_renderbuffer(
81U,
pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {});
PP_EXPECT(h, !missing_allocate_dispatch.ok());
PP_EXPECT(h, missing_allocate_dispatch.status().code == pp::foundation::StatusCode::invalid_argument);
PP_EXPECT(h, !invalid_dimensions.ok());
PP_EXPECT(h, invalid_dimensions.status().code == pp::foundation::StatusCode::invalid_argument);
PP_EXPECT(h, !missing_attach_dispatch.ok());
PP_EXPECT(h, missing_attach_dispatch.code == pp::foundation::StatusCode::invalid_argument);
PP_EXPECT(h, !missing_delete_dispatch.ok());
PP_EXPECT(h, missing_delete_dispatch.code == pp::foundation::StatusCode::invalid_argument);
}
void maps_renderer_viewports_and_scissors(pp::tests::Harness& h)
{
const auto viewport = pp::renderer::gl::viewport_for_renderer_viewport(
@@ -4513,6 +4667,8 @@ int main()
harness.run("binds_framebuffer_draw_read_through_dispatch", binds_framebuffer_draw_read_through_dispatch);
harness.run("restores_framebuffer_draw_read_through_dispatch", restores_framebuffer_draw_read_through_dispatch);
harness.run("rejects_incomplete_framebuffer_binding_dispatch", rejects_incomplete_framebuffer_binding_dispatch);
harness.run("allocates_attaches_and_deletes_depth_renderbuffer", allocates_attaches_and_deletes_depth_renderbuffer);
harness.run("rejects_invalid_depth_renderbuffer_dispatch", rejects_invalid_depth_renderbuffer_dispatch);
harness.run("maps_renderer_viewports_and_scissors", maps_renderer_viewports_and_scissors);
harness.run("maps_renderer_blend_state_tokens", maps_renderer_blend_state_tokens);
harness.run("maps_renderer_color_write_masks", maps_renderer_color_write_masks);