Henri Verbeet : wined3d: Get rid of the "opengl" field in struct wined3d_adapter.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Jan 17 10:24:29 2013 +0100

wined3d: Get rid of the "opengl" field in struct wined3d_adapter.

---

dlls/wined3d/device.c          |    2 +-
 dlls/wined3d/directx.c         |    4 +---
 dlls/wined3d/wined3d_private.h |    2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 491c224..40ffe66 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1188,7 +1188,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,

if (device->d3d_initialized)
         return WINED3DERR_INVALIDCALL;
-    if (!device->adapter->opengl)
+    if (device->wined3d->flags & WINED3D_NO3D)
         return WINED3DERR_INVALIDCALL;

device->valid_rt_mask = 0;
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e5b7f33..b8fba57 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5137,8 +5137,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
                                         WINEDDSCAPS_VISIBLE;
     caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT;

-    /* Set D3D caps if OpenGL is available. */
-    if (adapter->opengl)
+    if (!(wined3d->flags & WINED3D_NO3D))
     {
         caps->ddraw_caps.dds_caps |=    WINEDDSCAPS_3DDEVICE                |
                                         WINEDDSCAPS_MIPMAP                  |
@@ -5601,7 +5600,6 @@ static BOOL InitAdapters(struct wined3d *wined3d)

select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode);
         fillGLAttribFuncs(&adapter->gl_info);
-        adapter->opengl = TRUE;
     }
     wined3d->adapter_count = 1;
     TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ed777e5..af5ad2f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1569,8 +1569,6 @@ struct wined3d_driver_info
 struct wined3d_adapter
 {
     UINT ordinal;
-    BOOL                    opengl;
-
     POINT monitorPoint;
     enum wined3d_format_id screen_format;