comparison: src/gl/compiler.cpp
src/gl/compiler.cpp
- changeset 115
- ed884a2fb009
- parent 80
- 764381756899
- child 119
- 24275a4064f4
equal
deleted
inserted
replaced
| 114:4e03b0e2a29f | 115:ed884a2fb009 |
|---|---|
| 140 QString log; | 140 QString log; |
| 141 if (not vertexShaderCompiled) | 141 if (not vertexShaderCompiled) |
| 142 { | 142 { |
| 143 log += "\n" + QObject::tr("Vertex shader:") + "\n" + shaderProgram->log(); | 143 log += "\n" + QObject::tr("Vertex shader:") + "\n" + shaderProgram->log(); |
| 144 } | 144 } |
| 145 const bool fragmentShaderCompiled = shaderProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, fragmentShaderSource); | 145 const bool fragmentShaderCompiled = shaderProgram->addShaderFromSourceCode( |
| 146 QOpenGLShader::Fragment, | |
| 147 fragmentShaderSource); | |
| 146 if (not fragmentShaderCompiled) | 148 if (not fragmentShaderCompiled) |
| 147 { | 149 { |
| 148 log += "\n" + QObject::tr("Fragment shader:") + "\n" + shaderProgram->log(); | 150 log += "\n" + QObject::tr("Fragment shader:") + "\n" + shaderProgram->log(); |
| 149 } | 151 } |
| 150 if (not vertexShaderCompiled or not fragmentShaderCompiled) | 152 if (not vertexShaderCompiled or not fragmentShaderCompiled) |
