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
f9562007
Commit
f9562007
authored
Apr 18, 2018
by
Matteo Bruni
Committed by
Alexandre Julliard
Apr 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Allow passes argument to Begin() to be NULL.
Signed-off-by:
Matteo Bruni
<
mbruni@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7a50abd8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
effect.c
dlls/d3dx9_36/effect.c
+3
-2
effect.c
dlls/d3dx9_36/tests/effect.c
+1
-1
No files found.
dlls/d3dx9_36/effect.c
View file @
f9562007
...
...
@@ -4202,7 +4202,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW
TRACE
(
"iface %p, passes %p, flags %#x.
\n
"
,
iface
,
passes
,
flags
);
if
(
passes
&&
technique
)
if
(
technique
)
{
if
(
flags
&
~
(
D3DXFX_DONOTSAVESTATE
|
D3DXFX_DONOTSAVESAMPLERSTATE
|
D3DXFX_DONOTSAVESHADERSTATE
))
WARN
(
"Invalid flags (%#x) specified.
\n
"
,
flags
);
...
...
@@ -4234,7 +4234,8 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW
ERR
(
"StateBlock Capture failed, hr %#x.
\n
"
,
hr
);
}
*
passes
=
technique
->
pass_count
;
if
(
passes
)
*
passes
=
technique
->
pass_count
;
effect
->
started
=
TRUE
;
effect
->
begin_flags
=
flags
;
...
...
dlls/d3dx9_36/tests/effect.c
View file @
f9562007
...
...
@@ -3081,7 +3081,7 @@ static void test_effect_states(IDirect3DDevice9 *device)
ok
(
!
bval
,
"Got result %u, expected 0.
\n
"
,
bval
);
hr
=
IDirect3DDevice9_SetTransform
(
device
,
D3DTS_WORLDMATRIX
(
1
),
&
test_mat
);
hr
=
effect
->
lpVtbl
->
Begin
(
effect
,
&
npasses
,
0
);
hr
=
effect
->
lpVtbl
->
Begin
(
effect
,
NULL
,
0
);
ok
(
hr
==
D3D_OK
,
"Got result %x, expected 0 (D3D_OK).
\n
"
,
hr
);
hr
=
IDirect3DDevice9_GetTransform
(
device
,
D3DTS_WORLDMATRIX
(
1
),
&
mat
);
...
...
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