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/uniforms.hpp | |
| parent | 7f1428ed3b90b54f503760471869ac83def32a59 (diff) | |
| download | qtlocation-mapboxgl-55c7b86053816e74c3fd3c0595c1fa053970f959.tar.gz | |
[core] extract uniform type lists from gl namespace
Diffstat (limited to 'src/mbgl/programs/uniforms.hpp')
| -rw-r--r-- | src/mbgl/programs/uniforms.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp index ab68e43c87..f634122181 100644 --- a/src/mbgl/programs/uniforms.hpp +++ b/src/mbgl/programs/uniforms.hpp @@ -1,6 +1,7 @@ #pragma once -#include <mbgl/gl/uniform.hpp> +#include <mbgl/gfx/uniform.hpp> +#include <mbgl/util/size.hpp> #include <mbgl/util/color.hpp> namespace mbgl { @@ -59,8 +60,8 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_pixel_coord_upper); MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_pixel_coord_lower); MBGL_DEFINE_UNIFORM_SCALAR(float, u_mix); -MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image); -MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_fadetexture); +MBGL_DEFINE_UNIFORM_SCALAR(uint32_t, u_image); +MBGL_DEFINE_UNIFORM_SCALAR(uint32_t, u_fadetexture); MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale_a); MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale_b); MBGL_DEFINE_UNIFORM_SCALAR(float, u_tile_units_to_pixels); |