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
906071aa
Commit
906071aa
authored
Sep 25, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 25, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: It's not an error to have a NULL texture bound to a stage.
parent
c64da00d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
device.c
dlls/d3d8/device.c
+17
-7
No files found.
dlls/d3d8/device.c
View file @
906071aa
...
...
@@ -1471,8 +1471,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface
static
HRESULT
WINAPI
IDirect3DDevice8Impl_GetTexture
(
LPDIRECT3DDEVICE8
iface
,
DWORD
Stage
,
IDirect3DBaseTexture8
**
ppTexture
)
{
IDirect3DDevice8Impl
*
This
=
(
IDirect3DDevice8Impl
*
)
iface
;
IWineD3DBaseTexture
*
retTexture
=
NULL
;
HRESULT
rc
=
D3D_OK
;
IWineD3DBaseTexture
*
retTexture
;
HRESULT
hr
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
...
...
@@ -1481,17 +1481,27 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D
}
wined3d_mutex_lock
();
rc
=
IWineD3DDevice_GetTexture
(
This
->
WineD3DDevice
,
Stage
,
&
retTexture
);
if
(
rc
==
D3D_OK
&&
NULL
!=
retTexture
)
{
hr
=
IWineD3DDevice_GetTexture
(
This
->
WineD3DDevice
,
Stage
,
&
retTexture
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to get texture for stage %u, hr %#x.
\n
"
,
Stage
,
hr
);
wined3d_mutex_unlock
();
*
ppTexture
=
NULL
;
return
hr
;
}
if
(
retTexture
)
{
IWineD3DBaseTexture_GetParent
(
retTexture
,
(
IUnknown
**
)
ppTexture
);
IWineD3DBaseTexture_Release
(
retTexture
);
}
else
{
FIXME
(
"Call to get texture (%d) failed (%p)
\n
"
,
Stage
,
retTexture
);
}
else
{
*
ppTexture
=
NULL
;
}
wined3d_mutex_unlock
();
return
rc
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
IDirect3DDevice8Impl_SetTexture
(
LPDIRECT3DDEVICE8
iface
,
DWORD
Stage
,
IDirect3DBaseTexture8
*
pTexture
)
{
...
...
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