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
dfe8b779
Commit
dfe8b779
authored
Mar 08, 2017
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Abort on invalid instructions in shader_get_registers_used().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
df6540ed
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
d3d9ex.c
dlls/d3d9/tests/d3d9ex.c
+1
-1
device.c
dlls/d3d9/tests/device.c
+1
-1
shader.c
dlls/wined3d/shader.c
+2
-2
No files found.
dlls/d3d9/tests/d3d9ex.c
View file @
dfe8b779
...
...
@@ -2429,7 +2429,7 @@ static void test_unsupported_shaders(void)
hr
=
IDirect3DDevice9Ex_CreatePixelShader
(
device
,
ps_3_224
,
&
ps
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
hr
=
IDirect3DDevice9Ex_CreatePixelShader
(
device
,
ps_2_0_boolint
,
&
ps
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
if
(
ps
)
IDirect3DPixelShader9_Release
(
ps
);
...
...
dlls/d3d9/tests/device.c
View file @
dfe8b779
...
...
@@ -6528,7 +6528,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET
hr
=
IDirect3DDevice9_CreatePixelShader
(
device
,
ps_3_224
,
&
ps
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
hr
=
IDirect3DDevice9_CreatePixelShader
(
device
,
ps_2_0_boolint
,
&
ps
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x.
\n
"
,
hr
);
if
(
ps
)
IDirect3DPixelShader9_Release
(
ps
);
...
...
dlls/wined3d/shader.c
View file @
dfe8b779
...
...
@@ -933,8 +933,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
/* Unhandled opcode, and its parameters. */
if
(
ins
.
handler_idx
==
WINED3DSIH_TABLE_SIZE
)
{
TRACE
(
"Skipping unrecognize
d instruction.
\n
"
);
continue
;
WARN
(
"Encountered unrecognised or invali
d instruction.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
/* Handle declarations. */
...
...
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