1 files changed, 21 insertions, 14 deletions

diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp
index feaabf2630..09c940c4c3 100644
--- a/test/util/offscreen_texture.test.cpp
+++ b/test/util/offscreen_texture.test.cpp
@@ -3,23 +3,26 @@
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/gl/headless_backend.hpp>
-#include <mbgl/gl/offscreen_view.hpp>
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 
 #include <mbgl/util/offscreen_texture.hpp>
 
 using namespace mbgl;
 
 TEST(OffscreenTexture, EmptyRed) {
-    HeadlessBackend backend { test::sharedDisplay() };
+    HeadlessBackend backend({ 512, 256 });
     BackendScope scope { backend };
-    OffscreenView view(backend.getContext(), { 512, 256 });
-    view.bind();
+
+    // Scissor test shouldn't leak after HeadlessBackend::bind().
+    MBGL_CHECK_ERROR(glScissor(64, 64, 128, 128));
+    backend.getContext().scissorTest.setCurrentValue(true);
+
+    backend.bind();
 
     MBGL_CHECK_ERROR(glClearColor(1.0f, 0.0f, 0.0f, 1.0f));
     MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT));
 
-    auto image = view.readStillImage();
+    auto image = backend.readStillImage();
     test::checkImage("test/fixtures/offscreen_texture/empty-red", image, 0, 0);
 }
 
@@ -35,7 +38,7 @@ struct Shader {
         MBGL_CHECK_ERROR(glCompileShader(fragmentShader));
         MBGL_CHECK_ERROR(glAttachShader(program, fragmentShader));
         MBGL_CHECK_ERROR(glLinkProgram(program));
-        a_pos = glGetAttribLocation(program, "a_pos");
+        a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     }
 
     ~Shader() {
@@ -69,7 +72,7 @@ struct Buffer {
 
 
 TEST(OffscreenTexture, RenderToTexture) {
-    HeadlessBackend backend { test::sharedDisplay() };
+    HeadlessBackend backend({ 512, 256 });
     BackendScope scope { backend };
     auto& context = backend.getContext();
 
@@ -114,13 +117,12 @@ void main() {
 }
 )MBGL_SHADER");
 
-    GLuint u_texture = glGetUniformLocation(compositeShader.program, "u_texture");
+    GLuint u_texture = MBGL_CHECK_ERROR(glGetUniformLocation(compositeShader.program, "u_texture"));
 
     Buffer triangleBuffer({ 0, 0.5, 0.5, -0.5, -0.5, -0.5 });
     Buffer viewportBuffer({ -1, -1, 1, -1, -1, 1, 1, 1 });
 
-    OffscreenView view(context, { 512, 256 });
-    view.bind();
+    backend.bind();
 
     // First, draw red to the bound FBO.
     context.clear(Color::red(), {}, {});
@@ -128,6 +130,11 @@ void main() {
     // Then, create a texture, bind it, and render yellow to that texture. This should not
     // affect the originally bound FBO.
     OffscreenTexture texture(context, { 128, 128 });
+
+    // Scissor test shouldn't leak after OffscreenTexture::bind().
+    MBGL_CHECK_ERROR(glScissor(32, 32, 64, 64));
+    context.scissorTest.setCurrentValue(true);
+
     texture.bind();
 
     context.clear(Color(), {}, {});
@@ -143,9 +150,9 @@ void main() {
     test::checkImage("test/fixtures/offscreen_texture/render-to-texture", image, 0, 0);
 
     // Now reset the FBO back to normal and retrieve the original (restored) framebuffer.
-    view.bind();
+    backend.bind();
 
-    image = view.readStillImage();
+    image = backend.readStillImage();
     test::checkImage("test/fixtures/offscreen_texture/render-to-fbo", image, 0, 0);
 
     // Now, composite the Framebuffer texture we've rendered to onto the main FBO.
@@ -158,6 +165,6 @@ void main() {
         glVertexAttribPointer(compositeShader.a_pos, 2, GL_FLOAT, GL_FALSE, 0, nullptr));
     MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
 
-    image = view.readStillImage();
+    image = backend.readStillImage();
     test::checkImage("test/fixtures/offscreen_texture/render-to-fbo-composited", image, 0, 0.1);
 }