diff options
Diffstat (limited to 'src/mbgl/shader/raster_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/raster_shader.hpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp index ca474ede15..063bf78fd7 100644 --- a/src/mbgl/shader/raster_shader.hpp +++ b/src/mbgl/shader/raster_shader.hpp @@ -1,7 +1,7 @@ #pragma once -#include <mbgl/shader/shader.hpp> -#include <mbgl/shader/uniform.hpp> +#include <mbgl/gl/shader.hpp> +#include <mbgl/gl/uniform.hpp> namespace mbgl { @@ -11,26 +11,26 @@ template <class> class VertexBuffer; class RasterVertex; -class RasterShader : public Shader { +class RasterShader : public gl::Shader { public: RasterShader(gl::Context&, Defines defines = None); void bind(const gl::VertexBuffer<RasterVertex>&, const int8_t* offset); - UniformMatrix<4> u_matrix = {"u_matrix", *this}; - Uniform<int32_t> u_image0 = {"u_image0", *this}; - Uniform<int32_t> u_image1 = {"u_image1", *this}; - Uniform<float> u_opacity0 = {"u_opacity0", *this}; - Uniform<float> u_opacity1 = {"u_opacity1", *this}; - Uniform<float> u_buffer_scale = {"u_buffer_scale", *this}; - Uniform<float> u_brightness_low = {"u_brightness_low", *this}; - Uniform<float> u_brightness_high = {"u_brightness_high", *this}; - Uniform<float> u_saturation_factor = {"u_saturation_factor", *this}; - Uniform<float> u_contrast_factor = {"u_contrast_factor", *this}; - Uniform<std::array<float, 3>> u_spin_weights = {"u_spin_weights", *this}; - Uniform<std::array<float, 2>> u_tl_parent = {"u_tl_parent", *this}; - Uniform<float> u_scale_parent = {"u_scale_parent", *this}; + gl::UniformMatrix<4> u_matrix = {"u_matrix", *this}; + gl::Uniform<int32_t> u_image0 = {"u_image0", *this}; + gl::Uniform<int32_t> u_image1 = {"u_image1", *this}; + gl::Uniform<float> u_opacity0 = {"u_opacity0", *this}; + gl::Uniform<float> u_opacity1 = {"u_opacity1", *this}; + gl::Uniform<float> u_buffer_scale = {"u_buffer_scale", *this}; + gl::Uniform<float> u_brightness_low = {"u_brightness_low", *this}; + gl::Uniform<float> u_brightness_high = {"u_brightness_high", *this}; + gl::Uniform<float> u_saturation_factor = {"u_saturation_factor", *this}; + gl::Uniform<float> u_contrast_factor = {"u_contrast_factor", *this}; + gl::Uniform<std::array<float, 3>> u_spin_weights = {"u_spin_weights", *this}; + gl::Uniform<std::array<float, 2>> u_tl_parent = {"u_tl_parent", *this}; + gl::Uniform<float> u_scale_parent = {"u_scale_parent", *this}; }; } // namespace mbgl |