From 3604edc27eedff24dc1f17624a77c130b498e9f1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 10 May 2022 12:20:19 -0400 Subject: SL-17219: LLWindowMacOSX needs getAvailableVRAMMegabytes(). This is just a placeholder, but without it the viewer won't even build on Mac. --- indra/llwindow/llwindow.h | 6 +++--- indra/llwindow/llwindowmacosx.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 507e6076d6..2c538a60c9 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -162,9 +162,9 @@ public: virtual F32 getNativeAspectRatio() = 0; virtual F32 getPixelAspectRatio() = 0; virtual void setNativeAspectRatio(F32 aspect) = 0; - - // query VRAM usage - virtual U32 getAvailableVRAMMegabytes() = 0; + + // query VRAM usage + virtual U32 getAvailableVRAMMegabytes() = 0; virtual void beforeDialog() {}; // prepare to put up an OS dialog (if special measures are required, such as in fullscreen mode) virtual void afterDialog() {}; // undo whatever was done in beforeDialog() diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index b0f339e1db..309d1377ea 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -100,6 +100,10 @@ public: F32 getPixelAspectRatio() override; void setNativeAspectRatio(F32 ratio) override { mOverrideAspectRatio = ratio; } + // query VRAM usage + // FIXME FIXME + virtual U32 getAvailableVRAMMegabytes() override { return 0; } + void beforeDialog() override; void afterDialog() override; -- cgit v1.2.3