diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-27 12:47:34 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
| commit | 55c7b86053816e74c3fd3c0595c1fa053970f959 (patch) | |
| tree | c34be5d76008fad4f28d39e9c39cc85ad31b72fe /src/mbgl/programs/fill_program.cpp | |
| parent | 7f1428ed3b90b54f503760471869ac83def32a59 (diff) | |
| download | qtlocation-mapboxgl-55c7b86053816e74c3fd3c0595c1fa053970f959.tar.gz | |
[core] extract uniform type lists from gl namespace
Diffstat (limited to 'src/mbgl/programs/fill_program.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_program.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp index b072343e7a..9bf1257e89 100644 --- a/src/mbgl/programs/fill_program.cpp +++ b/src/mbgl/programs/fill_program.cpp @@ -10,8 +10,8 @@ using namespace style; static_assert(sizeof(FillLayoutVertex) == 4, "expected FillLayoutVertex size"); -FillPatternUniforms::Values -FillPatternUniforms::values(mat4 matrix, +FillPatternProgram::UniformValues +FillPatternProgram::uniformValues(mat4 matrix, Size framebufferSize, Size atlasSize, const CrossfadeParameters& crossfade, @@ -24,7 +24,7 @@ FillPatternUniforms::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 FillPatternUniforms::Values { + return { uniforms::u_matrix::Value( matrix ), uniforms::u_world::Value( framebufferSize ), uniforms::u_texsize::Value( atlasSize ), |