[Scummvm-git-logs] scummvm master -> 55fcf4050ac1102638cd7975677f81ae1a2c2070
spleen1981
noreply at scummvm.org
Mon Jun 2 23:34:49 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
5f690f2e46 LIBRETRO: enable openGL3D feats
55fcf4050a LIBRETRO: BUILD: add shaders to datafiles bundle
Commit: 5f690f2e46bd430657e48cf2e9584188ce7e0a17
https://github.com/scummvm/scummvm/commit/5f690f2e46bd430657e48cf2e9584188ce7e0a17
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-06-03T01:34:22+02:00
Commit Message:
LIBRETRO: enable openGL3D feats
Changed paths:
backends/platform/libretro/src/libretro-graphics-opengl.cpp
diff --git a/backends/platform/libretro/src/libretro-graphics-opengl.cpp b/backends/platform/libretro/src/libretro-graphics-opengl.cpp
index d713fb2c6a3..c7d195c7c63 100644
--- a/backends/platform/libretro/src/libretro-graphics-opengl.cpp
+++ b/backends/platform/libretro/src/libretro-graphics-opengl.cpp
@@ -103,6 +103,12 @@ bool LibretroOpenGLGraphics::hasFeature(OSystem::Feature f) const {
return
#ifdef SCUMMVM_NEON
(f == OSystem::kFeatureCpuNEON) ||
+#endif
+#ifdef USE_OPENGL_GAME
+ (f == OSystem::kFeatureOpenGLForGame) ||
+#endif
+#ifdef USE_OPENGL_SHADERS
+ (f == OSystem::kFeatureShadersForGame) ||
#endif
OpenGL::OpenGLGraphicsManager::hasFeature(f);
}
Commit: 55fcf4050ac1102638cd7975677f81ae1a2c2070
https://github.com/scummvm/scummvm/commit/55fcf4050ac1102638cd7975677f81ae1a2c2070
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-06-03T01:34:40+02:00
Commit Message:
LIBRETRO: BUILD: add shaders to datafiles bundle
Changed paths:
backends/platform/libretro/scripts/bundle_datafiles.sh
diff --git a/backends/platform/libretro/scripts/bundle_datafiles.sh b/backends/platform/libretro/scripts/bundle_datafiles.sh
index a50c9c896eb..d591bfba1fb 100755
--- a/backends/platform/libretro/scripts/bundle_datafiles.sh
+++ b/backends/platform/libretro/scripts/bundle_datafiles.sh
@@ -76,12 +76,14 @@ DATAFILES_LIST_DATA=$(cat "${SCUMMVM_PATH}/dists/engine-data/engine_data.mk" 2>/
DATAFILES_LIST_DATA_BIG=$(cat "${SCUMMVM_PATH}/dists/engine-data/engine_data_big.mk" 2>/dev/null| grep DIST_FILES_LIST | sed "s|DIST_FILES_LIST += \(.*\)|${SCUMMVM_PATH}/\1|g")
DATAFILES_LIST_DATA_CORE=$(cat "${SCUMMVM_PATH}/dists/engine-data/engine_data_core.mk" 2>/dev/null| grep DIST_FILES_LIST | sed "s|DIST_FILES_LIST += \(.*\)|${SCUMMVM_PATH}/\1|g")
SOUNDFONTS_LIST=$(cat "${SCUMMVM_PATH}/dists/scummvm.rc" 2>/dev/null| grep FILE.*dists/soundfonts | sed "s|.*\"\(.*\)\"|${SCUMMVM_PATH}/\1|g")
+SHADERS_LIST=$(cat "${SCUMMVM_PATH}/dists/scummvm.rc" 2>/dev/null| grep FILE.*/shaders/ | sed "s|.*\"\(.*\)\"|${SCUMMVM_PATH}/\1|g")
# Put retrieved data into arrays
set +e
read -a THEME_ARRAY -d '' -r <<< "${THEMES_LIST}"
read -a DATAFILES_ARRAY -d '' -r <<< "$DATAFILES_LIST_DATA $DATAFILES_LIST_DATA_BIG $DATAFILES_LIST_DATA_CORE"
read -a SOUNDFONTS_ARRAY -d '' -r <<< "$SOUNDFONTS_LIST"
+read -a SHADERS_ARRAY -d '' -r <<< "$SHADERS_LIST"
set -e
# Add specific data files
@@ -90,6 +92,7 @@ DATAFILES_ARRAY[${#DATAFILES_ARRAY[@]}]="${SCUMMVM_PATH}"/backends/vkeybd/packs/
# Make sure target folders exist
[ $3 = "bundle" ] && mkdir -p "${TMP_PATH}/${BUNDLE_THEME_DIR}/"
[ $3 = "bundle" ] && mkdir -p "${TMP_PATH}/${BUNDLE_DATAFILES_DIR}/"
+[ $3 = "bundle" ] && mkdir -p "${TMP_PATH}/${BUNDLE_DATAFILES_DIR}/shaders"
count=0
# Process themes
@@ -98,6 +101,7 @@ count=0
# Process datafiles
process_group "$BUNDLE_DATAFILES_DIR" $3 ${DATAFILES_ARRAY[@]}
process_group "$BUNDLE_DATAFILES_DIR" $3 ${SOUNDFONTS_ARRAY[@]}
+ process_group "$BUNDLE_DATAFILES_DIR/shaders" $3 ${SHADERS_ARRAY[@]}
# Process additional local bundle files
if [ -d "$BUNDLE_LOCAL_DATAFILES_DIR" -a ! -z "$(ls -A ${BUNDLE_LOCAL_DATAFILES_DIR} 2>/dev/null)" ] ; then
More information about the Scummvm-git-logs
mailing list