Henri Verbeet : wined3d: Clarify the status of ORM_BACKBUFFER.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f8b0d9d0afdb2b9dec3fea5a63de47230af40ea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f8b0d9d0afdb2b9dec3fea5a6...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun May 21 17:53:41 2017 +0200

wined3d: Clarify the status of ORM_BACKBUFFER.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/directx.c      |  4 ++++
 dlls/wined3d/wined3d_main.c | 16 +++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 535ea7d..4115453 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -6547,6 +6547,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal,
         return FALSE;
     }
 
+    if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER)
+        ERR_(winediag)("You are using the backbuffer for offscreen rendering. "
+                "This is unsupported, and will be removed in a future version.\n");
+
     wined3d_adapter_init_fb_cfgs(adapter, caps_gl_ctx.dc);
     /* We haven't found any suitable formats. This should only happen in
      * case of GDI software rendering, which is pretty useless anyway. */
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 8f5da3c..9ff2c9c 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -231,19 +231,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
                 wined3d_settings.glslRequested = FALSE;
             }
         }
-        if ( !get_config_key( hkey, appkey, "OffscreenRenderingMode", buffer, size) )
-        {
-            if (!strcmp(buffer,"backbuffer"))
-            {
-                ERR_(winediag)("Using the backbuffer for offscreen rendering.\n");
-                wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER;
-            }
-            else if (!strcmp(buffer,"fbo"))
-            {
-                TRACE("Using FBOs for offscreen rendering\n");
-                wined3d_settings.offscreen_rendering_mode = ORM_FBO;
-            }
-        }
+        if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size)
+                && !strcmp(buffer,"backbuffer"))
+            wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER;
         if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) )
         {
             int pci_device_id = tmpvalue;