Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
6c7cce55
Commit
6c7cce55
authored
Jan 17, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the "opengl" field in struct wined3d_adapter.
parent
1249976e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
device.c
dlls/wined3d/device.c
+1
-1
directx.c
dlls/wined3d/directx.c
+1
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-2
No files found.
dlls/wined3d/device.c
View file @
6c7cce55
...
...
@@ -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
;
...
...
dlls/wined3d/directx.c
View file @
6c7cce55
...
...
@@ -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
);
...
...
dlls/wined3d/wined3d_private.h
View file @
6c7cce55
...
...
@@ -1569,8 +1569,6 @@ struct wined3d_driver_info
struct
wined3d_adapter
{
UINT
ordinal
;
BOOL
opengl
;
POINT
monitorPoint
;
enum
wined3d_format_id
screen_format
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment