viewer#3088 Add graphical init and reinit

akleshchev · akleshchev · commit 3839d3d3c24d · 2025-01-03T19:12:30.000+02:00
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
@@ -1304,8 +1304,7 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
     catch (...)
     {
         LOG_UNHANDLED_EXCEPTION("ChoosePixelFormat");
-        OSMessageBox(mCallbacks->translateString("MBPixelFmtErr"),
-            mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1316,8 +1315,7 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
     if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
         &pfd))
     {
-        OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"),
-            mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtDescErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1355,25 +1353,22 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
 
     if (!SetPixelFormat(mhDC, pixel_format, &pfd))
     {
-        OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),
-            mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtSetErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
 
 
     if (!(mhRC = SafeCreateContext(mhDC)))
     {
-        OSMessageBox(mCallbacks->translateString("MBGLContextErr"),
-            mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
 
     if (!wglMakeCurrent(mhDC, mhRC))
     {
-        OSMessageBox(mCallbacks->translateString("MBGLContextActErr"),
-            mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextActErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1579,15 +1574,14 @@ const   S32   max_format  = (S32)num_formats - 1;
 
         if (!mhDC)
         {
-            OSMessageBox(mCallbacks->translateString("MBDevContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+            LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBDevContextErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
             close();
             return false;
         }
 
         if (!SetPixelFormat(mhDC, pixel_format, &pfd))
         {
-            OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),
-                mCallbacks->translateString("MBError"), OSMB_OK);
+            LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtSetErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
             close();
             return false;
         }
@@ -1619,7 +1613,7 @@ const   S32   max_format  = (S32)num_formats - 1;
     {
         LL_WARNS("Window") << "No wgl_ARB_pixel_format extension!" << LL_ENDL;
         // cannot proceed without wgl_ARB_pixel_format extension, shutdown same as any other gGLManager.initGL() failure
-        OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBVideoDrvErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1628,7 +1622,7 @@ const   S32   max_format  = (S32)num_formats - 1;
     if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
         &pfd))
     {
-        OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtDescErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1650,14 +1644,14 @@ const   S32   max_format  = (S32)num_formats - 1;
 
     if (!wglMakeCurrent(mhDC, mhRC))
     {
-        OSMessageBox(mCallbacks->translateString("MBGLContextActErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextActErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
 
     if (!gGLManager.initGL())
     {
-        OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBVideoDrvErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
         close();
         return false;
     }
@@ -1865,7 +1859,7 @@ void* LLWindowWin32::createSharedContext()
     if (!rc && !(rc = wglCreateContext(mhDC)))
     {
         close();
-        OSMessageBox(mCallbacks->translateString("MBGLContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);
+        LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextErr"), 8/*LAST_EXEC_GRAPHICS_INIT*/);
     }
 
     return rc;
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
@@ -2670,6 +2670,7 @@ bool LLAppViewer::initConfiguration()
         OSMessageBox(
             "Unable to load default settings file. The installation may be corrupted.",
             LLStringUtil::null,OSMB_OK);
+        LLAppViewer::instance()->createErrorMarker(LAST_EXEC_MISSING_FILES);
         return false;
     }
 
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
@@ -76,6 +76,7 @@ typedef enum
     LAST_EXEC_LOGOUT_CRASH,
     LAST_EXEC_BAD_ALLOC,
     LAST_EXEC_MISSING_FILES,
+    LAST_EXEC_GRAPHICS_INIT,
     LAST_EXEC_COUNT
 } eLastExecEvent;
 

Original file line number	Diff line number	Diff line change
`@@ -1304,8 +1304,7 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo`
`1304`	`1304`	`catch (...)`
`1305`	`1305`	`{`
`1306`	`1306`	`LOG_UNHANDLED_EXCEPTION("ChoosePixelFormat");`
`1307`		`- OSMessageBox(mCallbacks->translateString("MBPixelFmtErr"),`
`1308`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1307`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1309`	`1308`	`close();`
`1310`	`1309`	`return false;`
`1311`	`1310`	`}`
`@@ -1316,8 +1315,7 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo`
`1316`	`1315`	`if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),`
`1317`	`1316`	`&pfd))`
`1318`	`1317`	`{`
`1319`		`- OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"),`
`1320`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1318`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtDescErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1321`	`1319`	`close();`
`1322`	`1320`	`return false;`
`1323`	`1321`	`}`
`@@ -1355,25 +1353,22 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo`
`1355`	`1353`
`1356`	`1354`	`if (!SetPixelFormat(mhDC, pixel_format, &pfd))`
`1357`	`1355`	`{`
`1358`		`- OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),`
`1359`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1356`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtSetErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1360`	`1357`	`close();`
`1361`	`1358`	`return false;`
`1362`	`1359`	`}`
`1363`	`1360`
`1364`	`1361`
`1365`	`1362`	`if (!(mhRC = SafeCreateContext(mhDC)))`
`1366`	`1363`	`{`
`1367`		`- OSMessageBox(mCallbacks->translateString("MBGLContextErr"),`
`1368`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1364`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1369`	`1365`	`close();`
`1370`	`1366`	`return false;`
`1371`	`1367`	`}`
`1372`	`1368`
`1373`	`1369`	`if (!wglMakeCurrent(mhDC, mhRC))`
`1374`	`1370`	`{`
`1375`		`- OSMessageBox(mCallbacks->translateString("MBGLContextActErr"),`
`1376`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1371`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextActErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1377`	`1372`	`close();`
`1378`	`1373`	`return false;`
`1379`	`1374`	`}`
`@@ -1579,15 +1574,14 @@ const S32 max_format = (S32)num_formats - 1;`
`1579`	`1574`
`1580`	`1575`	`if (!mhDC)`
`1581`	`1576`	`{`
`1582`		`- OSMessageBox(mCallbacks->translateString("MBDevContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1577`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBDevContextErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1583`	`1578`	`close();`
`1584`	`1579`	`return false;`
`1585`	`1580`	`}`
`1586`	`1581`
`1587`	`1582`	`if (!SetPixelFormat(mhDC, pixel_format, &pfd))`
`1588`	`1583`	`{`
`1589`		`- OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),`
`1590`		`- mCallbacks->translateString("MBError"), OSMB_OK);`
	`1584`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtSetErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1591`	`1585`	`close();`
`1592`	`1586`	`return false;`
`1593`	`1587`	`}`
`@@ -1619,7 +1613,7 @@ const S32 max_format = (S32)num_formats - 1;`
`1619`	`1613`	`{`
`1620`	`1614`	`LL_WARNS("Window") << "No wgl_ARB_pixel_format extension!" << LL_ENDL;`
`1621`	`1615`	`// cannot proceed without wgl_ARB_pixel_format extension, shutdown same as any other gGLManager.initGL() failure`
`1622`		`- OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1616`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBVideoDrvErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1623`	`1617`	`close();`
`1624`	`1618`	`return false;`
`1625`	`1619`	`}`
`@@ -1628,7 +1622,7 @@ const S32 max_format = (S32)num_formats - 1;`
`1628`	`1622`	`if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),`
`1629`	`1623`	`&pfd))`
`1630`	`1624`	`{`
`1631`		`- OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1625`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBPixelFmtDescErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1632`	`1626`	`close();`
`1633`	`1627`	`return false;`
`1634`	`1628`	`}`
`@@ -1650,14 +1644,14 @@ const S32 max_format = (S32)num_formats - 1;`
`1650`	`1644`
`1651`	`1645`	`if (!wglMakeCurrent(mhDC, mhRC))`
`1652`	`1646`	`{`
`1653`		`- OSMessageBox(mCallbacks->translateString("MBGLContextActErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1647`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextActErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1654`	`1648`	`close();`
`1655`	`1649`	`return false;`
`1656`	`1650`	`}`
`1657`	`1651`
`1658`	`1652`	`if (!gGLManager.initGL())`
`1659`	`1653`	`{`
`1660`		`- OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1654`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBVideoDrvErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1661`	`1655`	`close();`
`1662`	`1656`	`return false;`
`1663`	`1657`	`}`
`@@ -1865,7 +1859,7 @@ void* LLWindowWin32::createSharedContext()`
`1865`	`1859`	`if (!rc && !(rc = wglCreateContext(mhDC)))`
`1866`	`1860`	`{`
`1867`	`1861`	`close();`
`1868`		`- OSMessageBox(mCallbacks->translateString("MBGLContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);`
	`1862`	`+ LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBGLContextErr"), 8/LAST_EXEC_GRAPHICS_INIT/);`
`1869`	`1863`	`}`
`1870`	`1864`
`1871`	`1865`	`return rc;`
Original file line number	Diff line number	Diff line change
`@@ -2670,6 +2670,7 @@ bool LLAppViewer::initConfiguration()`
`2670`	`2670`	`OSMessageBox(`
`2671`	`2671`	`"Unable to load default settings file. The installation may be corrupted.",`
`2672`	`2672`	`LLStringUtil::null,OSMB_OK);`
	`2673`	`+ LLAppViewer::instance()->createErrorMarker(LAST_EXEC_MISSING_FILES);`
`2673`	`2674`	`return false;`
`2674`	`2675`	`}`
`2675`	`2676`