summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_fill_extrusion_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_fill_extrusion_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_fill_extrusion_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
index a8c9f7a1c4..0d0c9034e1 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
@@ -163,7 +163,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*
patternPosA,
patternPosB,
FillExtrusionPatternProgram::TextureBindings{
- textures::u_image::Value{ *geometryTile.iconAtlasTexture->resource, gfx::TextureFilterType::Linear },
+ textures::image::Value{ *geometryTile.iconAtlasTexture->resource, gfx::TextureFilterType::Linear },
}
);
}
@@ -182,9 +182,9 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*
const auto allUniformValues = programInstance.computeAllUniformValues(
ExtrusionTextureProgram::LayoutUniformValues{
- uniforms::u_matrix::Value( viewportMat ),
- uniforms::u_world::Value( size ),
- uniforms::u_opacity::Value( evaluated.get<FillExtrusionOpacity>() )
+ uniforms::matrix::Value( viewportMat ),
+ uniforms::world::Value( size ),
+ uniforms::opacity::Value( evaluated.get<FillExtrusionOpacity>() )
},
paintAttributeData,
properties,
@@ -210,7 +210,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*
allUniformValues,
allAttributeBindings,
ExtrusionTextureProgram::TextureBindings{
- textures::u_image::Value{ *renderTexture->getTexture().resource },
+ textures::image::Value{ *renderTexture->getTexture().resource },
},
getID());
}