TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: more reliable check for core/compat profile

Browse Source 
Fixes #643
This commit is contained in:
rdb 2019-05-03 14:33:46 +02:00
parent 7f0ac22ca5
commit 53612512d5
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -597,8 +597,31 @@ reset() {
query_glsl_version();
#ifndef OPENGLES
bool core_profile = is_at_least_gl_version(3, 2) &&
!has_extension("GL_ARB_compatibility");
// Determine whether this OpenGL context has compatibility features.
bool core_profile = false;
if (_gl_version_major >= 3) {
if (_gl_version_major > 3 || _gl_version_minor >= 2) {
// OpenGL 3.2 has a built-in way to check this.
GLint profile_mask = 0;
glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &profile_mask);
if (profile_mask & GL_CONTEXT_CORE_PROFILE_BIT) {
core_profile = true;
} else if (profile_mask & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) {
core_profile = false;
} else {
core_profile = !has_extension("GL_ARB_compatibility");
}
} else {
// OpenGL 3.0/3.1.
GLint flags = 0;
glGetIntegerv(GL_CONTEXT_FLAGS, &flags);
if (flags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT) {
core_profile = true;
}
}
}
if (GLCAT.is_debug()) {
if (core_profile) {