diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-30 09:29:48 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-30 09:29:48 -0800 |
| commit | 0d58d3ee7a4196f31d45dd5a466a452d887a6968 (patch) | |
| tree | 244d5e5b1eb39f3ac43a43e6e1bf052192791764 /indra/llwindow/llwindow.cpp | |
| parent | e9db970b677719d85c0ca28d1577ee3f7b995801 (diff) | |
| parent | c99c24939a18b5aa6c29af189a1d91f254c8b5a2 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index f4678a70c5..66be3efffc 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -406,7 +406,10 @@ LLWindow* LLWindowManager::createWindow( BOOL enable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, - U32 fsaa_samples) + U32 fsaa_samples, + U32 max_cores, + U32 max_vram, + F32 max_gl_version) { LLWindow* new_window; @@ -423,7 +426,7 @@ LLWindow* LLWindowManager::createWindow( #elif LL_WINDOWS new_window = new LLWindowWin32(callbacks, title, name, x, y, width, height, flags, - fullscreen, clearBg, enable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); + fullscreen, clearBg, enable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, max_cores, max_vram, max_gl_version); #elif LL_DARWIN new_window = new LLWindowMacOSX(callbacks, title, name, x, y, width, height, flags, |