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

Route GL runtime info through renderer GL

Browse Source
This commit is contained in:
omigamedev
2026-06-03 05:45:08 +02:00
parent b2335b1656
commit 103fe4fb12
6 changed files with 108 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/app.cpp
View File

@@ -25,31 +25,16 @@ std::condition_variable App::render_cv;
namespace {
[[nodiscard]] GLenum version_string_name() noexcept
{
return static_cast<GLenum>(pp::renderer::gl::version_string_name());
}
[[nodiscard]] GLenum vendor_string_name() noexcept
{
return static_cast<GLenum>(pp::renderer::gl::vendor_string_name());
}
[[nodiscard]] GLenum renderer_string_name() noexcept
{
return static_cast<GLenum>(pp::renderer::gl::renderer_string_name());
}
[[nodiscard]] GLenum shading_language_version_string_name() noexcept
{
return static_cast<GLenum>(pp::renderer::gl::shading_language_version_string_name());
}
[[nodiscard]] GLenum scissor_test_state() noexcept
{
return static_cast<GLenum>(pp::renderer::gl::scissor_test_state());
}
[[nodiscard]] const char* query_opengl_string(std::uint32_t name) noexcept
{
return reinterpret_cast<const char*>(glGetString(static_cast<GLenum>(name)));
}
void enable_opengl_state(std::uint32_t state) noexcept
{
glEnable(static_cast<GLenum>(state));
@@ -393,10 +378,22 @@ void App::init()
render_task([]
{
App::I->install_render_debug_callback();
LOG("GL version: %s", glGetString(version_string_name()));
LOG("GL vendor: %s", glGetString(vendor_string_name()));
LOG("GL renderer: %s", glGetString(renderer_string_name()));
LOG("GLSL version: %s", glGetString(shading_language_version_string_name()));
const auto runtime_info_result = pp::renderer::gl::query_opengl_runtime_info(
pp::renderer::gl::OpenGlRuntimeInfoDispatch {
.get_string = query_opengl_string,
});
if (runtime_info_result.ok())
{
const auto& runtime_info = runtime_info_result.value();
LOG("GL version: %s", runtime_info.version);
LOG("GL vendor: %s", runtime_info.vendor);
LOG("GL renderer: %s", runtime_info.renderer);
LOG("GLSL version: %s", runtime_info.shading_language_version);
}
else
{
LOG("OpenGL runtime info failed: %s", runtime_info_result.status().message);
}
//GLint n_exts;
//glGetIntegerv(GL_NUM_EXTENSIONS, &n_exts);

16
src/renderer_gl/opengl_capabilities.cpp
View File

@@ -245,6 +245,22 @@ pp::foundation::Status apply_panopainter_initial_state(OpenGlStateDispatch dispa
return pp::foundation::Status::success();
}
pp::foundation::Result<OpenGlRuntimeInfo> query_opengl_runtime_info(
OpenGlRuntimeInfoDispatch dispatch) noexcept
{
if (dispatch.get_string == nullptr) {
return pp::foundation::Result<OpenGlRuntimeInfo>::failure(
pp::foundation::Status::invalid_argument("OpenGL runtime info string callback must not be null"));
}
return pp::foundation::Result<OpenGlRuntimeInfo>::success(OpenGlRuntimeInfo {
.version = dispatch.get_string(version_string_name()),
.vendor = dispatch.get_string(vendor_string_name()),
.renderer = dispatch.get_string(renderer_string_name()),
.shading_language_version = dispatch.get_string(shading_language_version_string_name()),
});
}
std::uint32_t extension_count_query() noexcept
{
return gl_num_extensions;

15
src/renderer_gl/opengl_capabilities.h
View File

@@ -135,6 +135,19 @@ struct OpenGlStateDispatch {
OpenGlBlendEquationSeparateFn blend_equation_separate = nullptr;
};
struct OpenGlRuntimeInfo {
const char* version = "";
const char* vendor = "";
const char* renderer = "";
const char* shading_language_version = "";
};
using OpenGlStringQueryFn = const char* (*)(std::uint32_t name) noexcept;
struct OpenGlRuntimeInfoDispatch {
OpenGlStringQueryFn get_string = nullptr;
};
[[nodiscard]] OpenGlCapabilities detect_opengl_capabilities(
std::span<const std::string_view> extensions,
OpenGlRuntime runtime) noexcept;
@@ -142,6 +155,8 @@ struct OpenGlStateDispatch {
OpenGlCapabilities capabilities) noexcept;
[[nodiscard]] OpenGlInitialState panopainter_initial_state() noexcept;
[[nodiscard]] pp::foundation::Status apply_panopainter_initial_state(OpenGlStateDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Result<OpenGlRuntimeInfo> query_opengl_runtime_info(
OpenGlRuntimeInfoDispatch dispatch) noexcept;
[[nodiscard]] std::uint32_t extension_count_query() noexcept;
[[nodiscard]] std::uint32_t extension_string_name() noexcept;