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
7416953e
Commit
7416953e
authored
Nov 23, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 23, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the WINED3DLINEPATTERN typedef.
parent
74345201
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
15 deletions
+20
-15
state.c
dlls/wined3d/state.c
+11
-7
stateblock.c
dlls/wined3d/stateblock.c
+5
-4
wined3d.h
include/wine/wined3d.h
+4
-4
No files found.
dlls/wined3d/state.c
View file @
7416953e
...
...
@@ -1313,20 +1313,24 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d
static
void
state_linepattern
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
{
union
{
DWORD
d
;
WINED3DLINEPATTERN
lp
;
union
{
DWORD
d
;
struct
wined3d_line_pattern
lp
;
}
tmppattern
;
tmppattern
.
d
=
state
->
render_states
[
WINED3DRS_LINEPATTERN
];
TRACE
(
"Line pattern: repeat %d bits %x
\n
"
,
tmppattern
.
lp
.
wRepeatFactor
,
tmppattern
.
lp
.
wLineP
attern
);
TRACE
(
"Line pattern: repeat %d bits %x
.
\n
"
,
tmppattern
.
lp
.
repeat_factor
,
tmppattern
.
lp
.
line_p
attern
);
if
(
tmppattern
.
lp
.
wRepeatFactor
)
{
glLineStipple
(
tmppattern
.
lp
.
wRepeatFactor
,
tmppattern
.
lp
.
wLinePattern
);
if
(
tmppattern
.
lp
.
repeat_factor
)
{
glLineStipple
(
tmppattern
.
lp
.
repeat_factor
,
tmppattern
.
lp
.
line_pattern
);
checkGLcall
(
"glLineStipple(repeat, linepattern)"
);
glEnable
(
GL_LINE_STIPPLE
);
checkGLcall
(
"glEnable(GL_LINE_STIPPLE);"
);
}
else
{
}
else
{
glDisable
(
GL_LINE_STIPPLE
);
checkGLcall
(
"glDisable(GL_LINE_STIPPLE);"
);
}
...
...
dlls/wined3d/stateblock.c
View file @
7416953e
...
...
@@ -1074,8 +1074,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
struct
wined3d_device
*
device
=
stateblock
->
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
wined3d_state
*
state
=
&
stateblock
->
state
;
union
{
WINED3DLINEPATTERN
lp
;
union
{
struct
wined3d_line_pattern
lp
;
DWORD
d
;
}
lp
;
union
{
...
...
@@ -1109,8 +1110,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
state
->
render_states
[
WINED3DRS_ZENABLE
]
=
WINED3DZB_FALSE
;
state
->
render_states
[
WINED3DRS_FILLMODE
]
=
WINED3DFILL_SOLID
;
state
->
render_states
[
WINED3DRS_SHADEMODE
]
=
WINED3DSHADE_GOURAUD
;
lp
.
lp
.
wRepeatF
actor
=
0
;
lp
.
lp
.
wLineP
attern
=
0
;
lp
.
lp
.
repeat_f
actor
=
0
;
lp
.
lp
.
line_p
attern
=
0
;
state
->
render_states
[
WINED3DRS_LINEPATTERN
]
=
lp
.
d
;
state
->
render_states
[
WINED3DRS_ZWRITEENABLE
]
=
TRUE
;
state
->
render_states
[
WINED3DRS_ALPHATESTENABLE
]
=
FALSE
;
...
...
include/wine/wined3d.h
View file @
7416953e
...
...
@@ -1590,11 +1590,11 @@ struct wined3d_gamma_ramp
WORD
blue
[
256
];
};
typedef
struct
_WINED3DLINEPATTERN
struct
wined3d_line_pattern
{
WORD
wRepeatF
actor
;
WORD
wLineP
attern
;
}
WINED3DLINEPATTERN
;
WORD
repeat_f
actor
;
WORD
line_p
attern
;
};
typedef
struct
_WINEDD3DRECTPATCH_INFO
{
...
...
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