commit 396ebe64da5b8be0afb2581b667010545be8558b
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Tue Aug 12 07:46:01 2025 -0400
committer Lorenzo Dal Col <lorenzo@khronosgroup.org> Fri Sep 19 15:02:10 2025 +0000
tree 8cd4552d1f20262a544f7e87b90db2a903588076
parent 178c537503bb15dddfc4b93c963491f4064ba11f

reorder gl CullDistance checks to fix cleanup on NotSupported

Components: OpenGL

Affects:

KHR-GL46.cull_distance.*

Change-Id: I7cc1393b739f29e781a9f9bbc149dd3efe49ca3b

external/openglcts/modules/common/glcCullDistance.cpp

diff --git a/external/openglcts/modules/common/glcCullDistance.cpp b/external/openglcts/modules/common/glcCullDistance.cpp
index 54517f4..41786a1 100644
--- a/external/openglcts/modules/common/glcCullDistance.cpp
+++ b/external/openglcts/modules/common/glcCullDistance.cpp
@@ -2874,40 +2874,6 @@
         return;
     }
 
-    gl.genTextures(1, &m_to_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenTextures() call failed.");
-
-    gl.bindTexture(GL_TEXTURE_2D, m_to_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glBindTexture() call failed.");
-
-    gl.texStorage2D(GL_TEXTURE_2D, 1, /* levels */
-                    GL_R32F, m_to_width, m_to_height);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glTexStorage2D() call failed.");
-
-    /* Set up the draw/read FBO */
-    gl.genFramebuffers(1, &m_fbo_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenFramebuffers() call failed.");
-
-    gl.bindFramebuffer(GL_FRAMEBUFFER, m_fbo_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glBindFramebuffer() call failed.");
-
-    gl.framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_to_id, 0); /* level */
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glFramebufferTexture2D() call failed.");
-
-    /* Prepare a buffer object */
-    gl.genBuffers(1, &m_bo_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenBuffers() call failed.");
-
-    /* Prepare a VAO. We will configure separately for each iteration. */
-    gl.genVertexArrays(1, &m_vao_id);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenVertexArrays() call failed.");
-
-    gl.viewport(0, 0, m_to_width, m_to_height);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glViewport() call failed.");
-
-    gl.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    GLU_EXPECT_NO_ERROR(gl.getError(), "glClearColor() call failed.");
-
     /* Check for OpenGL feature support */
     if (m_test_item.use_passthrough_ts)
     {
@@ -2946,6 +2912,12 @@
         }
     }
 
+    if (m_test_item.fetch_culldistances && (m_primitive_mode != PRIMITIVE_MODE_POINTS))
+    {
+        m_testCtx.setTestResult(QP_TEST_RESULT_NOT_SUPPORTED, "Not supported");
+        return;
+    }
+
     glw::GLuint clipdistances_array_size = 0;
     glw::GLuint culldistances_array_size = 0;
 
@@ -2970,11 +2942,39 @@
         return;
     }
 
-    if (m_test_item.fetch_culldistances && (m_primitive_mode != PRIMITIVE_MODE_POINTS))
-    {
-        m_testCtx.setTestResult(QP_TEST_RESULT_NOT_SUPPORTED, "Not supported");
-        return;
-    }
+    gl.genTextures(1, &m_to_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenTextures() call failed.");
+
+    gl.bindTexture(GL_TEXTURE_2D, m_to_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glBindTexture() call failed.");
+
+    gl.texStorage2D(GL_TEXTURE_2D, 1, /* levels */
+                    GL_R32F, m_to_width, m_to_height);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glTexStorage2D() call failed.");
+
+    /* Set up the draw/read FBO */
+    gl.genFramebuffers(1, &m_fbo_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenFramebuffers() call failed.");
+
+    gl.bindFramebuffer(GL_FRAMEBUFFER, m_fbo_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glBindFramebuffer() call failed.");
+
+    gl.framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_to_id, 0); /* level */
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glFramebufferTexture2D() call failed.");
+
+    /* Prepare a buffer object */
+    gl.genBuffers(1, &m_bo_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenBuffers() call failed.");
+
+    /* Prepare a VAO. We will configure separately for each iteration. */
+    gl.genVertexArrays(1, &m_vao_id);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glGenVertexArrays() call failed.");
+
+    gl.viewport(0, 0, m_to_width, m_to_height);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glViewport() call failed.");
+
+    gl.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
+    GLU_EXPECT_NO_ERROR(gl.getError(), "glClearColor() call failed.");
 
     /* Create a program to run */
     buildPO(clipdistances_array_size, culldistances_array_size, m_test_item.dynamic_index_writes, m_primitive_mode,