BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2026-02-04 23:39:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

opengl debug output refactoring

Browse Source
This commit is contained in:
Matvey Cherevko
2019-09-30 22:08:55 +07:00
parent 85fe12be09
commit 46c5c1b9b7
5 changed files with 98 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.clang_complete
View File

@@ -1,4 +1,14 @@
-Iheaders
-Isources
-Imodules/ecs.hpp/headers
-Imodules/flat.hpp/headers
-Imodules/curly.hpp/headers
-Imodules/promise.hpp/headers
-Imodules/glew/include
-Imodules/glfw/include
-Imodules/spine/spine-c/spine-c/include
-std=c++17
-stdlib=libc++

8
sources/enduro2d/core/render_impl/render_opengl_base.cpp
View File

@@ -1334,6 +1334,10 @@ namespace e2d::opengl
max_combined_texture_image_units);
}
bool gl_has_extension(debug& debug, str_view name) noexcept {
return gl_has_any_extension(debug, name);
}
void gl_fill_device_caps(debug& debug, render::device_caps& caps) noexcept {
GLint max_texture_size = 0;
GLint max_renderbuffer_size = 0;
@@ -1472,10 +1476,6 @@ namespace e2d::opengl
gl_has_any_extension(debug,
"GL_IMG_texture_compression_pvrtc2");
}
bool gl_has_extension(debug& debug, str_view name) noexcept {
return gl_has_any_extension(debug, name);
}
gl_shader_id gl_compile_shader(
debug& debug,

2
sources/enduro2d/core/render_impl/render_opengl_base.hpp
View File

@@ -294,8 +294,8 @@ namespace e2d::opengl
{
void gl_trace_info(debug& debug) noexcept;
void gl_trace_limits(debug& debug) noexcept;
void gl_fill_device_caps(debug& debug, render::device_caps& caps) noexcept;
bool gl_has_extension(debug& debug, str_view name) noexcept;
void gl_fill_device_caps(debug& debug, render::device_caps& caps) noexcept;
gl_shader_id gl_compile_shader(
debug& debug,

158
sources/enduro2d/core/render_impl/render_opengl_impl.cpp
View File

@@ -13,6 +13,86 @@ namespace
{
using namespace e2d;
using namespace e2d::opengl;
const char* debug_output_severity_to_cstr(GLenum severity) noexcept {
switch ( severity ) {
case GL_DEBUG_SEVERITY_HIGH: return "high";
case GL_DEBUG_SEVERITY_MEDIUM: return "medium";
case GL_DEBUG_SEVERITY_LOW: return "low";
case GL_DEBUG_SEVERITY_NOTIFICATION: return "notification";
default: return "unknown";
}
}
const char* debug_output_source_to_cstr(GLenum source) noexcept {
switch (source) {
case GL_DEBUG_SOURCE_API: return "API";
case GL_DEBUG_SOURCE_WINDOW_SYSTEM: return "window system";
case GL_DEBUG_SOURCE_SHADER_COMPILER: return "shader compiler";
case GL_DEBUG_SOURCE_THIRD_PARTY: return "third party";
case GL_DEBUG_SOURCE_APPLICATION: return "application";
case GL_DEBUG_SOURCE_OTHER: return "other";
default: return "unknown";
}
}
const char* debug_output_type_to_cstr(GLenum type) noexcept {
switch ( type ) {
case GL_DEBUG_TYPE_ERROR: return "error";
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: return "deprecated behavior";
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR: return "undefined behavior";
case GL_DEBUG_TYPE_PORTABILITY: return "portability";
case GL_DEBUG_TYPE_PERFORMANCE: return "performance";
case GL_DEBUG_TYPE_OTHER: return "other";
case GL_DEBUG_TYPE_MARKER: return "marker";
case GL_DEBUG_TYPE_PUSH_GROUP: return "push group";
case GL_DEBUG_TYPE_POP_GROUP: return "pop group";
default: return "unknown";
}
}
void debug_output_callback(
GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* message,
const void* user_param) noexcept
{
if ( !length || !message || !user_param ) {
return;
}
const_cast<debug*>(static_cast<const debug*>(user_param))->trace(
"RENDER: Debug output message:\n"
"--> Id: %0\n"
"--> Severity: %1\n"
"--> Source: %2\n"
"--> Type: %3\n"
"--> Message: %4\n",
id,
debug_output_severity_to_cstr(severity),
debug_output_source_to_cstr(source),
debug_output_type_to_cstr(type),
str_view(message, length));
}
void setup_debug_output(debug& debug) noexcept {
if ( !gl_has_extension(debug, "GL_KHR_debug") ) {
return;
}
GL_CHECK_CODE(debug, glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS));
GL_CHECK_CODE(debug, glDebugMessageCallback(debug_output_callback, &debug));
GL_CHECK_CODE(debug, glDebugMessageControl(
GL_DONT_CARE,
GL_DONT_CARE,
GL_DEBUG_SEVERITY_NOTIFICATION,
0,
nullptr,
GL_FALSE));
}
}
namespace e2d
@@ -216,10 +296,10 @@ namespace e2d
gl_trace_limits(debug_);
gl_fill_device_caps(debug_, device_caps_);
setup_debug_output(debug_);
GL_CHECK_CODE(debug_, glPixelStorei(GL_PACK_ALIGNMENT, 1));
GL_CHECK_CODE(debug_, glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
create_debug_output_();
reset_states();
reset_shader_program();
reset_render_target();
@@ -240,7 +320,7 @@ namespace e2d
const render_target_ptr& render::internal_state::render_target() const noexcept {
return render_target_;
}
render::internal_state& render::internal_state::reset_states() noexcept {
set_depth_state_(state_block_.depth());
set_stencil_state_(state_block_.stencil());
@@ -308,7 +388,7 @@ namespace e2d
GL_CHECK_CODE(debug_, glBindFramebuffer(rt_id.target(), *rt_id));
return *this;
}
render::internal_state& render::internal_state::set_render_target(const render_target_ptr& rt) noexcept {
if ( rt == render_target_ ) {
return *this;
@@ -396,78 +476,6 @@ namespace e2d
GL_CHECK_CODE(debug_, enable_or_disable(GL_DEPTH_TEST, cs.depth_test()));
GL_CHECK_CODE(debug_, enable_or_disable(GL_STENCIL_TEST, cs.stencil_test()));
}
void render::internal_state::create_debug_output_() noexcept {
if ( !gl_has_extension(debug_, "GL_ARB_debug_output") ) {
return;
}
GL_CHECK_CODE(debug_, glDebugMessageCallbackARB(debug_output_callback_, this));
// disable notifications
GL_CHECK_CODE(debug_, glDebugMessageControlARB(
GL_DONT_CARE,
GL_DONT_CARE,
GL_DEBUG_SEVERITY_NOTIFICATION,
0,
nullptr,
GL_FALSE));
}
void render::internal_state::debug_output_callback_(
GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* message,
const void* userParam)
{
if ( !userParam ) {
return;
}
str msg;
switch ( severity ) {
case GL_DEBUG_SEVERITY_HIGH : msg += "[High]"; break;
case GL_DEBUG_SEVERITY_MEDIUM : msg += "[Medium]"; break;
case GL_DEBUG_SEVERITY_LOW : msg += "[Low]"; break;
case GL_DEBUG_SEVERITY_NOTIFICATION : msg += "[Notification]"; break;
}
msg += " src: ";
switch ( source ) {
case GL_DEBUG_SOURCE_API : msg += "OpenGL"; break;
case GL_DEBUG_SOURCE_WINDOW_SYSTEM : msg += "OS"; break;
case GL_DEBUG_SOURCE_SHADER_COMPILER : msg += "GL_Compiler"; break;
case GL_DEBUG_SOURCE_THIRD_PARTY : msg += "Third_Party"; break;
case GL_DEBUG_SOURCE_APPLICATION : msg += "Application"; break;
case GL_DEBUG_SOURCE_OTHER :
default : msg += "Other"; break;
}
msg += ", type: ";
switch ( type ) {
case GL_DEBUG_TYPE_ERROR : msg += "Error"; break;
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR : msg += "Deprecated"; break;
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR : msg += "Undefined_Behavior"; break;
case GL_DEBUG_TYPE_PORTABILITY : msg += "Portability"; break;
case GL_DEBUG_TYPE_PERFORMANCE : msg += "Performance"; break;
case GL_DEBUG_TYPE_MARKER : msg += "Marker"; break;
case GL_DEBUG_TYPE_PUSH_GROUP : msg += "Push_Group"; break;
case GL_DEBUG_TYPE_POP_GROUP : msg += "Pop_Group"; break;
case GL_DEBUG_TYPE_OTHER :
default : msg += "Other"; break;
}
msg += "\n";
if ( message && length ) {
msg += str_view(message, length);
}
static_cast<const internal_state*>(userParam)->debug_.trace(msg);
}
}
#endif

9
sources/enduro2d/core/render_impl/render_opengl_impl.hpp
View File

@@ -190,15 +190,6 @@ namespace e2d
void set_culling_state_(const culling_state& cs) noexcept;
void set_blending_state_(const blending_state& bs) noexcept;
void set_capabilities_state_(const capabilities_state& cs) noexcept;
void create_debug_output_() noexcept;
static void GLAPIENTRY debug_output_callback_(
GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* message,
const void* userParam);
private:
debug& debug_;
window& window_;