[Piglit] [PATCH 2/2] arb_texture_view: convert some more tests to run on ES 3.1
Tapani Pälli
tapani.palli at intel.com
Fri May 11 10:17:59 UTC 2018
- arb_texture_view-clear-into-view-2d-array_gles3
- arb_texture_view-clear-into-view-2d_gles3
- arb_texture_view-clear-into-view-layered_gles3
- arb_texture_view-copytexsubimage-layers_gles3
- arb_texture_view-texsubimage-layers_gles3
- arb_texture_view-texsubimage-levels_gles3
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
tests/spec/arb_texture_view/CMakeLists.gles3.txt | 6 ++++++
tests/spec/arb_texture_view/clear-into-view-2d-array.c | 5 +++++
tests/spec/arb_texture_view/clear-into-view-2d.c | 5 +++++
tests/spec/arb_texture_view/clear-into-view-layered.c | 5 +++++
tests/spec/arb_texture_view/copytexsubimage-layers.c | 5 +++++
tests/spec/arb_texture_view/texsubimage-layers.c | 5 +++++
tests/spec/arb_texture_view/texsubimage-levels.c | 5 +++++
7 files changed, 36 insertions(+)
diff --git a/tests/spec/arb_texture_view/CMakeLists.gles3.txt b/tests/spec/arb_texture_view/CMakeLists.gles3.txt
index ad3bae355..cbd8277fd 100644
--- a/tests/spec/arb_texture_view/CMakeLists.gles3.txt
+++ b/tests/spec/arb_texture_view/CMakeLists.gles3.txt
@@ -1,5 +1,9 @@
link_libraries(piglitutil_${piglit_target_api})
+piglit_add_executable(arb_texture_view-clear-into-view-2d-array_gles3 clear-into-view-2d-array.c common.c)
+piglit_add_executable(arb_texture_view-clear-into-view-2d_gles3 clear-into-view-2d.c common.c)
+piglit_add_executable(arb_texture_view-clear-into-view-layered_gles3 clear-into-view-layered.c common.c)
+piglit_add_executable(arb_texture_view-copytexsubimage-layers_gles3 copytexsubimage-layers.c common.c)
piglit_add_executable(arb_texture_view-rendering-formats_gles3 rendering-formats.c)
piglit_add_executable(arb_texture_view-rendering-layers_gles3 rendering_layers.c common.c)
piglit_add_executable(arb_texture_view-rendering-levels_gles3 rendering_levels.c common.c)
@@ -10,4 +14,6 @@ piglit_add_executable(arb_texture_view-sampling-2d-array-as-cubemap-array_gles3
piglit_add_executable(arb_texture_view-formats_gles3 formats.c common.c)
piglit_add_executable(arb_texture_view-queries_gles3 queries.c)
piglit_add_executable(arb_texture_view-targets_gles3 targets.c common.c)
+piglit_add_executable(arb_texture_view-texsubimage-layers_gles3 texsubimage-layers.c common.c)
+piglit_add_executable(arb_texture_view-texsubimage-levels_gles3 texsubimage-levels.c common.c)
piglit_add_executable(arb_texture_view-texture-immutable-levels_gles3 texture-immutable-levels.c)
diff --git a/tests/spec/arb_texture_view/clear-into-view-2d-array.c b/tests/spec/arb_texture_view/clear-into-view-2d-array.c
index 4ab68b1c5..1628bbf7b 100644
--- a/tests/spec/arb_texture_view/clear-into-view-2d-array.c
+++ b/tests/spec/arb_texture_view/clear-into-view-2d-array.c
@@ -35,6 +35,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -60,7 +61,11 @@ piglit_init(int argc, char **argv)
int i, j;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
/* build a 2d array texture; no mip levels */
glGenTextures(1, &tex);
diff --git a/tests/spec/arb_texture_view/clear-into-view-2d.c b/tests/spec/arb_texture_view/clear-into-view-2d.c
index cdb605972..d03323a5d 100644
--- a/tests/spec/arb_texture_view/clear-into-view-2d.c
+++ b/tests/spec/arb_texture_view/clear-into-view-2d.c
@@ -35,6 +35,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -59,7 +60,11 @@ piglit_init(int argc, char **argv)
int i, j;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
/* build a 2d array texture; no mip levels */
glGenTextures(1, &tex);
diff --git a/tests/spec/arb_texture_view/clear-into-view-layered.c b/tests/spec/arb_texture_view/clear-into-view-layered.c
index b134d7d44..895c71adf 100644
--- a/tests/spec/arb_texture_view/clear-into-view-layered.c
+++ b/tests/spec/arb_texture_view/clear-into-view-layered.c
@@ -35,6 +35,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32; /* for layered rendering */
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -59,7 +60,11 @@ piglit_init(int argc, char **argv)
int i, j;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
/* build a 2d array texture; no mip levels */
glGenTextures(1, &tex);
diff --git a/tests/spec/arb_texture_view/copytexsubimage-layers.c b/tests/spec/arb_texture_view/copytexsubimage-layers.c
index 7d374fc0e..f19520741 100644
--- a/tests/spec/arb_texture_view/copytexsubimage-layers.c
+++ b/tests/spec/arb_texture_view/copytexsubimage-layers.c
@@ -35,6 +35,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -59,8 +60,12 @@ piglit_init(int argc, char **argv)
int i, j;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_storage");
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
/* build a 2d array texture; no mip levels */
glGenTextures(1, &tex);
diff --git a/tests/spec/arb_texture_view/texsubimage-layers.c b/tests/spec/arb_texture_view/texsubimage-layers.c
index e7304e387..d9204e045 100644
--- a/tests/spec/arb_texture_view/texsubimage-layers.c
+++ b/tests/spec/arb_texture_view/texsubimage-layers.c
@@ -35,6 +35,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -60,7 +61,11 @@ piglit_init(int argc, char **argv)
bool use_pbo = false;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
for (i = 1; i < argc; ++i) {
if (strcmp(argv[i], "pbo") == 0) {
diff --git a/tests/spec/arb_texture_view/texsubimage-levels.c b/tests/spec/arb_texture_view/texsubimage-levels.c
index d98640924..b67b9412f 100644
--- a/tests/spec/arb_texture_view/texsubimage-levels.c
+++ b/tests/spec/arb_texture_view/texsubimage-levels.c
@@ -36,6 +36,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 15;
+ config.supports_gl_es_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -61,7 +62,11 @@ piglit_init(int argc, char **argv)
bool use_pbo = false;
bool pass = true;
+#ifdef PIGLIT_USE_OPENGL
piglit_require_extension("GL_ARB_texture_view");
+#else
+ piglit_require_extension("GL_OES_texture_view");
+#endif
for (i = 1; i < argc; ++i) {
if (strcmp(argv[i], "pbo") == 0) {
--
2.14.3
More information about the Piglit
mailing list