Remove use of unsupported SURFACETYPE_OFFSCREEN_GENERIC

The khr_debug tests were for some reason trying overriding the surface
type to SURFACETYPE_OFFSCREEN_GENERIC, which isn't supported by WGL.

This change just leaves the surface type as is.

Affects:
KHR-GL46.khr_debug.*

Components: OpenGL

VK-GL-CTS Issue: 922

Change-Id: Ib72e346ed716d19629dcbcfa423b9fc4f63d1835

diff --git a/external/openglcts/modules/gl/gl4cKHRDebugTests.cpp b/external/openglcts/modules/gl/gl4cKHRDebugTests.cpp
index 570dc2c..5f7b3ff 100644 (file)
--- a/external/openglcts/modules/gl/gl4cKHRDebugTests.cpp
+++ b/external/openglcts/modules/gl/gl4cKHRDebugTests.cpp
@@ -193,14 +193,8 @@ void TestBase::initDebug()
        const tcu::CommandLine& commandLine = m_test_base_context.getTestContext().getCommandLine();
        parseRenderConfig(&renderCfg, commandLine);
 
-       if (commandLine.getSurfaceType() == tcu::SURFACETYPE_WINDOW)
-       {
-               renderCfg.surfaceType = glu::RenderConfig::SURFACETYPE_OFFSCREEN_GENERIC;
-       }
-       else
-       {
+       if (commandLine.getSurfaceType() != tcu::SURFACETYPE_WINDOW)
                throw tcu::NotSupportedError("Test not supported in non-windowed context");
-       }
 
        m_rc = createRenderContext(platform, commandLine, renderCfg);
        m_rc->makeCurrent();
@@ -217,14 +211,8 @@ void TestBase::initNonDebug()
        const tcu::CommandLine& commandLine = m_test_base_context.getTestContext().getCommandLine();
        parseRenderConfig(&renderCfg, commandLine);
 
-       if (commandLine.getSurfaceType() == tcu::SURFACETYPE_WINDOW)
-       {
-               renderCfg.surfaceType = glu::RenderConfig::SURFACETYPE_OFFSCREEN_GENERIC;
-       }
-       else
-       {
+       if (commandLine.getSurfaceType() != tcu::SURFACETYPE_WINDOW)
                throw tcu::NotSupportedError("Test not supported in non-windowed context");
-       }
 
        m_rc = createRenderContext(platform, commandLine, renderCfg);
        m_rc->makeCurrent();