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
4a9da034
Commit
4a9da034
authored
Sep 26, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly pass gl_info to state_init_default().
parent
abbc595f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
device.c
dlls/wined3d/device.c
+2
-2
stateblock.c
dlls/wined3d/stateblock.c
+2
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/device.c
View file @
4a9da034
...
...
@@ -4710,7 +4710,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
if
(
FAILED
(
hr
=
state_init
(
&
device
->
state
,
&
device
->
fb
,
&
device
->
adapter
->
d3d_info
)))
ERR
(
"Failed to initialize device state, hr %#x.
\n
"
,
hr
);
state_init_default
(
&
device
->
state
,
device
);
state_init_default
(
&
device
->
state
,
&
device
->
adapter
->
gl_info
);
device
->
update_state
=
&
device
->
state
;
device_init_swapchain_state
(
device
,
swapchain
);
...
...
@@ -4982,7 +4982,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
wined3d_decref
(
device
->
wined3d
);
return
hr
;
}
state_init_default
(
&
device
->
state
,
device
);
state_init_default
(
&
device
->
state
,
&
adapter
->
gl_info
);
device
->
update_state
=
&
device
->
state
;
return
WINED3D_OK
;
...
...
dlls/wined3d/stateblock.c
View file @
4a9da034
...
...
@@ -1171,9 +1171,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
TRACE
(
"Applied stateblock %p.
\n
"
,
stateblock
);
}
void
state_init_default
(
struct
wined3d_state
*
state
,
struct
wined3d_device
*
device
)
void
state_init_default
(
struct
wined3d_state
*
state
,
const
struct
wined3d_gl_info
*
gl_info
)
{
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
union
{
struct
wined3d_line_pattern
lp
;
...
...
@@ -1192,7 +1191,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
1
.
0
f
,
}}};
TRACE
(
"state %p,
device %p.
\n
"
,
state
,
device
);
TRACE
(
"state %p,
gl_info %p.
\n
"
,
state
,
gl_info
);
/* Set some of the defaults for lights, transforms etc */
state
->
transforms
[
WINED3D_TS_PROJECTION
]
=
identity
;
...
...
dlls/wined3d/wined3d_private.h
View file @
4a9da034
...
...
@@ -2449,7 +2449,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DEC
void
state_cleanup
(
struct
wined3d_state
*
state
)
DECLSPEC_HIDDEN
;
HRESULT
state_init
(
struct
wined3d_state
*
state
,
struct
wined3d_fb_state
*
fb
,
const
struct
wined3d_d3d_info
*
d3d_info
)
DECLSPEC_HIDDEN
;
void
state_init_default
(
struct
wined3d_state
*
state
,
struct
wined3d_device
*
device
)
DECLSPEC_HIDDEN
;
void
state_init_default
(
struct
wined3d_state
*
state
,
const
struct
wined3d_gl_info
*
gl_info
)
DECLSPEC_HIDDEN
;
void
state_unbind_resources
(
struct
wined3d_state
*
state
)
DECLSPEC_HIDDEN
;
/* Direct3D terminology with little modifications. We do not have an issued state
...
...
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