diff options
-rw-r--r-- | demos/boxes/scene.cpp | 6 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp index e5aab75..cd9671e 100644 --- a/demos/boxes/scene.cpp +++ b/demos/boxes/scene.cpp @@ -620,11 +620,11 @@ void Scene::initGL() if (!program->link()) { qWarning("Failed to compile and link shader program"); qWarning("Vertex shader log:"); - qWarning() << m_vertexShader->errors(); + qWarning() << m_vertexShader->log(); qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):"; - qWarning() << shader->errors(); + qWarning() << shader->log(); qWarning("Shader program log:"); - qWarning() << program->errors(); + qWarning() << program->log(); delete shader; delete program; diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 3d8d34b..d238830 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -156,7 +156,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context) simpleShaderProg->link(); if (!simpleShaderProg->isValid()) { qCritical() << "Errors linking simple shader:" - << simpleShaderProg->errors(); + << simpleShaderProg->log(); } } @@ -432,7 +432,7 @@ bool QGLEngineShaderManager::useCorrectShaderProg() << " compositionFragShader = "<< requiredProgram.compositionFragShader->objectName() << '\n' #endif << " Error Log:" << '\n' - << " " << requiredProgram.program->errors(); + << " " << requiredProgram.program->log(); qWarning() << error; } else { |