Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Aug 17, 2015
1 parent ce71734 commit fe71c10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
@@ -1,4 +1,4 @@
group generic {
generic {
# Simple shader with untextured vertices. There is an additional constant
# color applied to all vertices. Uses a combined model-view-projection
# matrix.
Expand Down Expand Up @@ -42,7 +42,7 @@ group generic {
}"
}

group textured {
textured {
# Simple shader with one texture plus a color per vertex. Uses a
# combined model-view-projection matrix.
shader color {
Expand Down
8 changes: 4 additions & 4 deletions doomsday/sdk/libgui/src/graphics/glprogram.cpp
Expand Up @@ -13,7 +13,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#include "de/GLProgram"
Expand Down Expand Up @@ -41,9 +41,9 @@ DENG2_PIMPL(GLProgram)
, DENG2_OBSERVES(GLUniform, Deletion)
, DENG2_OBSERVES(GuiApp, GLContextChange)
{
typedef QSet<GLUniform const *> Uniforms;
typedef QSet<GLUniform const *> Uniforms;
typedef QList<GLUniform const *> UniformList;
typedef QSet<GLShader const *> Shaders;
typedef QSet<GLShader const *> Shaders;

Uniforms bound;
Uniforms changed;
Expand Down Expand Up @@ -332,7 +332,7 @@ GLProgram &GLProgram::build(GLShader const *vertexShader, GLShader const *fragme
d->releaseButRetainBindings();
d->attach(vertexShader);
d->attach(fragmentShader);
d->bindVertexAttribs();
d->bindVertexAttribs();
d->markAllBoundUniformsChanged();

setState(Ready);
Expand Down

0 comments on commit fe71c10

Please sign in to comment.