Henri Verbeet : wined3d: Ignore "always_offscreen" for ORM_BACKBUFFER in context_create().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Nov 18 22:23:25 2015 +0100

wined3d: Ignore "always_offscreen" for ORM_BACKBUFFER in context_create().

ORM_BACKBUFFER uses the backbuffer for off-screen rendering.

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

---

 dlls/wined3d/context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 80a9ba7..0e8b32b 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1565,7 +1565,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
      * Using the same format regardless of the color/depth/stencil targets
      * makes it much less likely that different wined3d instances will set
      * conflicting pixel formats. */
-    if (wined3d_settings.always_offscreen)
+    if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER
+            && wined3d_settings.always_offscreen)
     {
         color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM);
         ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN);