[mutter] cogl: Stop running non-NPOT tests
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Stop running non-NPOT tests
- Date: Thu, 18 Apr 2019 19:05:40 +0000 (UTC)
commit 249f9a4a2ef2654fa8a05f590ee462483e9e1751
Author: Adam Jackson <ajax redhat com>
Date: Thu Mar 28 14:57:36 2019 -0400
cogl: Stop running non-NPOT tests
The minimum GL/GLES versions require working NPOT textures.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
cogl/tests/run-tests.sh | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/cogl/tests/run-tests.sh b/cogl/tests/run-tests.sh
index 7caa2bcb3..7b11a5e4d 100755
--- a/cogl/tests/run-tests.sh
+++ b/cogl/tests/run-tests.sh
@@ -92,12 +92,12 @@ TITLE_FORMAT="%35s"
printf "$TITLE_FORMAT" "Test"
if test "$HAVE_GL" -eq 1; then
- GL_FORMAT=" %6s %8s %7s %6s %6s"
- printf "$GL_FORMAT" "GL+GLSL" "GL-NPT" "GL3"
+ GL_FORMAT=" %6s %8s %7s %6s"
+ printf "$GL_FORMAT" "GL+GLSL" "GL3"
fi
if test "$HAVE_GLES2" -eq 1; then
- GLES2_FORMAT=" %6s %7s"
- printf "$GLES2_FORMAT" "ES2" "ES2-NPT"
+ GLES2_FORMAT=" %6s"
+ printf "$GLES2_FORMAT" "ES2"
fi
echo ""
@@ -124,10 +124,6 @@ do
export COGL_DEBUG=disable-fixed,disable-arbfp
run_test "$test" gl_glsl
- export COGL_DRIVER=gl
- export COGL_DEBUG=disable-npot-textures
- run_test "$test" gl_npot
-
export COGL_DRIVER=gl3
export COGL_DEBUG=
run_test "$test" gl3
@@ -137,23 +133,17 @@ do
export COGL_DRIVER=gles2
export COGL_DEBUG=
run_test "$test" gles2
-
- export COGL_DRIVER=gles2
- export COGL_DEBUG=disable-npot-textures
- run_test "$test" gles2_npot
fi
printf $TITLE_FORMAT "$test:"
if test "$HAVE_GL" -eq 1; then
printf "$GL_FORMAT" \
"$(get_status "$gl_glsl_result")" \
- "$(get_status "$gl_npot_result")" \
"$(get_status "$gl3_result")"
fi
if test "$HAVE_GLES2" -eq 1; then
printf "$GLES2_FORMAT" \
- "$(get_status "$gles2_result")" \
- "$(get_status "$gles2_npot_result")"
+ "$(get_status "$gles2_result")"
fi
echo ""
done
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]