summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp4
-rw-r--r--indra/llwindow/llwindowsdl.cpp4
-rw-r--r--indra/llwindow/llwindowsdl.h4
-rw-r--r--indra/newview/llappviewer.cpp10
4 files changed, 15 insertions, 7 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 2d19e3df90..e0b3f6ef56 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -36,7 +36,7 @@
#ifndef LL_USESYSTEMLIBS
extern LLControlGroup gSavedSettings;
#endif
-#if LL_DARWIN && !LL_SDL
+#if LL_DARWIN
extern BOOL gHiDPISupport;
#endif
@@ -370,7 +370,7 @@ void LLPluginClassMedia::setSizeInternal(void)
mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight);
}
-#if LL_DARWIN && !LL_SDL
+#if LL_DARWIN
if (!gHiDPISupport)
#endif
{
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index e3af20c090..b982f4e290 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -68,6 +68,8 @@ static bool ATIbug = false;
#if LL_DARWIN
+BOOL gHiDPISupport = TRUE;
+
namespace
{
struct NativeKeyEventData {
@@ -91,6 +93,8 @@ namespace
// LLWindowMacOSX
//
+BOOL LLWindowSDL::sUseMultGL = FALSE;
+
#endif
//
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 86e238282b..ce9ac44076 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -152,6 +152,10 @@ public:
static Display* get_SDL_Display(void);
#endif // LL_X11
+#if LL_DARWIN
+ static BOOL sUseMultGL;
+#endif
+
protected:
LLWindowSDL(LLWindowCallbacks* callbacks,
const std::string& title, int x, int y, int width, int height, U32 flags,
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 777fc4c3a7..5d23f5b784 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -139,7 +139,7 @@
//#endif // LL_LINUX
#if LL_DARWIN
-#include "llwindowmacosx.h"
+#include "llwindowsdl.h"
#endif
// Third party library includes
@@ -288,7 +288,7 @@ extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
extern BOOL gDebugGL;
-#if LL_DARWIN && !LL_SDL
+#if LL_DARWIN
extern BOOL gHiDPISupport;
#endif
@@ -568,8 +568,8 @@ static void settings_to_globals()
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale"));
-#if LL_DARWIN && !LL_SDL
- LLWindowMacOSX::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL");
+#if LL_DARWIN
+ LLWindowSDL::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL");
gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI");
#endif
}
@@ -3315,7 +3315,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled";
info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory");
-#if LL_DARWIN && !LL_SDL
+#if LL_DARWIN
info["HIDPI"] = gHiDPISupport;
#endif