Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
73c6355d
Commit
73c6355d
authored
15 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
d3d10core: Add a wined3d geoemtry shader to struct d3d10_geometry_shader.
parent
41401fb8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/d3d10core/d3d10core_private.h
+5
-1
5 additions, 1 deletion
dlls/d3d10core/d3d10core_private.h
dlls/d3d10core/device.c
+2
-1
2 additions, 1 deletion
dlls/d3d10core/device.c
dlls/d3d10core/shader.c
+36
-2
36 additions, 2 deletions
dlls/d3d10core/shader.c
with
43 additions
and
4 deletions
dlls/d3d10core/d3d10core_private.h
+
5
−
1
View file @
73c6355d
...
...
@@ -168,9 +168,13 @@ struct d3d10_geometry_shader
{
const
struct
ID3D10GeometryShaderVtbl
*
vtbl
;
LONG
refcount
;
IWineD3DGeometryShader
*
wined3d_shader
;
struct
wined3d_shader_signature
output_signature
;
};
HRESULT
d3d10_geometry_shader_init
(
struct
d3d10_geometry_shader
*
shader
);
HRESULT
d3d10_geometry_shader_init
(
struct
d3d10_geometry_shader
*
shader
,
struct
d3d10_device
*
device
,
const
void
*
byte_code
,
SIZE_T
byte_code_length
)
DECLSPEC_HIDDEN
;
/* ID3D10PixelShader */
struct
d3d10_pixel_shader
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d10core/device.c
+
2
−
1
View file @
73c6355d
...
...
@@ -848,6 +848,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i
static
HRESULT
STDMETHODCALLTYPE
d3d10_device_CreateGeometryShader
(
ID3D10Device
*
iface
,
const
void
*
byte_code
,
SIZE_T
byte_code_length
,
ID3D10GeometryShader
**
shader
)
{
struct
d3d10_device
*
This
=
(
struct
d3d10_device
*
)
iface
;
struct
d3d10_geometry_shader
*
object
;
HRESULT
hr
;
...
...
@@ -861,7 +862,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device
return
E_OUTOFMEMORY
;
}
hr
=
d3d10_geometry_shader_init
(
object
);
hr
=
d3d10_geometry_shader_init
(
object
,
This
,
byte_code
,
byte_code_length
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize geometry shader, hr %#x.
\n
"
,
hr
);
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d10core/shader.c
+
36
−
2
View file @
73c6355d
...
...
@@ -313,7 +313,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade
if
(
!
refcount
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
IWineD3DGeometryShader_Release
(
This
->
wined3d_shader
);
}
return
refcount
;
...
...
@@ -365,11 +365,45 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =
d3d10_geometry_shader_SetPrivateDataInterface
,
};
HRESULT
d3d10_geometry_shader_in
it
(
struct
d3d10_geometry_shader
*
shader
)
static
void
STDMETHODCALLTYPE
d3d10_geometry_shader_
w
in
ed3d_object_destroyed
(
void
*
parent
)
{
struct
d3d10_geometry_shader
*
shader
=
parent
;
shader_free_signature
(
&
shader
->
output_signature
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
);
}
static
const
struct
wined3d_parent_ops
d3d10_geometry_shader_wined3d_parent_ops
=
{
d3d10_geometry_shader_wined3d_object_destroyed
,
};
HRESULT
d3d10_geometry_shader_init
(
struct
d3d10_geometry_shader
*
shader
,
struct
d3d10_device
*
device
,
const
void
*
byte_code
,
SIZE_T
byte_code_length
)
{
struct
d3d10_shader_info
shader_info
;
HRESULT
hr
;
shader
->
vtbl
=
&
d3d10_geometry_shader_vtbl
;
shader
->
refcount
=
1
;
shader_info
.
output_signature
=
&
shader
->
output_signature
;
hr
=
shader_extract_from_dxbc
(
byte_code
,
byte_code_length
,
&
shader_info
);
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to extract shader, hr %#x.
\n
"
,
hr
);
return
hr
;
}
hr
=
IWineD3DDevice_CreateGeometryShader
(
device
->
wined3d_device
,
shader_info
.
shader_code
,
&
shader
->
output_signature
,
&
shader
->
wined3d_shader
,
(
IUnknown
*
)
shader
,
&
d3d10_geometry_shader_wined3d_parent_ops
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create wined3d vertex shader, hr %#x.
\n
"
,
hr
);
shader_free_signature
(
&
shader
->
output_signature
);
return
hr
;
}
return
S_OK
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment