From 589a1b52ac9c13ff2c2060fa6f46e23e923fb320 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 26 Apr 2015 15:07:09 +0200 Subject: [PATCH] Revert unintentional debug message check-in --- .../glstuff/glGraphicsStateGuardian_src.cxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 5471dfeb87..d24448189f 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -6928,8 +6928,8 @@ query_gl_version() { string_to_int(components[1], _gl_version_minor); } - if (GLCAT.is_info()) { - GLCAT.info() + if (GLCAT.is_debug()) { + GLCAT.debug() << "GL_VERSION = " << version << ", decoded to " << _gl_version_major << "." << _gl_version_minor << "\n"; @@ -6949,19 +6949,21 @@ query_gl_version() { _gl_shadlang_ver_major = 1; _gl_shadlang_ver_minor = 1; 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) { - GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n"; + if (verstr == NULL || + 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) _gl_shadlang_ver_major = 1; _gl_shadlang_ver_minor = 0; 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) { - GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n"; + if (verstr == NULL || + 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 } }