diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-10-04 12:45:11 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-04 14:00:30 -0700 |
| commit | 07315711d6b191a5812065bb76ab5beb33d995d9 (patch) | |
| tree | 89afc1b90ac64660596ffb94512bbd23adbf80cc /test/util | |
| parent | e103d92b1814fc3a735c05ce9be70be3409c201a (diff) | |
| download | qtlocation-mapboxgl-07315711d6b191a5812065bb76ab5beb33d995d9.tar.gz | |
[core] remove Raster object in favor of a more low-level Texture object
Diffstat (limited to 'test/util')
| -rw-r--r-- | test/util/offscreen_texture.test.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp index 2c80c04c41..301fc2c250 100644 --- a/test/util/offscreen_texture.test.cpp +++ b/test/util/offscreen_texture.test.cpp @@ -4,7 +4,6 @@ #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/util/offscreen_texture.hpp> -#include <mbgl/util/raster.hpp> using namespace mbgl; @@ -137,7 +136,7 @@ void main() { // Now, composite the Framebuffer texture we've rendered to onto the main FBO. context.program = compositeShader.program; - texture.getTexture().bind(context, 0, Raster::Scaling::Linear); + context.bindTexture(texture.getTexture(), 0, gl::TextureFilter::Linear); MBGL_CHECK_ERROR(glUniform1i(u_texture, 0)); MBGL_CHECK_ERROR(glBindBuffer(GL_ARRAY_BUFFER, viewportBuffer.buffer)); MBGL_CHECK_ERROR(glEnableVertexAttribArray(compositeShader.a_pos)); |