ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Henri Verbeet 2013-01-17 10:24:29 +01:00 committed by Alexandre Julliard
parent 1249976eb6
commit 6c7cce55a7
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -1188,7 +1188,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
if (device->d3d_initialized) if (device->d3d_initialized)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
if (!device->adapter->opengl) if (device->wined3d->flags & WINED3D_NO3D)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
device->valid_rt_mask = 0; device->valid_rt_mask = 0;

4
dlls/wined3d/directx.c
View File

@ -5137,8 +5137,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDSCAPS_VISIBLE; WINEDDSCAPS_VISIBLE;
caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT;
/* Set D3D caps if OpenGL is available. */ if (!(wined3d->flags & WINED3D_NO3D))
if (adapter->opengl)
{ {
caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE |
WINEDDSCAPS_MIPMAP | WINEDDSCAPS_MIPMAP |
@ -5601,7 +5600,6 @@ static BOOL InitAdapters(struct wined3d *wined3d)
select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode);
fillGLAttribFuncs(&adapter->gl_info); fillGLAttribFuncs(&adapter->gl_info);
adapter->opengl = TRUE;
} }
wined3d->adapter_count = 1; wined3d->adapter_count = 1;
TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count);

2
dlls/wined3d/wined3d_private.h
View File

@ -1569,8 +1569,6 @@ struct wined3d_driver_info
struct wined3d_adapter struct wined3d_adapter
{ {
UINT ordinal; UINT ordinal;
BOOL opengl;
POINT monitorPoint; POINT monitorPoint;
enum wined3d_format_id screen_format; enum wined3d_format_id screen_format;