Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ae8d9e21
Commit
ae8d9e21
authored
Apr 01, 2010
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Apr 02, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in…
wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls.
parent
ff82e66a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
surface.c
dlls/wined3d/surface.c
+6
-4
No files found.
dlls/wined3d/surface.c
View file @
ae8d9e21
...
...
@@ -3515,12 +3515,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D
/* Uses the hardware to stretch and flip the image */
static
inline
void
fb_copy_to_texture_hwstretch
(
IWineD3DSurfaceImpl
*
This
,
IWineD3DSurface
*
SrcSurface
,
IWineD3DSwapChainImpl
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect_in
,
WINED3DTEXTUREFILTERTYPE
Filter
)
const
RECT
*
src_rect
,
const
RECT
*
dst_rect_in
,
WINED3DTEXTUREFILTERTYPE
Filter
)
{
IWineD3DDeviceImpl
*
myDevice
=
This
->
resource
.
device
;
GLuint
src
,
backup
=
0
;
IWineD3DSurfaceImpl
*
Src
=
(
IWineD3DSurfaceImpl
*
)
SrcSurface
;
IWineD3DSwapChainImpl
*
src_swapchain
=
NULL
;
float
left
,
right
,
top
,
bottom
;
/* Texture coordinates */
UINT
fbwidth
=
Src
->
currentDesc
.
Width
;
UINT
fbheight
=
Src
->
currentDesc
.
Height
;
...
...
@@ -3618,7 +3618,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine
wined3d_gl_min_mip_filter
(
minMipLookup
,
Filter
,
WINED3DTEXF_NONE
));
checkGLcall
(
"glTexParameteri"
);
if
(
!
swapchain
||
(
IWineD3DSurface
*
)
Src
==
swapchain
->
backBuffer
[
0
])
{
IWineD3DSurface_GetContainer
((
IWineD3DSurface
*
)
SrcSurface
,
&
IID_IWineD3DSwapChain
,
(
void
**
)
&
src_swapchain
);
if
(
src_swapchain
)
IWineD3DSwapChain_Release
((
IWineD3DSwapChain
*
)
src_swapchain
);
if
(
!
src_swapchain
||
(
IWineD3DSurface
*
)
Src
==
src_swapchain
->
backBuffer
[
0
])
{
src
=
backup
?
backup
:
Src
->
texture_name
;
}
else
{
glReadBuffer
(
GL_FRONT
);
...
...
@@ -3991,7 +3993,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const
fb_copy_to_texture_direct
(
This
,
SrcSurface
,
&
src_rect
,
&
dst_rect
,
Filter
);
}
else
{
TRACE
(
"Using hardware stretching to flip / stretch the texture
\n
"
);
fb_copy_to_texture_hwstretch
(
This
,
SrcSurface
,
srcSwapchain
,
&
src_rect
,
&
dst_rect
,
Filter
);
fb_copy_to_texture_hwstretch
(
This
,
SrcSurface
,
&
src_rect
,
&
dst_rect
,
Filter
);
}
/* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */
...
...
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