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
2c1968ae
Commit
2c1968ae
authored
Jul 23, 2012
by
Józef Kucia
Committed by
Alexandre Julliard
Jul 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Allow D3DX_DEFAULT to be passed as srclevel to D3DXFilterTexture.
parent
39bc0bcf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
texture.c
dlls/d3dx9_36/tests/texture.c
+3
-0
texture.c
dlls/d3dx9_36/texture.c
+3
-1
No files found.
dlls/d3dx9_36/tests/texture.c
View file @
2c1968ae
...
...
@@ -758,6 +758,9 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device)
if
(
SUCCEEDED
(
hr
))
{
hr
=
D3DXFilterTexture
((
IDirect3DBaseTexture9
*
)
tex
,
NULL
,
D3DX_DEFAULT
,
D3DX_FILTER_NONE
);
ok
(
hr
==
D3D_OK
,
"D3DXFilterTexture returned %#x, expected %#x
\n
"
,
hr
,
D3D_OK
);
hr
=
D3DXFilterTexture
((
IDirect3DBaseTexture9
*
)
tex
,
NULL
,
0
,
D3DX_FILTER_NONE
);
ok
(
hr
==
D3D_OK
,
"D3DXFilterTexture returned %#x, expected %#x
\n
"
,
hr
,
D3D_OK
);
...
...
dlls/d3dx9_36/texture.c
View file @
2c1968ae
...
...
@@ -78,7 +78,9 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture,
if
((
filter
&
0xFFFF
)
>
D3DX_FILTER_BOX
&&
filter
!=
D3DX_DEFAULT
)
return
D3DERR_INVALIDCALL
;
if
(
srclevel
>=
IDirect3DBaseTexture9_GetLevelCount
(
texture
))
if
(
srclevel
==
D3DX_DEFAULT
)
srclevel
=
0
;
else
if
(
srclevel
>=
IDirect3DBaseTexture9_GetLevelCount
(
texture
))
return
D3DERR_INVALIDCALL
;
switch
(
type
=
IDirect3DBaseTexture9_GetType
(
texture
))
...
...
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