KHR-NoContext.* tests were not properly filtered based on the requested API.
Components: OpenGL
VK-GL-CTS issue: 611
Affects: KHR-NoContext.*
Change-Id: I400e4b80fd5923a63a3d1ee6da3a368366cb6e61
--- /dev/null
+KHR-NoContext.gl30.no_error.create_context
-KHR-NoContext.gl30.no_error.create_context
KHR-NoContext.gl45.robustness.no_reset_notification
KHR-NoContext.gl45.robustness.lose_context_on_reset
KHR-NoContext.gl45.robustness.getnuniform
* be lost! Modify the generating script instead.
*/-->
<TestPackage name="Khronos Mustpass GL NoContext">
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gl30-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gl45-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
</TestPackage>
</Mustpass>
--- /dev/null
+KHR-NoContext.gl30.*
--- /dev/null
+KHR-NoContext.gl45.*
+++ /dev/null
-KHR-NoContext.gl*
--- /dev/null
+KHR-NoContext.es2.no_error.create_context
-KHR-NoContext.es2.no_error.create_context
KHR-NoContext.es32.robustness.no_reset_notification
KHR-NoContext.es32.robustness.lose_context_on_reset
KHR-NoContext.es32.robustness.getnuniform
* be lost! Modify the generating script instead.
*/-->
<TestPackage name="Khronos Mustpass ES NoContext">
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gles2-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gles32-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
</TestPackage>
</Mustpass>
--- /dev/null
+KHR-NoContext.es2.*
--- /dev/null
+KHR-NoContext.es32.*
+++ /dev/null
-KHR-NoContext.es*
--- /dev/null
+KHR-NoContext.es2.no_error.create_context
-KHR-NoContext.es2.no_error.create_context
KHR-NoContext.es32.robustness.no_reset_notification
KHR-NoContext.es32.robustness.lose_context_on_reset
KHR-NoContext.es32.robustness.getnuniform
* be lost! Modify the generating script instead.
*/-->
<TestPackage name="Khronos Mustpass ES NoContext">
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
- <Configuration caseListFile="noctx-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=113 --deqp-surface-height=47 --deqp-base-seed=2 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gles2-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
+ <Configuration caseListFile="gles32-khr-master.txt" commandLine="--deqp-screen-rotation=unspecified --deqp-surface-width=64 --deqp-surface-height=64 --deqp-base-seed=1 --deqp-watchdog=disable" name="khr-master" os="any" useForFirstEGLConfig="True"/>
</TestPackage>
</Mustpass>
--- /dev/null
+KHR-NoContext.es2.*
--- /dev/null
+KHR-NoContext.es32.*
+++ /dev/null
-KHR-NoContext.es*
const char* mustpassDir = "gl_cts/data/mustpass/gles/khronos_mustpass_noctx/3.2.4.x/";
static const RunParams khronos_mustpass_es_nocontext_first_cfg[] = {
- { glu::ApiType(), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
- { glu::ApiType(), "khr-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+ { glu::ApiType::es(2, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+ { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
};
#endif // _GLCKHRONOSMUSTPASSESNOCONTEXT_HPP
const char* mustpassDir = "gl_cts/data/mustpass/gl/khronos_mustpass_noctx/4.5.5.x/";
static const RunParams khronos_mustpass_gl_nocontext_first_cfg[] = {
- { glu::ApiType(), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
- { glu::ApiType(), "khr-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+ { glu::ApiType::core(3, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+ { glu::ApiType::core(4, 5), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
};
#endif // _GLCKHRONOSMUSTPASSGLNOCONTEXT_HPP
}
}
-static void getTestRunsForNoContext(vector<TestRunParams>& runs, const ConfigList& configs, const RunParams* runParams,
+static void getTestRunsForNoContext(glu::ApiType type, vector<TestRunParams>& runs, const ConfigList& configs, const RunParams* runParams,
const int numRunParams, const char* mustpassDir)
{
vector<Config>::const_iterator cfgIter = configs.configs.begin();
for (int i = 0; i < numRunParams; ++i)
{
- const char* apiName = "noctx";
+ if (!glu::contextSupports(glu::ContextType(type), runParams[i].apiType))
+ continue;
+
+ const char* apiName = getApiName(runParams[i].apiType);
const int width = runParams[i].surfaceWidth;
const int height = runParams[i].surfaceHeight;
}
}
-static void getTestRunsForNoContextES(vector<TestRunParams>& runs, const ConfigList& configs)
+static void getTestRunsForNoContextES(glu::ApiType type, vector<TestRunParams>& runs, const ConfigList& configs)
{
#include "glcKhronosMustpassEsNocontext.hpp"
- getTestRunsForNoContext(runs, configs, khronos_mustpass_es_nocontext_first_cfg,
+ getTestRunsForNoContext(type, runs, configs, khronos_mustpass_es_nocontext_first_cfg,
DE_LENGTH_OF_ARRAY(khronos_mustpass_es_nocontext_first_cfg), mustpassDir);
}
{
getTestRunsForAOSPEGL(runs, configs);
getTestRunsForAOSPES(runs, configs, type);
- getTestRunsForNoContextES(runs, configs);
+ getTestRunsForNoContextES(type, runs, configs);
#include "glcKhronosMustpassEs.hpp"
}
}
-static void getTestRunsForNoContextGL(vector<TestRunParams>& runs, const ConfigList& configs)
+static void getTestRunsForNoContextGL(glu::ApiType type, vector<TestRunParams>& runs, const ConfigList& configs)
{
#include "glcKhronosMustpassGlNocontext.hpp"
- getTestRunsForNoContext(runs, configs, khronos_mustpass_gl_nocontext_first_cfg,
+ getTestRunsForNoContext(type, runs, configs, khronos_mustpass_gl_nocontext_first_cfg,
DE_LENGTH_OF_ARRAY(khronos_mustpass_gl_nocontext_first_cfg), mustpassDir);
}
static void getTestRunsForGL(glu::ApiType type, const ConfigList& configs, vector<TestRunParams>& runs)
{
- getTestRunsForNoContextGL(runs, configs);
+ getTestRunsForNoContextGL(type, runs, configs);
#include "glcKhronosMustpassGl.hpp"
for (vector<Config>::const_iterator cfgIter = configs.configs.begin(); cfgIter != configs.configs.end(); ++cfgIter)
Module("KHR-GLES2", "GLES2"),
Module("KHR-GLES31", "GLES31"),
Module("KHR-GLES32", "GLES32"),
- Module("KHR-NoContext", "NOCTX"),
+ Module("KHR-NOCTX-ES2", "GLES2"),
+ Module("KHR-NOCTX-ES32","GLES32"),
Module("GTF-GLES2", "GLES2" ),
Module("GTF-GLES3", "GLES3" ),
Module("GTF-GLES31", "GLES31"),
- Module("KHR-NoContext", "NOCTX"),
Module("KHR-GL45", "GL45"),
Module("KHR-GL44", "GL44"),
Module("KHR-GL43", "GL43"),
Module("GTF-GL32", "GL32"),
Module("GTF-GL31", "GL31"),
Module("GTF-GL30", "GL30"),
+ Module("KHR-NOCTX-GL30","GL30"),
+ Module("KHR-NOCTX-GL45","GL45"),
]
GLCTS_BIN_NAME = "glcts"
GLCTS_DIR_NAME = "external/openglcts/modules/"
return os.path.join(buildCfg.getBuildDir(), GLCTS_DIR_NAME)
def getCaseListFileName (module, caseListType):
- return "%s-cases.%s" % (module.name, caseListType)
+ mname = module.name
+ if mname == "KHR-NOCTX-ES2" or mname == "KHR-NOCTX-ES32" or mname == "KHR-NOCTX-GL30" or mname == "KHR-NOCTX-GL45":
+ mname = "KHR-NoContext"
+ return "%s-cases.%s" % (mname, caseListType)
def getCaseListPath (buildCfg, module, caseListType):
workDir = getModulesPath(buildCfg)
ES3KHR_MODULE = getModuleByName("KHR-GLES3")
ES31KHR_MODULE = getModuleByName("KHR-GLES31")
ES32KHR_MODULE = getModuleByName("KHR-GLES32")
-NOCTXKHR_MODULE = getModuleByName("KHR-NoContext")
+NOCTX_ES2_KHR_MODULE = getModuleByName("KHR-NOCTX-ES2")
+NOCTX_ES32_KHR_MODULE = getModuleByName("KHR-NOCTX-ES32")
ES2GTF_MODULE = getModuleByName("GTF-GLES2")
ES3GTF_MODULE = getModuleByName("GTF-GLES3")
filters = [include("gles32-khr-master.txt")]),
])
-GLCTS_NOCTX_KHR_PKG_1CFG = Package(module = NOCTXKHR_MODULE, configurations = [
+GLCTS_NOCTX_ES2_KHR_PKG = Package(module = NOCTX_ES2_KHR_MODULE, configurations = [
# Master
Configuration(name = "khr-master",
surfacewidth = "64",
surfaceheight = "64",
baseseed = "1",
- filters = [include("noctx-khr-master.txt")]),
+ filters = [include("gles2-khr-master.txt")]),
+ ])
+
+GLCTS_NOCTX_ES32_KHR_PKG = Package(module = NOCTX_ES32_KHR_MODULE, configurations = [
+ # Master
Configuration(name = "khr-master",
- surfacewidth = "113",
- surfaceheight = "47",
- baseseed = "2",
- filters = [include("noctx-khr-master.txt")]),
+ surfacewidth = "64",
+ surfaceheight = "64",
+ baseseed = "1",
+ filters = [include("gles32-khr-master.txt")]),
])
ES_MUSTPASS_LISTS = [
Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "3.2.4.x", isCurrent=True,
- packages = [GLCTS_NOCTX_KHR_PKG_1CFG]),
+ packages = [GLCTS_NOCTX_ES2_KHR_PKG, GLCTS_NOCTX_ES32_KHR_PKG]),
Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "3.2.4.x", isCurrent=True,
packages = [GLCTS_3_2_3_GLES2_PKG, GLCTS_3_2_3_GLES3_PKG, GLCTS_3_2_3_GLES31_PKG]),
]),
Mustpass(project = CTS_KHR_MP_NOCTX_ES_PROJECT, version = "master", isCurrent=False,
- packages = [GLCTS_NOCTX_KHR_PKG_1CFG]),
+ packages = [GLCTS_NOCTX_ES2_KHR_PKG, GLCTS_NOCTX_ES32_KHR_PKG]),
Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "master", isCurrent=False,
packages = [MASTER_GLES2_PKG, MASTER_GLES3_PKG, MASTER_GLES31_PKG]),
('GTF-GL30', ['gtf-master', [include('gl30-gtf-master.txt')]])
])
+NOCTX_GL30_KHR_MODULE = getModuleByName("KHR-NOCTX-GL30")
+NOCTX_GL45_KHR_MODULE = getModuleByName("KHR-NOCTX-GL45")
+
+GLCTS_NOCTX_GL30_KHR_PKG = Package(module = NOCTX_GL30_KHR_MODULE, configurations = [
+ # Master
+ Configuration(name = "khr-master",
+ surfacewidth = "64",
+ surfaceheight = "64",
+ baseseed = "1",
+ filters = [include("gl30-khr-master.txt")]),
+ ])
+
+GLCTS_NOCTX_GL45_KHR_PKG = Package(module = NOCTX_GL45_KHR_MODULE, configurations = [
+ # Master
+ Configuration(name = "khr-master",
+ surfacewidth = "64",
+ surfaceheight = "64",
+ baseseed = "1",
+ filters = [include("gl45-khr-master.txt")]),
+ ])
+
def generateGLMustpass():
gl_packages = []
for packageName in GL_MODULES:
gl_packages.append(pkg1)
mustpass = [Mustpass(project = GL_CTS_KHR_MP_PROJECT, version = "4.5.5.x", isCurrent=True, packages = gl_packages),
- Mustpass(project = GL_CTS_NOCTX_PROJECT, version = "4.5.5.x", isCurrent=True, packages = [GLCTS_NOCTX_KHR_PKG_1CFG]),
+ Mustpass(project = GL_CTS_NOCTX_PROJECT, version = "4.5.5.x", isCurrent=True, packages = [GLCTS_NOCTX_GL30_KHR_PKG, GLCTS_NOCTX_GL45_KHR_PKG]),
]
return mustpass
return "glu::ApiType::core(3, 1)"
if apiName == "GL30":
return "glu::ApiType::core(3, 0)"
- if apiName == "EGL" or apiName == "NOCTX":
+ if apiName == "EGL":
return "glu::ApiType()"
raise Exception("Unknown API %s" % apiName)
projects / platform / upstream / VK-GL-CTS.git / commitdiff