OpenGL Clean up

Author: drops

src/Layers/xrRenderPC_GL/gl_rendertarget_u_set_rt.cpp

@@ -114,9 +114,7 @@ void CRenderTarget::u_setrtzb(CBackend& cmd_list, const ref_rt& _1, const ref_rt
     else
         cmd_list.unset_ZB();
 
-
-    [[maybe_unused]] GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    VERIFY(status == GL_FRAMEBUFFER_COMPLETE);
+    VERIFY(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
     CHK_GL(glDrawBuffers(3, buffers));
 }
 } // namespace xray::render::RENDER_NAMESPACE

src/Layers/xrRender_R2/r2.cpp

@@ -421,14 +421,15 @@ void CRender::create()
     o.msaa_hybrid = ps_r2_ls_flags.test((u32)R3FLAG_USE_DX10_1);
     o.msaa_hybrid &= !o.msaa_opt && o.msaa && (HW.FeatureLevel >= D3D_FEATURE_LEVEL_10_1);
 #elif defined(USE_OGL)
-    // TODO: OGL: temporary disabled, need to fix it
-    o.msaa = true;
-    o.msaa_samples = 4;
+    o.msaa_samples = (1 << ps_r3_msaa);
+    o.msaa = o.msaa_samples > 1;
 
     if (!o.msaa) o.msaa_samples = 0;
     // Important! DX10 related, for OpenGL same as o.msaa
     // It's messing with shader predefines
     o.msaa_opt = o.msaa;
+    // DX related ?
+    o.gbuffer_opt = true;
     // Important! DX10 related, for OpenGL always false
     o.msaa_hybrid = false;
 #else

src/Layers/xrRender_R2/r3_rendertarget_phase_scene.cpp

@@ -21,11 +21,13 @@ void CRenderTarget::phase_scene_prepare()
     if (RImplementation.o.advancedpp && (ps_r2_ls_flags.test(R2FLAG_SOFT_PARTICLES | R2FLAG_DOF) ||
                                             ((ps_r_sun_shafts > 0) && (fValue >= 0.0001)) || (ps_r_ssao > 0)))
     {
+#ifdef USE_DX11
         //	TODO: DX11: Check if we need to set RT here.
-#ifdef USE_OGL
-        u_setrtzb(RCache, rt_Position,rt_MSAADepth);
-#else
         u_setrt(RCache, Device.dwWidth, Device.dwHeight, rt_Position->pRT, 0, 0, rt_MSAADepth);
+#else
+        /* TODO investigate: it should be rt_Normal and (maybe) rt_Color
+         * rt_Position should be always single-sampled */
+        u_setrtzb(RCache, rt_Position,rt_MSAADepth);
 #endif
 
         const Fcolor color{}; // black
@@ -64,24 +66,27 @@ void CRenderTarget::phase_scene_prepare()
 void CRenderTarget::phase_scene_begin()
 {
     // Targets, use accumulator for temporary storage
-    if (!RImplementation.o.gbuffer_opt)
-    {
-        auto& _3 = RImplementation.o.albedo_wo ? rt_Accumulator : rt_Color;
 #ifdef USE_OGL
-        u_setrtzb(RCache, rt_Position, rt_Normal, _3, rt_MSAADepth);
+    // TODO Investigate should be color always
+    auto& _2 = RImplementation.o.albedo_wo ? rt_Accumulator : rt_Color;
+    u_setrtzb(RCache, rt_Position, _2, rt_MSAADepth);
 #else
-        u_setrt(RCache, rt_Position, rt_Normal, _3, rt_MSAADepth);
-#endif
+    if (!RImplementation.o.gbuffer_opt)
+    {
+        if (RImplementation.o.albedo_wo)
+            u_setrt(RCache, rt_Position, rt_Normal, rt_Accumulator, rt_MSAADepth);
+        else
+            u_setrt(RCache, rt_Position, rt_Normal, rt_Color, rt_MSAADepth);
     }
     else
     {
-        auto& _2 = RImplementation.o.albedo_wo ? rt_Accumulator : rt_Color;
-#ifdef USE_OGL
-        u_setrtzb(RCache, rt_Position, _2, rt_MSAADepth);
-#else
-        u_setrt(RCache, rt_Position, _2, nullptr, rt_MSAADepth);
-#endif
+        if (RImplementation.o.albedo_wo)
+            u_setrt(RCache, rt_Position, rt_Accumulator, rt_MSAADepth);
+        else
+            u_setrt(RCache, rt_Position, rt_Color, rt_MSAADepth);
+        // else								u_setrt		(rt_Position,	rt_Color, rt_Normal,		rt_MSAADepth);
     }
+#endif
 
     // Stencil - write 0x1 at pixel pos
     RCache.set_Stencil(