Skip to content

Commit d7380e1

Browse files
committed
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.
1 parent 87de9e7 commit d7380e1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/xrEngine/EngineAPI.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ void CEngineAPI::CreateRendererList()
296296
if (!bSupports_r2_5)
297297
bBreakLoop = true;
298298
break;
299-
case 4: //"renderer_r_dx10"
299+
case 5: //"renderer_r_dx10"
300300
if (!bSupports_r3)
301301
bBreakLoop = true;
302302
break;
303-
case 5: //"renderer_r_dx11"
303+
case 6: //"renderer_r_dx11"
304304
if (!bSupports_r4)
305305
bBreakLoop = true;
306306
break;
@@ -327,19 +327,19 @@ void CEngineAPI::CreateRendererList()
327327
val = "renderer_r2.5";
328328
break;
329329
case 4:
330+
val = "renderer_gl";
331+
break;
332+
case 5:
330333
val = "renderer_r3";
331334
break; // -)
332-
case 5:
335+
case 6:
333336
val = "renderer_r4";
334337
break; // -)
335338
}
336339
if (bBreakLoop) break;
337340
_tmp.back() = xr_strdup(val);
338341
}
339342

340-
if (bSupports_gl)
341-
_tmp.push_back("renderer_gl");
342-
343343
u32 _cnt = _tmp.size() + 1;
344344
vid_quality_token = xr_alloc<xr_token>(_cnt);
345345

src/xrEngine/xr_ioc_cmd.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,9 @@ class CCC_r2 : public CCC_Token
565565
// 1..3 - r2
566566
// 4 - r3
567567
psDeviceFlags.set(rsR2, ((renderer_value > 0) && renderer_value < 4));
568-
psDeviceFlags.set(rsR3, (renderer_value == 4));
569-
psDeviceFlags.set(rsR4, (renderer_value == 5));
570-
psDeviceFlags.set(rsGL, (renderer_value >= 6));
568+
psDeviceFlags.set(rsGL, (renderer_value == 4));
569+
psDeviceFlags.set(rsR3, (renderer_value == 5));
570+
psDeviceFlags.set(rsR4, (renderer_value == 6));
571571

572572
r2_sun_static = (renderer_value < 2);
573573

0 commit comments

Comments
 (0)