summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager.cpp4
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadersource_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index d238830..514aac0 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -154,7 +154,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
simpleShaderProg->addShader(compiledShaders[MainFragmentShader]);
simpleShaderProg->addShader(compiledShaders[ShockingPinkSrcFragmentShader]);
simpleShaderProg->link();
- if (!simpleShaderProg->isValid()) {
+ if (!simpleShaderProg->isLinked()) {
qCritical() << "Errors linking simple shader:"
<< simpleShaderProg->log();
}
@@ -418,7 +418,7 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
requiredProgram.program->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
requiredProgram.program->link();
- if (!requiredProgram.program->isValid()) {
+ if (!requiredProgram.program->isLinked()) {
QString error;
qWarning() << "Shader program failed to link,"
#if defined(QT_DEBUG)
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index bf896b1..fdbba72 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -284,7 +284,7 @@ static const char* const qglslNonPremultipliedImageSrcFragmentShader = "\
static const char* const qglslShockingPinkSrcFragmentShader = "\
lowp vec4 srcPixel() { \
- return lowp vec4(0.98, 0.06, 0.75, 1.0); \
+ return vec4(0.98, 0.06, 0.75, 1.0); \
}";