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

[core] extract uniform type lists from gl namespace

Browse Source
This commit is contained in:
Konstantin Käfer
2019-02-27 12:47:34 +01:00
parent 7f1428ed3b
commit 55c7b86053
28 changed files with 179 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mbgl/programs/background_program.cpp
View File

@@ -10,8 +10,8 @@ using namespace style;
static_assert(sizeof(BackgroundLayoutVertex) == 4, "expected BackgroundLayoutVertex size");
BackgroundPatternUniforms::Values
BackgroundPatternUniforms::values(mat4 matrix,
BackgroundPatternProgram::UniformValues
BackgroundPatternProgram::uniformValues(mat4 matrix,
float opacity,
Size atlasSize,
const ImagePosition& a,
@@ -24,7 +24,7 @@ BackgroundPatternUniforms::values(mat4 matrix,
int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z));
int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
return BackgroundPatternUniforms::Values {
return {
uniforms::u_matrix::Value( matrix ),
uniforms::u_opacity::Value( opacity ),
uniforms::u_texsize::Value( atlasSize ),