TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert unintentional debug message check-in

Browse Source
This commit is contained in:
rdb 2015-04-26 15:07:09 +02:00
parent 92d40c3144
commit 589a1b52ac
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6928,8 +6928,8 @@ query_gl_version() {
string_to_int(components[1], _gl_version_minor); string_to_int(components[1], _gl_version_minor);
} }
if (GLCAT.is_info()) { if (GLCAT.is_debug()) {
GLCAT.info() GLCAT.debug()
<< "GL_VERSION = " << version << ", decoded to " << "GL_VERSION = " << version << ", decoded to "
<< _gl_version_major << "." << _gl_version_minor << _gl_version_major << "." << _gl_version_minor
<< "\n"; << "\n";
@ -6949,19 +6949,21 @@ query_gl_version() {
_gl_shadlang_ver_major = 1; _gl_shadlang_ver_major = 1;
_gl_shadlang_ver_minor = 1; _gl_shadlang_ver_minor = 1;
const char *verstr = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION); const char *verstr = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
if (verstr == NULL || sscanf(verstr, "%d.%d", &_gl_shadlang_ver_major, &_gl_shadlang_ver_minor) != 2) { if (verstr == NULL ||
GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n"; sscanf(verstr, "%d.%d", &_gl_shadlang_ver_major,
&_gl_shadlang_ver_minor) != 2) {
GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n";
} }
cerr << verstr << " -> " << _gl_shadlang_ver_major << " . " << _gl_shadlang_ver_minor << "\n";
} }
#elif defined(OPENGLES_2) #elif defined(OPENGLES_2)
_gl_shadlang_ver_major = 1; _gl_shadlang_ver_major = 1;
_gl_shadlang_ver_minor = 0; _gl_shadlang_ver_minor = 0;
const char *verstr = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION); const char *verstr = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
if (verstr == NULL || sscanf(verstr, "OpenGL ES GLSL %d.%d", &_gl_shadlang_ver_major, &_gl_shadlang_ver_minor) != 2) { if (verstr == NULL ||
GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n"; sscanf(verstr, "OpenGL ES GLSL %d.%d", &_gl_shadlang_ver_major,
&_gl_shadlang_ver_minor) != 2) {
GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n";
} }
cerr << verstr << " -> " << _gl_shadlang_ver_major << " . " << _gl_shadlang_ver_minor << "\n";
#endif #endif
} }
} }