From: Wouter V. <m97...@us...> - 2006-06-28 19:52:10
|
Update of /cvsroot/openmsx/openMSX/src/video In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15195/src/video Modified Files: GLUtil.cc Log Message: suppress GLSL warnings in release mode (not yet tested) Index: GLUtil.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/video/GLUtil.cc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- GLUtil.cc 20 Jun 2006 19:30:31 -0000 1.31 +++ GLUtil.cc 28 Jun 2006 19:52:00 -0000 1.32 @@ -5,6 +5,7 @@ #include "FileContext.hh" #include "FileException.hh" #include "Math.hh" +#include "Version.hh" #include <iostream> #include <memory> #include <cassert> @@ -565,7 +566,8 @@ GLint infoLogLength = 0; glGetShaderiv(handle, GL_INFO_LOG_LENGTH, &infoLogLength); // note: the null terminator is included, so empty string has length 1 - if (!ok || infoLogLength > 1) { + if (!Version::RELEASE && + (!ok || infoLogLength > 1)) { GLchar infoLog[infoLogLength]; glGetShaderInfoLog(handle, infoLogLength, NULL, infoLog); fprintf( @@ -711,7 +713,8 @@ GLint infoLogLength = 0; glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &infoLogLength); // note: the null terminator is included, so empty string has length 1 - if (!ok || infoLogLength > 1) { + if (!Version::RELEASE && + (!ok || infoLogLength > 1)) { GLchar infoLog[infoLogLength]; glGetProgramInfoLog(handle, infoLogLength, NULL, infoLog); fprintf( |