mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 06:11:34 +00:00
Code Issues Releases Wiki Activity

put back version check; make apple the center of the softwareDecompression world because they can not have nice things

Browse source
This commit is contained in:
Bret Curtis 2022-08-02 15:10:13 +02:00
parent 231d60995b
commit 57d519f26d
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -407,7 +407,7 @@ if(NOT HAVE_STDINT_H)
endif() endif()
if(OPENMW_USE_SYSTEM_OSG) if(OPENMW_USE_SYSTEM_OSG)
find_package(OpenSceneGraph 3.6.5 REQUIRED ${USED_OSG_COMPONENTS}) find_package(OpenSceneGraph 3.6.5 REQUIRED ${USED_OSG_COMPONENTS}) # Bump to 3.6.6 when released
if(OSG_STATIC) if(OSG_STATIC)
find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS}) find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})

12
components/sdlutil/sdlcursormanager.cpp
View file

@ -1,7 +1,6 @@
#include "sdlcursormanager.hpp" #include "sdlcursormanager.hpp"
#include <stdexcept> #include <stdexcept>
#include <cstdlib>
#include <SDL_mouse.h> #include <SDL_mouse.h>
#include <SDL_endian.h> #include <SDL_endian.h>
@ -12,13 +11,14 @@
#include <osg/Geometry> #include <osg/Geometry>
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/TexMat> #include <osg/TexMat>
#include <osg/Version>
#include <osgViewer/GraphicsWindow> #include <osgViewer/GraphicsWindow>
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include "imagetosurface.hpp" #include "imagetosurface.hpp"
#if defined(OSG_LIBRARY_STATIC) && !defined(ANDROID) #if defined(OSG_LIBRARY_STATIC) && (!defined(ANDROID) || OSG_VERSION_GREATER_THAN(3, 6, 5))
// Sets the default windowing system interface according to the OS. // Sets the default windowing system interface according to the OS.
// Necessary for OpenSceneGraph to do some things, like decompression. // Necessary for OpenSceneGraph to do some things, like decompression.
USE_GRAPHICSWINDOW() USE_GRAPHICSWINDOW()
@ -26,7 +26,11 @@ USE_GRAPHICSWINDOW()
namespace CursorDecompression namespace CursorDecompression
{ {
static const bool DXTCSupported = true; #if defined(__APPLE__) // Workaround macOS not supporting hardware DXTC decompression
constexpr bool softwareDecompression = true;
#else
constexpr bool softwareDecompression = false;
#endif
class MyGraphicsContext { class MyGraphicsContext {
public: public:
@ -263,7 +267,7 @@ namespace SDLUtil
static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr); static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
SurfaceUniquePtr (*decompressionFunction)(osg::ref_ptr<osg::Image>, float); SurfaceUniquePtr (*decompressionFunction)(osg::ref_ptr<osg::Image>, float);
if (forceSoftwareDecompression || CursorDecompression::DXTCSupported) { if (forceSoftwareDecompression || CursorDecompression::softwareDecompression) {
decompressionFunction = CursorDecompression::softwareDecompress; decompressionFunction = CursorDecompression::softwareDecompress;
} else { } else {
decompressionFunction = CursorDecompression::hardwareDecompress; decompressionFunction = CursorDecompression::hardwareDecompress;