[core] Rationalize shader names

{layer type}{subtype}Shader
This commit is contained in:
John Firebaugh
2016-10-04 15:26:00 -07:00
parent 388fa9cf10
commit 21d7ee11e1
37 changed files with 180 additions and 178 deletions

View File

@@ -38,7 +38,7 @@ void Painter::renderDebugText(Tile& tile, const mat4 &matrix) {
tile.expires, frame.debugOptions, context);
}
auto& plainShader = shaders->plain;
auto& plainShader = shaders->fill;
context.program = plainShader.getID();
plainShader.u_matrix = matrix;
plainShader.u_opacity = 1.0f;
@@ -74,7 +74,7 @@ void Painter::renderDebugFrame(const mat4 &matrix) {
gl::StencilTestOperation::Replace };
context.stencilTest = true;
auto& plainShader = shaders->plain;
auto& plainShader = shaders->fill;
context.program = plainShader.getID();
plainShader.u_matrix = matrix;
plainShader.u_opacity = 1.0f;