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

Move canvas depth renderbuffers into GL backend

Browse Source
This commit is contained in:
omigamedev
2026-06-04 20:50:44 +02:00
parent f55b1882c0
commit b9dbcd10d7
6 changed files with 357 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/canvas.cpp
View File

@@ -135,26 +135,6 @@ GLenum blend_state()
return static_cast<GLenum>(pp::renderer::gl::blend_state());
}
GLenum renderbuffer_target()
{
return static_cast<GLenum>(pp::renderer::gl::renderbuffer_target());
}
GLenum depth_component24_format()
{
return static_cast<GLenum>(pp::renderer::gl::depth_component24_format());
}
GLenum framebuffer_target()
{
return static_cast<GLenum>(pp::renderer::gl::framebuffer_target());
}
GLenum framebuffer_depth_attachment()
{
return static_cast<GLenum>(pp::renderer::gl::framebuffer_depth_attachment());
}
GLint texture_filter_linear()
{
return static_cast<GLint>(pp::renderer::gl::linear_texture_filter());
@@ -195,6 +175,86 @@ void unbind_texture_2d()
glBindTexture(texture_2d_target(), 0);
}
void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept
{
glGenRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
}
void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept
{
glDeleteRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<const GLuint*>(ids));
}
void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept
{
glBindRenderbuffer(static_cast<GLenum>(target), static_cast<GLuint>(renderbuffer));
}
void set_opengl_renderbuffer_storage(
std::uint32_t target,
std::uint32_t internal_format,
std::int32_t width,
std::int32_t height) noexcept
{
glRenderbufferStorage(
static_cast<GLenum>(target),
static_cast<GLenum>(internal_format),
static_cast<GLsizei>(width),
static_cast<GLsizei>(height));
}
void attach_opengl_framebuffer_renderbuffer(
std::uint32_t target,
std::uint32_t attachment,
std::uint32_t renderbuffer_target,
std::uint32_t renderbuffer) noexcept
{
glFramebufferRenderbuffer(
static_cast<GLenum>(target),
static_cast<GLenum>(attachment),
static_cast<GLenum>(renderbuffer_target),
static_cast<GLuint>(renderbuffer));
}
GLuint allocate_canvas_depth_renderbuffer(int width, int height)
{
const auto result = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
width,
height,
pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
.gen_renderbuffers = gen_opengl_renderbuffers,
.bind_renderbuffer = bind_opengl_renderbuffer,
.renderbuffer_storage = set_opengl_renderbuffer_storage,
});
if (!result.ok()) {
LOG("OpenGL canvas depth renderbuffer allocation failed: %s", result.status().message);
return 0U;
}
return static_cast<GLuint>(result.value());
}
void attach_canvas_depth_renderbuffer(GLuint renderbuffer)
{
const auto status = pp::renderer::gl::attach_opengl_depth_renderbuffer(
static_cast<std::uint32_t>(renderbuffer),
pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {
.framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer,
});
if (!status.ok())
LOG("OpenGL canvas depth renderbuffer attachment failed: %s", status.message);
}
void delete_canvas_renderbuffer(GLuint renderbuffer)
{
const auto status = pp::renderer::gl::delete_opengl_renderbuffer(
static_cast<std::uint32_t>(renderbuffer),
pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {
.delete_renderbuffers = delete_opengl_renderbuffers,
});
if (!status.ok())
LOG("OpenGL canvas renderbuffer delete failed: %s", status.message);
}
}
@@ -2963,29 +3023,25 @@ void Canvas::draw_objects_direct(std::function<void(const glm::mat4& camera, con
glViewport(0, 0, layer.w, layer.h);
glDisable(blend_state());
GLuint rboID;
glGenRenderbuffers(1, &rboID);
glBindRenderbuffer(renderbuffer_target(), rboID);
glRenderbufferStorage(renderbuffer_target(), depth_component24_format(), layer.w, layer.h);
glBindRenderbuffer(renderbuffer_target(), 0);
GLuint rboID = allocate_canvas_depth_renderbuffer(layer.w, layer.h);
glm::mat4 proj = glm::perspective(glm::radians(90.f), 1.f, .01f, 1000.f);
for (int i = 0; i < 6; i++)
{
glm::mat4 plane_camera = glm::lookAt(glm::vec3(0), m_plane_origin[i], m_plane_tangent[i]);
layer.rtt(i, frame).bindFramebuffer();
glFramebufferRenderbuffer(framebuffer_target(), framebuffer_depth_attachment(), renderbuffer_target(), rboID);
attach_canvas_depth_renderbuffer(rboID);
observer(plane_camera, proj, i);
glFramebufferRenderbuffer(framebuffer_target(), framebuffer_depth_attachment(), renderbuffer_target(), 0);
attach_canvas_depth_renderbuffer(0);
layer.rtt(i, frame).unbindFramebuffer();
layer.face(i, frame) = true;
layer.box(i, frame) = { 0, 0, layer.w, layer.h };
}
glDeleteRenderbuffers(1, &rboID);
delete_canvas_renderbuffer(rboID);
// restore viewport and clear color states
blend ? glEnable(blend_state()) : glDisable(blend_state());
@@ -3010,16 +3066,12 @@ void Canvas::draw_objects(std::function<void(const glm::mat4& camera, const glm:
glViewport(0, 0, layer.w, layer.h);
glDisable(blend_state());
GLuint rboID;
glGenRenderbuffers(1, &rboID);
glBindRenderbuffer(renderbuffer_target(), rboID);
glRenderbufferStorage(renderbuffer_target(), depth_component24_format(), layer.w, layer.h);
glBindRenderbuffer(renderbuffer_target(), 0);
GLuint rboID = allocate_canvas_depth_renderbuffer(layer.w, layer.h);
RTT rtt;
rtt.create(layer.w, layer.h);
rtt.bindFramebuffer();
glFramebufferRenderbuffer(framebuffer_target(), framebuffer_depth_attachment(), renderbuffer_target(), rboID);
attach_canvas_depth_renderbuffer(rboID);
rtt.unbindFramebuffer();
// allocate action to add to history
@@ -3089,7 +3141,7 @@ void Canvas::draw_objects(std::function<void(const glm::mat4& camera, const glm:
ActionManager::add(action);
}
glDeleteRenderbuffers(1, &rboID);
delete_canvas_renderbuffer(rboID);
rtt.destroy();
// restore viewport and clear color states

64
src/renderer_gl/opengl_capabilities.cpp
View File

@@ -939,6 +939,70 @@ pp::foundation::Status restore_opengl_framebuffer_binding(
return pp::foundation::Status::success();
}
pp::foundation::Result<std::uint32_t> allocate_opengl_depth_renderbuffer(
std::int32_t width,
std::int32_t height,
OpenGlDepthRenderbufferAllocationDispatch dispatch) noexcept
{
if (dispatch.gen_renderbuffers == nullptr
|| dispatch.bind_renderbuffer == nullptr
|| dispatch.renderbuffer_storage == nullptr) {
return pp::foundation::Result<std::uint32_t>::failure(
pp::foundation::Status::invalid_argument(
"OpenGL depth renderbuffer allocation dispatch callbacks must not be null"));
}
if (width <= 0 || height <= 0) {
return pp::foundation::Result<std::uint32_t>::failure(
pp::foundation::Status::invalid_argument("OpenGL depth renderbuffer dimensions are invalid"));
}
std::uint32_t renderbuffer_id = 0U;
dispatch.gen_renderbuffers(1U, &renderbuffer_id);
if (renderbuffer_id == 0U) {
return pp::foundation::Result<std::uint32_t>::failure(
pp::foundation::Status::out_of_range("OpenGL renderbuffer allocation returned id 0"));
}
dispatch.bind_renderbuffer(renderbuffer_target(), renderbuffer_id);
dispatch.renderbuffer_storage(renderbuffer_target(), depth_component24_format(), width, height);
dispatch.bind_renderbuffer(renderbuffer_target(), default_framebuffer_id());
return pp::foundation::Result<std::uint32_t>::success(renderbuffer_id);
}
pp::foundation::Status delete_opengl_renderbuffer(
std::uint32_t renderbuffer_id,
OpenGlRenderbufferDeleteDispatch dispatch) noexcept
{
if (dispatch.delete_renderbuffers == nullptr) {
return pp::foundation::Status::invalid_argument("OpenGL renderbuffer delete callback must not be null");
}
if (renderbuffer_id == 0U) {
return pp::foundation::Status::success();
}
dispatch.delete_renderbuffers(1U, &renderbuffer_id);
return pp::foundation::Status::success();
}
pp::foundation::Status attach_opengl_depth_renderbuffer(
std::uint32_t renderbuffer_id,
OpenGlDepthRenderbufferAttachmentDispatch dispatch) noexcept
{
if (dispatch.framebuffer_renderbuffer == nullptr) {
return pp::foundation::Status::invalid_argument(
"OpenGL depth renderbuffer attachment callback must not be null");
}
dispatch.framebuffer_renderbuffer(
framebuffer_target(),
framebuffer_depth_attachment(),
renderbuffer_target(),
renderbuffer_id);
return pp::foundation::Status::success();
}
pp::foundation::Result<std::uint32_t> create_opengl_sampler(
std::span<const OpenGlTextureParameter> parameters,
OpenGlSamplerCreateDispatch dispatch) noexcept

35
src/renderer_gl/opengl_capabilities.h
View File

@@ -364,8 +364,14 @@ using OpenGlGetActiveUniformFn = void (*)(
char* name) noexcept;
using OpenGlGetUniformLocationFn = std::int32_t (*)(std::uint32_t program, const char* name) noexcept;
using OpenGlBindFramebufferFn = void (*)(std::uint32_t target, std::uint32_t framebuffer) noexcept;
using OpenGlBindRenderbufferFn = void (*)(std::uint32_t target, std::uint32_t renderbuffer) noexcept;
using OpenGlBindTextureFn = void (*)(std::uint32_t target, std::uint32_t texture) noexcept;
using OpenGlBindSamplerFn = void (*)(std::uint32_t unit, std::uint32_t sampler) noexcept;
using OpenGlRenderbufferStorageFn = void (*)(
std::uint32_t target,
std::uint32_t internal_format,
std::int32_t width,
std::int32_t height) noexcept;
using OpenGlSamplerParameteriFn = void (*)(
std::uint32_t sampler,
std::uint32_t parameter,
@@ -427,6 +433,11 @@ using OpenGlFramebufferTexture2DFn = void (*)(
std::uint32_t texture_target,
std::uint32_t texture,
std::int32_t level) noexcept;
using OpenGlFramebufferRenderbufferFn = void (*)(
std::uint32_t target,
std::uint32_t attachment,
std::uint32_t renderbuffer_target,
std::uint32_t renderbuffer) noexcept;
using OpenGlCheckFramebufferStatusFn = std::uint32_t (*)(std::uint32_t target) noexcept;
using OpenGlReadPixelsFn = void (*)(
std::int32_t x,
@@ -608,6 +619,20 @@ struct OpenGlFramebufferRestoreDispatch {
OpenGlBindFramebufferFn bind_framebuffer = nullptr;
};
struct OpenGlDepthRenderbufferAllocationDispatch {
OpenGlGenObjectsFn gen_renderbuffers = nullptr;
OpenGlBindRenderbufferFn bind_renderbuffer = nullptr;
OpenGlRenderbufferStorageFn renderbuffer_storage = nullptr;
};
struct OpenGlRenderbufferDeleteDispatch {
OpenGlDeleteObjectsFn delete_renderbuffers = nullptr;
};
struct OpenGlDepthRenderbufferAttachmentDispatch {
OpenGlFramebufferRenderbufferFn framebuffer_renderbuffer = nullptr;
};
struct OpenGlSamplerCreateDispatch {
OpenGlGenObjectsFn gen_samplers = nullptr;
OpenGlSamplerParameteriFn sampler_parameter_i = nullptr;
@@ -813,6 +838,16 @@ struct OpenGlMeshDeleteDispatch {
[[nodiscard]] pp::foundation::Status restore_opengl_framebuffer_binding(
OpenGlFramebufferBindingState binding,
OpenGlFramebufferRestoreDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Result<std::uint32_t> allocate_opengl_depth_renderbuffer(
std::int32_t width,
std::int32_t height,
OpenGlDepthRenderbufferAllocationDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Status delete_opengl_renderbuffer(
std::uint32_t renderbuffer_id,
OpenGlRenderbufferDeleteDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Status attach_opengl_depth_renderbuffer(
std::uint32_t renderbuffer_id,
OpenGlDepthRenderbufferAttachmentDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Result<std::uint32_t> create_opengl_sampler(
std::span<const OpenGlTextureParameter> parameters,
OpenGlSamplerCreateDispatch dispatch) noexcept;