tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Introduce non-anonymous Shaders class

Browse Source
This commit is contained in:
John Firebaugh
2016-07-08 14:25:54 -07:00
parent 462137a536
commit 822ec091da
11 changed files with 86 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mbgl/renderer/painter_debug.cpp
View File

@@ -2,7 +2,7 @@
#include <mbgl/renderer/debug_bucket.hpp>
#include <mbgl/renderer/render_tile.hpp>
#include <mbgl/tile/tile.hpp>
#include <mbgl/shader/plain_shader.hpp>
#include <mbgl/shader/shaders.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/gl/debugging.hpp>
#include <mbgl/gl/gl.hpp>
@@ -40,7 +40,7 @@ void Painter::renderDebugText(Tile& tile, const mat4 &matrix) {
tile.expires, frame.debugOptions);
}
auto& plainShader = *shader.plain;
auto& plainShader = shaders->plain;
config.program = plainShader.getID();
plainShader.u_matrix = matrix;
plainShader.u_opacity = 1.0f;
@@ -75,7 +75,7 @@ void Painter::renderDebugFrame(const mat4 &matrix) {
config.stencilOp.reset();
config.stencilTest = GL_TRUE;
auto& plainShader = *shader.plain;
auto& plainShader = shaders->plain;
config.program = plainShader.getID();
plainShader.u_matrix = matrix;
plainShader.u_opacity = 1.0f;