summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_circle_layer.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-15 23:32:45 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-20 15:40:47 +0100
commit0ad2375e1047353fc65fabce3ac9123dc095179e (patch)
treeadfcd395cb9f38a3eff6845bb63e3ab8bcf131a3 /src/mbgl/renderer/layers/render_circle_layer.cpp
parent9ee1de575af4ef332ad8812c11d9d63edc94d76e (diff)
downloadqtlocation-mapboxgl-0ad2375e1047353fc65fabce3ac9123dc095179e.tar.gz
[core] remove a_/u_ prefix from attribute/uniform types
Diffstat (limited to 'src/mbgl/renderer/layers/render_circle_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_circle_layer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index 2cc0d2e329..9b463e6a6f 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -69,19 +69,19 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) {
const auto allUniformValues = programInstance.computeAllUniformValues(
CircleProgram::LayoutUniformValues {
- uniforms::u_matrix::Value(
+ uniforms::matrix::Value(
tile.translatedMatrix(evaluated.get<CircleTranslate>(),
evaluated.get<CircleTranslateAnchor>(),
parameters.state)
),
- uniforms::u_scale_with_map::Value( scaleWithMap ),
- uniforms::u_extrude_scale::Value( pitchWithMap
+ uniforms::scale_with_map::Value( scaleWithMap ),
+ uniforms::extrude_scale::Value( pitchWithMap
? std::array<float, 2> {{
tile.id.pixelsToTileUnits(1, parameters.state.getZoom()),
tile.id.pixelsToTileUnits(1, parameters.state.getZoom()) }}
: parameters.pixelsToGLUnits ),
- uniforms::u_camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() ),
- uniforms::u_pitch_with_map::Value( pitchWithMap )
+ uniforms::camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() ),
+ uniforms::pitch_with_map::Value( pitchWithMap )
},
paintPropertyBinders,
evaluated,