Skip to content

Commit 03e7a67

Browse files
committed
stuff
1 parent a072bb7 commit 03e7a67

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/ruis/render/opengl/context.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ utki::flags<ruis::render::opengl::extension> parse_supported_extensions(std::str
114114
ext_flags.set(ruis::render::opengl::extension::ext_texture_swizzle);
115115
} else if (ext == "GL_ARB_texture_swizzle"sv) {
116116
ext_flags.set(ruis::render::opengl::extension::arb_texture_swizzle);
117+
} else if (ext == "GL_ARB_debug_output"sv) {
118+
ext_flags.set(ruis::render::opengl::extension::arb_debug_output);
119+
} else if (ext == "GL_KHR_debug"sv) {
120+
ext_flags.set(ruis::render::opengl::extension::khr_debug);
117121
}
118122
}
119123

@@ -125,6 +129,12 @@ utki::flags<ruis::render::opengl::extension> parse_supported_extensions(std::str
125129
if (ext_flags.get(ruis::render::opengl::extension::arb_texture_swizzle)) {
126130
o << " GL_ARB_texture_swizzle" << std::endl;
127131
}
132+
if (ext_flags.get(ruis::render::opengl::extension::arb_debug_output)) {
133+
o << " GL_ARB_debug_output" << std::endl;
134+
}
135+
if (ext_flags.get(ruis::render::opengl::extension::khr_debug)) {
136+
o << " GL_KHR_debug" << std::endl;
137+
}
128138
});
129139

130140
return ext_flags;
@@ -183,8 +193,7 @@ context::context(utki::shared_ref<ruis::render::native_window> native_window) :
183193
this->default_framebuffer = GLuint(old_fb);
184194

185195
utki::run_debug([&]() {
186-
// glDebugMessageCallback() was introduced in OpenGL 4.3
187-
if (this->gl_version >= utki::version_duplet{4, 3}) {
196+
if (this->supported_extensions.get(ruis::render::opengl::extension::khr_debug)) {
188197
glEnable(GL_DEBUG_OUTPUT);
189198
glDebugMessageCallback(&opengl_error_callback, nullptr);
190199
}

src/ruis/render/opengl/context.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ namespace ruis::render::opengl {
3232
enum class extension {
3333
ext_texture_swizzle,
3434
arb_texture_swizzle = ext_texture_swizzle,
35+
arb_debug_output,
36+
khr_debug,
3537

3638
enum_size
3739
};

0 commit comments

Comments
 (0)