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
6c818165
Commit
6c818165
authored
May 27, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 27, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
ec8f304b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
device.c
dlls/d3d11/device.c
+4
-7
No files found.
dlls/d3d11/device.c
View file @
6c818165
...
...
@@ -3520,13 +3520,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp
iface
,
byte_code
,
byte_code_length
,
so_entries
,
entry_count
,
buffer_strides
,
strides_count
,
rasterizer_stream
,
class_linkage
,
shader
);
*
shader
=
NULL
;
if
(
class_linkage
)
FIXME
(
"Class linkage is not implemented yet.
\n
"
);
if
(
FAILED
(
hr
=
d3d_geometry_shader_create
(
device
,
byte_code
,
byte_code_length
,
so_entries
,
entry_count
,
buffer_strides
,
strides_count
,
rasterizer_stream
,
&
object
)))
{
*
shader
=
NULL
;
return
hr
;
}
...
...
@@ -6226,10 +6227,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp
iface
,
byte_code
,
byte_code_length
,
output_stream_decls
,
output_stream_decl_count
,
output_stream_stride
,
shader
);
*
shader
=
NULL
;
if
(
!
output_stream_decl_count
&&
output_stream_stride
)
{
WARN
(
"Stride must be 0 when declaration entry count is 0.
\n
"
);
*
shader
=
NULL
;
return
E_INVALIDARG
;
}
...
...
@@ -6237,7 +6239,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp
&&
!
(
so_entries
=
heap_calloc
(
output_stream_decl_count
,
sizeof
(
*
so_entries
))))
{
ERR
(
"Failed to allocate D3D11 SO declaration array memory.
\n
"
);
*
shader
=
NULL
;
return
E_OUTOFMEMORY
;
}
...
...
@@ -6257,7 +6258,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp
{
WARN
(
"Stride must be 0 when multiple output slots are used.
\n
"
);
heap_free
(
so_entries
);
*
shader
=
NULL
;
return
E_INVALIDARG
;
}
}
...
...
@@ -6267,10 +6267,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp
so_entries
,
output_stream_decl_count
,
&
output_stream_stride
,
stride_count
,
0
,
&
object
);
heap_free
(
so_entries
);
if
(
FAILED
(
hr
))
{
*
shader
=
NULL
;
return
hr
;
}
*
shader
=
&
object
->
ID3D10GeometryShader_iface
;
...
...
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