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
e74d1358
Commit
e74d1358
authored
Aug 03, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the unused blit_op parameter to arbfp_blit_surface().
parent
57493fdd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+4
-3
surface.c
dlls/wined3d/surface.c
+1
-4
wined3d_private.h
dlls/wined3d/wined3d_private.h
+3
-3
No files found.
dlls/wined3d/arb_program_shader.c
View file @
e74d1358
...
...
@@ -7208,8 +7208,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win
}
}
HRESULT
arbfp_blit_surface
(
struct
wined3d_device
*
device
,
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
dst_surface
,
const
RECT
*
dst_rect_in
,
enum
wined3d_blit_op
blit_op
,
DWORD
Filter
)
HRESULT
arbfp_blit_surface
(
struct
wined3d_device
*
device
,
DWORD
filter
,
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
dst_surface
,
const
RECT
*
dst_rect_in
)
{
struct
wined3d_context
*
context
;
RECT
dst_rect
=
*
dst_rect_in
;
...
...
@@ -7229,7 +7230,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface
ENTER_GL
();
/* Draw a textured quad */
draw_textured_quad
(
src_surface
,
src_rect
,
&
dst_rect
,
F
ilter
);
draw_textured_quad
(
src_surface
,
src_rect
,
&
dst_rect
,
f
ilter
);
LEAVE_GL
();
...
...
dlls/wined3d/surface.c
View file @
e74d1358
...
...
@@ -5500,10 +5500,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa
src_surface
->
resource
.
format
,
dst_rect
,
dst_surface
->
resource
.
usage
,
dst_surface
->
resource
.
pool
,
dst_surface
->
resource
.
format
))
{
return
arbfp_blit_surface
(
device
,
src_surface
,
src_rect
,
dst_surface
,
dst_rect
,
WINED3D_BLIT_OP_COLOR_BLIT
,
Filter
);
}
return
arbfp_blit_surface
(
device
,
Filter
,
src_surface
,
src_rect
,
dst_surface
,
dst_rect
);
if
(
!
device
->
blitter
->
blit_supported
(
gl_info
,
WINED3D_BLIT_OP_COLOR_BLIT
,
src_rect
,
src_surface
->
resource
.
usage
,
src_surface
->
resource
.
pool
,
src_surface
->
resource
.
format
,
...
...
dlls/wined3d/wined3d_private.h
View file @
e74d1358
...
...
@@ -1218,9 +1218,9 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g
DECLSPEC_HIDDEN
;
/* Temporary blit_shader helper functions */
HRESULT
arbfp_blit_surface
(
struct
wined3d_device
*
device
,
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
dst_surface
,
const
RECT
*
dst_rect_in
,
enum
wined3d_blit_op
blit_op
,
DWORD
Filter
)
DECLSPEC_HIDDEN
;
HRESULT
arbfp_blit_surface
(
struct
wined3d_device
*
device
,
DWORD
filter
,
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
dst_surface
,
const
RECT
*
dst_rect
)
DECLSPEC_HIDDEN
;
struct
wined3d_context
*
context_acquire
(
struct
wined3d_device
*
device
,
struct
wined3d_surface
*
target
)
DECLSPEC_HIDDEN
;
void
context_alloc_event_query
(
struct
wined3d_context
*
context
,
...
...
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