libgui|GL: Cleanup

skyjake · Sep 1, 2019 · dee33e1 · dee33e1
1 parent 4cf4d67
commit dee33e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/doomsday/libs/gui/src/graphics/glprogram.cpp b/doomsday/libs/gui/src/graphics/glprogram.cpp
@@ -221,15 +221,21 @@ DENG2_PIMPL(GLProgram)
 
         if (texturesChanged)
         {
+            auto &GL = LIBGUI_GL;
             // Update the sampler uniforms.
             for (int unit = 0; unit < textures.size(); ++unit)
             {
                 int loc = self().glUniformLocation(textures[unit]->name());
                 if (loc >= 0)
                 {
-                    LIBGUI_GL.glUniform1i(loc, unit);
+//                    qDebug() << "[GLProgram] texture" << textures[unit]->name() << loc << unit;
+                    GL.glUniform1i(loc, unit);
                     LIBGUI_ASSERT_GL_OK();
                 }
+//                else
+//                {
+//                    qDebug() << "[GLProgram] texture" << textures[unit]->name() << "no location!";
+//                }
             }
             texturesChanged = false;
         }

diff --git a/doomsday/libs/gui/src/graphics/glshader.cpp b/doomsday/libs/gui/src/graphics/glshader.cpp
@@ -222,7 +222,8 @@ void GLShader::compile(Type shaderType, IByteArray const &shaderSource)
         LIBGUI_GL.glGetShaderInfoLog(d->name, logSize, &count, reinterpret_cast<GLchar *>(log.data()));
 
         throw CompilerError("GLShader::compile",
-                            "Compilation of " + String(d->type == Fragment? "fragment" : "vertex") +
+                            "Compilation of " + String(d->type == Fragment? "fragment" :
+                                                       d->type == Geometry? "geometry" : "vertex") +
                             " shader failed:\n" + log);
     }