3d_apps: update the default window mode to full-screen DRM
PATCH 1/1 3d_apps: update the default window mode to full-screen DRM
The nullWS (Raw) applications are replaced with the DRM ones because the Mesa-based EGL does not support nullDRM window system, the GBM(DRM) window system should be used instead.
We also replace X11 with Wayland because X11 is no longer supported and is replaced with Wayland.
Signed-off-by Eric Ruei <[email protected]>
--- 3d_apps/3d_chameleon/runOGLES2ChameleonMan.sh | 8 ++++---- 3d_apps/3d_coverflow/runOGLES2Coverflow.sh | 8 ++++---- 3d_apps/3d_exampleui/runOGLES2ExampleUI.sh | 8 ++++---- 3d_apps/3d_film/runOGLESFilmTV.sh | 10 +++++----- 3d_apps/3d_lantern/runOGLES2MagicLantern.sh | 8 ++++---- 3d_apps/3d_navigation/runOGLES2Navigation.sh | 8 ++++---- 3d_apps/3d_shaders/runOGLES2Shaders.sh | 8 ++++---- 3d_apps/3d_skull/runOGLESEvilSkull.sh | 8 ++++---- 3d_apps/3d_vase/runOGLESVase.sh | 8 ++++---- 9 files changed, 37 insertions(+), 37 deletions(-) mode change 100755 => 100644 3d_apps/3d_film/runOGLESFilmTV.sh mode change 100755 => 100644 3d_apps/3d_lantern/runOGLES2MagicLantern.sh mode change 100755 => 100644 3d_apps/3d_skull/runOGLESEvilSkull.sh
3d_apps/3d_chameleon/runOGLES2ChameleonMan.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2ChameleonMan" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_coverflow/runOGLES2Coverflow.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2Coverflow" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_exampleui/runOGLES2ExampleUI.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2ExampleUI" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_film/runOGLESFilmTV.sh +5 -5
@@ -1,15 +1,15 @@ #!/bin/sh OGLESDIR="" -OGLESAPP="OGLESFilmTV" +OGLESAPP="OGLES2FilmTV" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_lantern/runOGLES2MagicLantern.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2MagicLantern" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_navigation/runOGLES2Navigation.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2Navigation" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_shaders/runOGLES2Shaders.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLES2Shaders" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_skull/runOGLESEvilSkull.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLESEvilSkull" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
3d_apps/3d_vase/runOGLESVase.sh +4 -4
@@ -3,13 +3,13 @@ OGLESDIR="" OGLESAPP="OGLESVase" -#Check if DISPLAY is set. If so we assume we are running in X11 -#and will call the X11 version of the demos if they exist. +#Check if DISPLAY is set. If so we assume we are running in WAYLAND +#and will call the Wayland version of the demos if they exist. if [ "$DISPLAY" == "" ] then - OGLESDIR="/usr/bin/SGX/demos/Raw" + OGLESDIR="/usr/bin/SGX/demos/DRM" else - OGLESDIR="/usr/bin/SGX/demos/X11" + OGLESDIR="/usr/bin/SGX/demos/Wayland" fi if [ -e "$OGLESDIR/$OGLESAPP" ]
Signature · 1 line
2.17.1