summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-11-30 09:29:48 -0800
committerBrad Kittenbrink <brad@lindenlab.com>2022-11-30 09:29:48 -0800
commit0d58d3ee7a4196f31d45dd5a466a452d887a6968 (patch)
tree244d5e5b1eb39f3ac43a43e6e1bf052192791764 /indra/llwindow/llwindow.h
parente9db970b677719d85c0ca28d1577ee3f7b995801 (diff)
parentc99c24939a18b5aa6c29af189a1d91f254c8b5a2 (diff)
Merge remote-tracking branch 'origin/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r--indra/llwindow/llwindow.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 2c538a60c9..862897a48c 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -302,7 +302,10 @@ public:
BOOL enable_vsync = FALSE,
BOOL use_gl = TRUE,
BOOL ignore_pixel_depth = FALSE,
- U32 fsaa_samples = 0);
+ U32 fsaa_samples = 0,
+ U32 max_cores = 0,
+ U32 max_vram = 0,
+ F32 max_gl_version = 4.6f);
static BOOL destroyWindow(LLWindow* window);
static BOOL isWindowValid(LLWindow *window);
};