From c72a79988d8f2c38f61f12ad445257cd98901cb1 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Sun, 10 Sep 2023 06:13:24 +0100 Subject: [PATCH] Only do the overlay mip subresource tests once --- util/test/demos/gl/gl_overlay_test.cpp | 62 +++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/util/test/demos/gl/gl_overlay_test.cpp b/util/test/demos/gl/gl_overlay_test.cpp index daa34bf0e..52d50e423 100644 --- a/util/test/demos/gl/gl_overlay_test.cpp +++ b/util/test/demos/gl/gl_overlay_test.cpp @@ -346,38 +346,38 @@ void main() glScissor(0, 0, screenWidth, screenHeight); } - - glBindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - glBlitFramebuffer(0, 0, screenWidth, screenHeight, 0, 0, screenWidth, screenHeight, - GL_COLOR_BUFFER_BIT, GL_LINEAR); - - glBindFramebuffer(GL_FRAMEBUFFER, subfbo); - float col2[] = {0.0f, 0.0f, 0.0f, 1.0f}; - glClearBufferfv(GL_COLOR, 0, col2); - - glDepthFunc(GL_ALWAYS); - glDisable(GL_STENCIL_TEST); - - glUseProgram(whiteprogram); - - glViewport(5, 5, GLsizei(screenWidth) / 4 - 10, GLsizei(screenHeight) / 4 - 10); - glScissor(0, 0, screenWidth / 4, screenHeight / 4); - - setMarker("Subresources mip 2"); - glDrawArrays(GL_TRIANGLES, 9, 24); - - glBindFramebuffer(GL_FRAMEBUFFER, subfbo2); - glClearBufferfv(GL_COLOR, 0, col2); - - glViewport(2, 2, GLsizei(screenWidth) / 8 - 4, GLsizei(screenHeight) / 8 - 4); - glScissor(0, 0, screenWidth / 8, screenHeight / 8); - - setMarker("Subresources mip 3"); - glDrawArrays(GL_TRIANGLES, 9, 24); - - Present(); } + + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + glBlitFramebuffer(0, 0, screenWidth, screenHeight, 0, 0, screenWidth, screenHeight, + GL_COLOR_BUFFER_BIT, GL_LINEAR); + + glBindFramebuffer(GL_FRAMEBUFFER, subfbo); + float col2[] = {0.0f, 0.0f, 0.0f, 1.0f}; + glClearBufferfv(GL_COLOR, 0, col2); + + glDepthFunc(GL_ALWAYS); + glDisable(GL_STENCIL_TEST); + + glUseProgram(whiteprogram); + + glViewport(5, 5, GLsizei(screenWidth) / 4 - 10, GLsizei(screenHeight) / 4 - 10); + glScissor(0, 0, screenWidth / 4, screenHeight / 4); + + setMarker("Subresources mip 2"); + glDrawArrays(GL_TRIANGLES, 9, 24); + + glBindFramebuffer(GL_FRAMEBUFFER, subfbo2); + glClearBufferfv(GL_COLOR, 0, col2); + + glViewport(2, 2, GLsizei(screenWidth) / 8 - 4, GLsizei(screenHeight) / 8 - 4); + glScissor(0, 0, screenWidth / 8, screenHeight / 8); + + setMarker("Subresources mip 3"); + glDrawArrays(GL_TRIANGLES, 9, 24); + + Present(); } return 0;