Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(264)

Unified Diff: intern/ghost/intern/GHOST_System.cpp

Issue 4961053: Blender Cucumber to Trunk Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Fixes to crashing DDS mipmaps, leaking dyn lights, and some review comments. Created 12 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: intern/ghost/intern/GHOST_System.cpp
===================================================================
--- intern/ghost/intern/GHOST_System.cpp (revision 40024)
+++ intern/ghost/intern/GHOST_System.cpp (working copy)
@@ -137,7 +137,7 @@
GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
- const bool stereoVisual)
+ const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success = GHOST_kFailure;
GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
@@ -149,7 +149,7 @@
success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting);
if (success == GHOST_kSuccess) {
//GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n");
- success = createFullScreenWindow((GHOST_Window**)window, stereoVisual);
+ success = createFullScreenWindow((GHOST_Window**)window, stereoVisual, numOfAASamples);
if (success == GHOST_kSuccess) {
m_windowManager->beginFullScreen(*window, stereoVisual);
}
@@ -331,7 +331,7 @@
}
-GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual)
+GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success;
GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
@@ -345,7 +345,8 @@
0, 0, settings.xPixels, settings.yPixels,
GHOST_kWindowStateFullScreen,
GHOST_kDrawingContextTypeOpenGL,
- stereoVisual);
+ stereoVisual,
+ numOfAASamples);
success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess;
}
return success;

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b