Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More merge comments

Browse source
This commit is contained in:
Bradley Austin Davis 2015-08-05 13:53:19 -07:00
parent 649b9d6ce9
commit 89cc2ccfa5
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu/src/gpu/GLBackendShader.cpp
View file

@ -147,8 +147,8 @@ GLBackend::GLShader* compileShader(const Shader& shader) {
char* temp = new char[infoLength] ; char* temp = new char[infoLength] ;
glGetShaderInfoLog(glshader, infoLength, NULL, temp); glGetShaderInfoLog(glshader, infoLength, NULL, temp);
qWarning() << "GLShader::compileShader - failed to compile the gl shader object:"; qCWarning(gpulogging) << "GLShader::compileShader - failed to compile the gl shader object:";
qWarning() << temp; qCWarning(gpulogging) << temp;
/* /*
filestream.open("debugshader.glsl.info.txt"); filestream.open("debugshader.glsl.info.txt");

1
tests/render-utils/src/main.cpp
View file

@ -155,7 +155,6 @@ public:
makeCurrent(); makeCurrent();
// setFramePosition(QPoint(-1000, 0));
resize(QSize(800, 600)); resize(QSize(800, 600));
} }