EngineAPI: Make the OpenGL renderer the fourth renderer.

This fixes the issue where the OpenGL renderer doesn't load if the DX10/11 backends are not available.
OpenXRay · Dec 7, 2015 · d7380e1 · d7380e1
1 parent 87de9e7
commit d7380e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -296,11 +296,11 @@ void CEngineAPI::CreateRendererList()
             if (!bSupports_r2_5)
                 bBreakLoop = true;
             break;
-        case 4: //"renderer_r_dx10"
+        case 5: //"renderer_r_dx10"
             if (!bSupports_r3)
                 bBreakLoop = true;
             break;
-        case 5: //"renderer_r_dx11"
+        case 6: //"renderer_r_dx11"
             if (!bSupports_r4)
                 bBreakLoop = true;
             break;
@@ -327,19 +327,19 @@ void CEngineAPI::CreateRendererList()
             val = "renderer_r2.5";
             break;
         case 4:
+            val = "renderer_gl";
+            break;
+        case 5:
             val = "renderer_r3";
             break; // -)
-        case 5:
+        case 6:
             val = "renderer_r4";
             break; // -)
         }
         if (bBreakLoop) break;
         _tmp.back() = xr_strdup(val);
     }
 
-    if (bSupports_gl)
-        _tmp.push_back("renderer_gl");
-
     u32 _cnt = _tmp.size() + 1;
     vid_quality_token = xr_alloc<xr_token>(_cnt);
 

diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp
@@ -565,9 +565,9 @@ class CCC_r2 : public CCC_Token
         // 1..3 - r2
         // 4 - r3
         psDeviceFlags.set(rsR2, ((renderer_value > 0) && renderer_value < 4));
-        psDeviceFlags.set(rsR3, (renderer_value == 4));
-        psDeviceFlags.set(rsR4, (renderer_value == 5));
-        psDeviceFlags.set(rsGL, (renderer_value >= 6));
+        psDeviceFlags.set(rsGL, (renderer_value == 4));
+        psDeviceFlags.set(rsR3, (renderer_value == 5));
+        psDeviceFlags.set(rsR4, (renderer_value == 6));
 
         r2_sun_static = (renderer_value < 2);