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
eb83a7c9
Commit
eb83a7c9
authored
Feb 09, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of wined3d_get_draw_rect().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
96432c4c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
15 deletions
+4
-15
cs.c
dlls/wined3d/cs.c
+4
-4
utils.c
dlls/wined3d/utils.c
+0
-10
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/cs.c
View file @
eb83a7c9
...
...
@@ -501,14 +501,11 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw
static
void
wined3d_cs_exec_clear
(
struct
wined3d_cs
*
cs
,
const
void
*
data
)
{
const
struct
wined3d_state
*
state
=
&
cs
->
state
;
const
struct
wined3d_cs_clear
*
op
=
data
;
struct
wined3d_device
*
device
;
unsigned
int
i
;
RECT
draw_rect
;
device
=
cs
->
device
;
wined3d_get_draw_rect
(
state
,
&
draw_rect
);
device
->
blitter
->
ops
->
blitter_clear
(
device
->
blitter
,
device
,
op
->
rt_count
,
op
->
fb
,
op
->
rect_count
,
op
->
rects
,
&
op
->
draw_rect
,
op
->
flags
,
&
op
->
color
,
op
->
depth
,
op
->
stencil
);
...
...
@@ -529,6 +526,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *
{
unsigned
int
rt_count
=
cs
->
device
->
adapter
->
gl_info
.
limits
.
buffers
;
const
struct
wined3d_state
*
state
=
&
cs
->
device
->
state
;
const
struct
wined3d_viewport
*
vp
=
&
state
->
viewport
;
struct
wined3d_cs_clear
*
op
;
unsigned
int
i
;
...
...
@@ -538,7 +536,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *
op
->
flags
=
flags
;
op
->
rt_count
=
rt_count
;
op
->
fb
=
&
cs
->
fb
;
wined3d_get_draw_rect
(
state
,
&
op
->
draw_rect
);
SetRect
(
&
op
->
draw_rect
,
vp
->
x
,
vp
->
y
,
vp
->
x
+
vp
->
width
,
vp
->
y
+
vp
->
height
);
if
(
state
->
render_states
[
WINED3D_RS_SCISSORTESTENABLE
])
IntersectRect
(
&
op
->
draw_rect
,
&
op
->
draw_rect
,
&
state
->
scissor_rect
);
op
->
color
=
*
color
;
op
->
depth
=
depth
;
op
->
stencil
=
stencil
;
...
...
dlls/wined3d/utils.c
View file @
eb83a7c9
...
...
@@ -5990,16 +5990,6 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb
return
memcmp
(
ka
,
kb
,
sizeof
(
*
ka
));
}
void
wined3d_get_draw_rect
(
const
struct
wined3d_state
*
state
,
RECT
*
rect
)
{
const
struct
wined3d_viewport
*
vp
=
&
state
->
viewport
;
SetRect
(
rect
,
vp
->
x
,
vp
->
y
,
vp
->
x
+
vp
->
width
,
vp
->
y
+
vp
->
height
);
if
(
state
->
render_states
[
WINED3D_RS_SCISSORTESTENABLE
])
IntersectRect
(
rect
,
rect
,
&
state
->
scissor_rect
);
}
const
char
*
wined3d_debug_location
(
DWORD
location
)
{
const
char
*
prefix
=
""
;
...
...
dlls/wined3d/wined3d_private.h
View file @
eb83a7c9
...
...
@@ -2695,7 +2695,6 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
const
struct
ffp_frag_desc
*
find_ffp_frag_shader
(
const
struct
wine_rb_tree
*
fragment_shaders
,
const
struct
ffp_frag_settings
*
settings
)
DECLSPEC_HIDDEN
;
void
add_ffp_frag_shader
(
struct
wine_rb_tree
*
shaders
,
struct
ffp_frag_desc
*
desc
)
DECLSPEC_HIDDEN
;
void
wined3d_get_draw_rect
(
const
struct
wined3d_state
*
state
,
RECT
*
rect
)
DECLSPEC_HIDDEN
;
void
wined3d_ftoa
(
float
value
,
char
*
s
)
DECLSPEC_HIDDEN
;
extern
const
float
wined3d_srgb_const0
[]
DECLSPEC_HIDDEN
;
...
...
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