brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Stop running non-NPOT tests

Browse Source 
The minimum GL/GLES versions require working NPOT textures.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
This commit is contained in:
Adam Jackson 2019-03-28 14:57:36 -04:00
parent 68166f33d9
commit 249f9a4a2e
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cogl/tests/run-tests.sh
View File

@ -92,12 +92,12 @@ TITLE_FORMAT="%35s"
printf "$TITLE_FORMAT" "Test" printf "$TITLE_FORMAT" "Test"
if test "$HAVE_GL" -eq 1; then if test "$HAVE_GL" -eq 1; then
GL_FORMAT=" %6s %8s %7s %6s %6s" GL_FORMAT=" %6s %8s %7s %6s"
printf "$GL_FORMAT" "GL+GLSL" "GL-NPT" "GL3" printf "$GL_FORMAT" "GL+GLSL" "GL3"
fi fi
if test "$HAVE_GLES2" -eq 1; then if test "$HAVE_GLES2" -eq 1; then
GLES2_FORMAT=" %6s %7s" GLES2_FORMAT=" %6s"
printf "$GLES2_FORMAT" "ES2" "ES2-NPT" printf "$GLES2_FORMAT" "ES2"
fi fi
echo "" echo ""
@ -124,10 +124,6 @@ do
export COGL_DEBUG=disable-fixed,disable-arbfp export COGL_DEBUG=disable-fixed,disable-arbfp
run_test "$test" gl_glsl 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_DRIVER=gl3
export COGL_DEBUG= export COGL_DEBUG=
run_test "$test" gl3 run_test "$test" gl3
@ -137,23 +133,17 @@ do
export COGL_DRIVER=gles2 export COGL_DRIVER=gles2
export COGL_DEBUG= export COGL_DEBUG=
run_test "$test" gles2 run_test "$test" gles2
export COGL_DRIVER=gles2
export COGL_DEBUG=disable-npot-textures
run_test "$test" gles2_npot
fi fi
printf $TITLE_FORMAT "$test:" printf $TITLE_FORMAT "$test:"
if test "$HAVE_GL" -eq 1; then if test "$HAVE_GL" -eq 1; then
printf "$GL_FORMAT" \ printf "$GL_FORMAT" \
"$(get_status "$gl_glsl_result")" \ "$(get_status "$gl_glsl_result")" \
"$(get_status "$gl_npot_result")" \
"$(get_status "$gl3_result")" "$(get_status "$gl3_result")"
fi fi
if test "$HAVE_GLES2" -eq 1; then if test "$HAVE_GLES2" -eq 1; then
printf "$GLES2_FORMAT" \ printf "$GLES2_FORMAT" \
"$(get_status "$gles2_result")" \ "$(get_status "$gles2_result")"
"$(get_status "$gles2_npot_result")"
fi fi
echo "" echo ""
done done