[Scummvm-git-logs] scummvm master -> 5d58b7768ca30d46515207de2548044698199724

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3f38f6c500 SDL: Improve CPU detection with older SDL versions
5d58b7768c BACKENDS: Remove leftover code


Commit: 3f38f6c5000bf2e07f9b5473bef2e791ecaa9e86
    https://github.com/scummvm/scummvm/commit/3f38f6c5000bf2e07f9b5473bef2e791ecaa9e86
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2023-08-14T00:40:42+02:00

Commit Message:
SDL: Improve CPU detection with older SDL versions

Changed paths:
    backends/platform/sdl/macosx/macosx.cpp
    backends/platform/sdl/ps3/ps3.cpp
    backends/platform/sdl/sdl.cpp


diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index b0e68f62ec4..165efc2db20 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -148,11 +148,6 @@ bool OSystem_MacOSX::hasFeature(Feature f) {
 		return true;
 #endif
 
-#if defined(__VEC__) || defined(__VEC) // PowerPC Altivec extensions
-	if (f == kFeatureCpuAltivec)
-		return true;
-#endif
-
 	return OSystem_POSIX::hasFeature(f);
 }
 
diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp
index fbeb43b9f1d..0f7653e3511 100644
--- a/backends/platform/sdl/ps3/ps3.cpp
+++ b/backends/platform/sdl/ps3/ps3.cpp
@@ -133,7 +133,5 @@ bool OSystem_PS3::hasFeature(Feature f) {
 		return false;
 	}
 
-	if (f == kFeatureCpuAltivec) return true;
-
 	return OSystem_SDL::hasFeature(f);
 }
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 4b06e6d26ba..35a02a1e01f 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -173,13 +173,19 @@ void OSystem_SDL::init() {
 }
 
 bool OSystem_SDL::hasFeature(Feature f) {
+#if SDL_VERSION_ATLEAST(1, 2, 7)
+	if (f == kFeatureCpuSSE2) return SDL_HasSSE2();
+	if (f == kFeatureCpuAltivec) return SDL_HasAltiVec();
+#endif
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	if (f == kFeatureClipboardSupport) return true;
-	if (f == kFeatureCpuSSE2) return SDL_HasSSE2();
-	if (f == kFeatureCpuNEON) return SDL_HasNEON();
 	if (f == kFeatureCpuSSE41) return SDL_HasSSE41();
+#endif
+#if SDL_VERSION_ATLEAST(2, 0, 4)
 	if (f == kFeatureCpuAVX2) return SDL_HasAVX2();
-	if (f == kFeatureCpuAltivec) return SDL_HasAltiVec();
+#endif
+#if SDL_VERSION_ATLEAST(2, 0, 6)
+	if (f == kFeatureCpuNEON) return SDL_HasNEON();
 #endif
 #if SDL_VERSION_ATLEAST(2, 0, 14)
 	if (f == kFeatureOpenUrl) return true;


Commit: 5d58b7768ca30d46515207de2548044698199724
    https://github.com/scummvm/scummvm/commit/5d58b7768ca30d46515207de2548044698199724
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2023-08-14T00:40:42+02:00

Commit Message:
BACKENDS: Remove leftover code

Changed paths:
    backends/base-backend.cpp
    backends/base-backend.h
    backends/modular-backend.cpp
    test/null_osystem.cpp


diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 2aef2842489..1cb38fffecb 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -67,10 +67,6 @@ void BaseBackend::initBackend() {
 	OSystem::initBackend();
 }
 
-bool BaseBackend::hasFeature(Feature f) {
-	return false;
-}
-
 void BaseBackend::fillScreen(uint32 col) {
 	Graphics::Surface *screen = lockScreen();
 	if (screen)
diff --git a/backends/base-backend.h b/backends/base-backend.h
index 45bf2af43cd..36cab351686 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -32,7 +32,6 @@
 class BaseBackend : public OSystem {
 public:
 	void initBackend() override;
-	bool hasFeature(Feature f) override;
 
 	using OSystem::setScaler;
 	bool setScaler(const char *name, int factor) override final;
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index 8c814301d1d..e5b85c1485b 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -41,7 +41,6 @@ ModularGraphicsBackend::~ModularGraphicsBackend() {
 }
 
 bool ModularGraphicsBackend::hasFeature(Feature f) {
-	if (BaseBackend::hasFeature(f)) return true;
 	return _graphicsManager->hasFeature(f);
 }
 
diff --git a/test/null_osystem.cpp b/test/null_osystem.cpp
index 54078d1446e..6f1d0540109 100644
--- a/test/null_osystem.cpp
+++ b/test/null_osystem.cpp
@@ -18,10 +18,6 @@ void BaseBackend::initBackend() {
 	OSystem::initBackend();
 }
 
-bool BaseBackend::hasFeature(OSystem::Feature f) {
-	return false;
-}
-
 void BaseBackend::fillScreen(uint32 col) {
 }