- xr_input.c/h: an OpenXR action set (aim pose, trigger/select click, a menu-toggle button) plus ray/quad hit-testing, and a visible laser-pointer line drawn from the controller toward the hit point. - xr_menu.c/h + MenuOverlay.java: a second composition-layer quad, toggled by a controller button, showing an off-screen, never-attached Android View tree (one "Keyboard" button so far) driven by synthetic touch events computed from the laser ray's hit UV. - Migrate gl4es from a prebuilt binary baked into the Docker build-image to a vendored source snapshot (android/gl4es-src/) compiled from source at APK build time via CMake add_subdirectory(), patched through a new android/gl4es-patches/ (mirrors the existing engine-patches/ pattern). This was needed to track down and fix a bug hit while building the menu: gl4es's fixed-pipeline emulation (fpe.c) was unconditionally substituting its own shader onto the menu's draw call (fpe_ReleventState() always sets alphafunc to a nonzero sentinel, so its fpe_IsEmpty() check could never see the state as empty), making the menu quad show the game's own rendering instead of its own content. Fixed by routing the menu's blit through a real glBlitFramebuffer() call instead of a shader-based draw, which gl4es's fpe.c has nothing to intercept - documented in README.md's new "Debugging notes" section. - Renumber android/engine-patches/ to close the gap left by removing an unrelated diagnostic-only patch, and strip investigation-journal comments and dead diagnostic code (temporary tracing, env-var probes) left over from finding the bug above. - Restructure README.md into numbered sections, document every engine/gl4es patch, add Android Studio dev/testing-cycle instructions, and generalize Quest-specific wording to any OpenXR headset. Update NOTICE.txt to match (gl4es is now vendored/patched source, not a prebuilt binary; add the OpenXR-SDK loader).
This commit is contained in:
ml
Executable
+41
@@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# WARNING: do not execute this file unless you are aware of what you're doing.
|
||||
# This file is meant to be executed by ctest.
|
||||
|
||||
export LIBGL_FB=3
|
||||
export LIBGL_SILENTSTUB=1
|
||||
export LIBGL_NOBANNER=1
|
||||
export LIBGL_NOERROR=1
|
||||
|
||||
tar xf ../traces/$1.tgz
|
||||
apitrace dump-images --calls="$2" $1.trace >/dev/null
|
||||
exit_status=$?
|
||||
test $exit_status -ne 0 && echo "Test returned a non-zero status $exit_status (segmentation fault?)"
|
||||
rm $1.trace
|
||||
|
||||
if [[ -f $1.$2.png ]]
|
||||
then
|
||||
mv $1.$2.png $1.$2.$LIBGL_ES.png
|
||||
|
||||
EXTRACT=""
|
||||
if [[ ! -z "$4" ]]
|
||||
then
|
||||
EXTRACT="-extract $4"
|
||||
fi
|
||||
result=$(compare -metric AE -fuzz 20% $EXTRACT ../refs/$1.$2.png $1.$2.$LIBGL_ES.png diff_$1_GLES$LIBGL_ES.png 2>&1)
|
||||
|
||||
if [[ ! "$result" -lt "$3" ]]
|
||||
then
|
||||
echo -n "$result pixels of difference"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[[ -e diff_$1_GLES$LIBGL_ES.png ]] && rm diff_$1_GLES$LIBGL_ES.png
|
||||
[[ -e $1.$2.$LIBGL_ES.png ]] && rm $1.$2.$LIBGL_ES.png
|
||||
else
|
||||
echo -n "Failed to get snapshot"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Executable
+198
@@ -0,0 +1,198 @@
|
||||
#!/bin/bash
|
||||
|
||||
function clean_tests {
|
||||
#glxgears
|
||||
if [ -e glxgears.0000008203.png ];then
|
||||
rm glxgears.0000008203.png
|
||||
fi
|
||||
if [ -e glxgears.trace ];then
|
||||
rm glxgears.trace
|
||||
fi
|
||||
#stunt car racer
|
||||
if [ -e stuntcarracer.0000118817.png ];then
|
||||
rm stuntcarracer.0000118817.png
|
||||
fi
|
||||
if [ -e stuntcarracer.trace ];then
|
||||
rm stuntcarracer.trace
|
||||
fi
|
||||
#neverball
|
||||
if [ -e neverball.0000078750.png ];then
|
||||
rm neverball.0000078750.png
|
||||
fi
|
||||
if [ -e neverball.trace ];then
|
||||
rm neverball.trace
|
||||
fi
|
||||
#foobillardplus
|
||||
if [ -e foobillardplus.0000014748.png ];then
|
||||
rm foobillardplus.0000014748.png
|
||||
fi
|
||||
if [ -e foobillardplus.trace ];then
|
||||
rm foobillardplus.trace
|
||||
fi
|
||||
#openra
|
||||
if [ -e openra.0000031249.png ];then
|
||||
rm openra.0000031249.png
|
||||
fi
|
||||
if [ -e openra.trace ];then
|
||||
rm openra.trace
|
||||
fi
|
||||
#glsl_lighting
|
||||
if [ -e glsl_lighting.0000505393.png ];then
|
||||
rm glsl_lighting.0000505393.png
|
||||
fi
|
||||
if [ -e glsl_lighting.trace ];then
|
||||
rm glsl_lighting.trace
|
||||
fi
|
||||
#pointsprite
|
||||
if [ -e pointsprite.0000248810.png ];then
|
||||
rm pointsprite.0000248810.png
|
||||
fi
|
||||
if [ -e pointsprite.trace ];then
|
||||
rm pointsprite.trace
|
||||
fi
|
||||
#diff result
|
||||
if [ -e diff.png ];then
|
||||
rm diff.png
|
||||
fi
|
||||
}
|
||||
|
||||
export OK=1
|
||||
function launch_test {
|
||||
tar xf ../traces/$1.tgz
|
||||
if [ "$BENCH" = "1" ];then
|
||||
glretrace -b $1.trace
|
||||
else
|
||||
apitrace dump-images --calls="$2" $1.trace
|
||||
EXTRACT=""
|
||||
if [ ! -z "$4" ];then
|
||||
EXTRACT="-extract $4"
|
||||
fi
|
||||
result=$(compare -metric AE -fuzz 20% $EXTRACT ../refs/$1.$2.png $1.$2.png diff.png 2>&1)
|
||||
if [ ! "$result" -lt "$3" ];then
|
||||
popd >/dev/null
|
||||
echo "error, $result pixels diff"
|
||||
export OK=0
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
function banner {
|
||||
echo
|
||||
echo " ******************* "
|
||||
if [ "$BENCH" = "1" ];then
|
||||
echo " Bench $1 "
|
||||
else
|
||||
echo " $1 "
|
||||
fi
|
||||
echo " ------------------- "
|
||||
}
|
||||
|
||||
export BENCH=0
|
||||
if [ "$1" = "-b" ];then
|
||||
BENCH=1
|
||||
shift
|
||||
fi
|
||||
if [ "$2" = "-b" ];then
|
||||
BENCH=1
|
||||
fi
|
||||
|
||||
if [ ! -z "$1" ];then
|
||||
export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
|
||||
fi
|
||||
|
||||
if [ ! "$BENCH" = "1" ];then
|
||||
export LIBGL_FB=3
|
||||
fi
|
||||
export LIBGL_SILENTSTUB=1
|
||||
export LIBGL_NOBANNER=1
|
||||
|
||||
TESTS=`dirname "$0"`
|
||||
|
||||
pushd "$TESTS" >/dev/null
|
||||
|
||||
clean_tests
|
||||
|
||||
export LIBGL_ES=1
|
||||
|
||||
banner "GLES1.1: glxgears"
|
||||
launch_test glxgears 0000008203 25
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES1.1: StuntCarRacer"
|
||||
launch_test stuntcarracer 0000118817 20 638x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES1.1: Neverball"
|
||||
launch_test neverball 0000078750 20 798x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES1.1: Foobillard Plus"
|
||||
launch_test foobillardplus 0000014748 20 798x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES1.1: Point Sprite"
|
||||
launch_test pointsprite 0000248810 20
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export LIBGL_ES=2
|
||||
|
||||
banner "GLES2.0: OpenRA"
|
||||
launch_test openra 0000031249 20 638x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: glsl_lighting"
|
||||
launch_test glsl_lighting 0000505393 20
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: glxgears"
|
||||
# Because FlatShaded mode is not supported, the image is more different.
|
||||
launch_test glxgears 0000008203 700
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: StuntCarRacer"
|
||||
launch_test stuntcarracer 0000118817 20 638x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: Neverball"
|
||||
launch_test neverball 0000078750 200 798x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: Foobillard Plus"
|
||||
launch_test foobillardplus 0000014748 50 798x478+1+1
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
banner "GLES2.0: Point Sprite"
|
||||
launch_test pointsprite 0000248810 20
|
||||
if [ $OK = 0 ];then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# cleanup
|
||||
clean_tests
|
||||
|
||||
popd >/dev/null
|
||||
echo " ================= "
|
||||
echo "All done"
|
||||
exit 0
|
||||
Reference in New Issue
Block a user