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
482e5f58
Commit
482e5f58
authored
Sep 17, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_device_VSGetShaderResources().
parent
ab7a7071
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
1 deletion
+46
-1
device.c
dlls/d3d10core/device.c
+20
-1
device.c
dlls/wined3d/device.c
+14
-0
view.c
dlls/wined3d/view.c
+7
-0
wined3d.spec
dlls/wined3d/wined3d.spec
+2
-0
wined3d.h
include/wine/wined3d.h
+3
-0
No files found.
dlls/d3d10core/device.c
View file @
482e5f58
...
...
@@ -881,8 +881,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1
static
void
STDMETHODCALLTYPE
d3d10_device_VSGetShaderResources
(
ID3D10Device1
*
iface
,
UINT
start_slot
,
UINT
view_count
,
ID3D10ShaderResourceView
**
views
)
{
FIXME
(
"iface %p, start_slot %u, view_count %u, views %p stub!
\n
"
,
struct
d3d10_device
*
device
=
impl_from_ID3D10Device
(
iface
);
unsigned
int
i
;
TRACE
(
"iface %p, start_slot %u, view_count %u, views %p.
\n
"
,
iface
,
start_slot
,
view_count
,
views
);
for
(
i
=
0
;
i
<
view_count
;
++
i
)
{
struct
wined3d_shader_resource_view
*
wined3d_view
;
struct
d3d10_shader_resource_view
*
view_impl
;
if
(
!
(
wined3d_view
=
wined3d_device_get_vs_resource_view
(
device
->
wined3d_device
,
start_slot
+
i
)))
{
views
[
i
]
=
NULL
;
continue
;
}
view_impl
=
wined3d_shader_resource_view_get_parent
(
wined3d_view
);
views
[
i
]
=
&
view_impl
->
ID3D10ShaderResourceView_iface
;
ID3D10ShaderResourceView_AddRef
(
views
[
i
]);
}
}
static
void
STDMETHODCALLTYPE
d3d10_device_VSGetSamplers
(
ID3D10Device1
*
iface
,
...
...
dlls/wined3d/device.c
View file @
482e5f58
...
...
@@ -2172,6 +2172,20 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device,
wined3d_device_set_shader_resource_view
(
device
,
WINED3D_SHADER_TYPE_VERTEX
,
idx
,
view
);
}
struct
wined3d_shader_resource_view
*
CDECL
wined3d_device_get_vs_resource_view
(
const
struct
wined3d_device
*
device
,
UINT
idx
)
{
TRACE
(
"device %p, idx %u.
\n
"
,
device
,
idx
);
if
(
idx
>=
MAX_SHADER_RESOURCE_VIEWS
)
{
WARN
(
"Invalid view index %u.
\n
"
,
idx
);
return
NULL
;
}
return
device
->
state
.
shader_resource_view
[
WINED3D_SHADER_TYPE_VERTEX
][
idx
];
}
static
void
wined3d_device_set_sampler
(
struct
wined3d_device
*
device
,
enum
wined3d_shader_type
type
,
UINT
idx
,
struct
wined3d_sampler
*
sampler
)
{
...
...
dlls/wined3d/view.c
View file @
482e5f58
...
...
@@ -183,6 +183,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v
return
refcount
;
}
void
*
CDECL
wined3d_shader_resource_view_get_parent
(
const
struct
wined3d_shader_resource_view
*
view
)
{
TRACE
(
"view %p.
\n
"
,
view
);
return
view
->
parent
;
}
HRESULT
CDECL
wined3d_shader_resource_view_create
(
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
struct
wined3d_shader_resource_view
**
view
)
{
...
...
dlls/wined3d/wined3d.spec
View file @
482e5f58
...
...
@@ -94,6 +94,7 @@
@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long)
@ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long)
@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long)
@ cdecl wined3d_device_get_vs_resource_view(ptr long)
@ cdecl wined3d_device_get_vs_sampler(ptr long)
@ cdecl wined3d_device_incref(ptr)
@ cdecl wined3d_device_init_3d(ptr ptr)
...
...
@@ -202,6 +203,7 @@
@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr)
@ cdecl wined3d_shader_resource_view_decref(ptr)
@ cdecl wined3d_shader_resource_view_get_parent(ptr)
@ cdecl wined3d_shader_resource_view_incref(ptr)
@ cdecl wined3d_stateblock_apply(ptr)
...
...
include/wine/wined3d.h
View file @
482e5f58
...
...
@@ -2184,6 +2184,8 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi
UINT
start_register
,
float
*
constants
,
UINT
vector4f_count
);
HRESULT
__cdecl
wined3d_device_get_vs_consts_i
(
const
struct
wined3d_device
*
device
,
UINT
start_register
,
int
*
constants
,
UINT
vector4i_count
);
struct
wined3d_shader_resource_view
*
__cdecl
wined3d_device_get_vs_resource_view
(
const
struct
wined3d_device
*
device
,
UINT
idx
);
struct
wined3d_sampler
*
__cdecl
wined3d_device_get_vs_sampler
(
const
struct
wined3d_device
*
device
,
UINT
idx
);
ULONG
__cdecl
wined3d_device_incref
(
struct
wined3d_device
*
device
);
HRESULT
__cdecl
wined3d_device_init_3d
(
struct
wined3d_device
*
device
,
struct
wined3d_swapchain_desc
*
swapchain_desc
);
...
...
@@ -2415,6 +2417,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *
HRESULT
__cdecl
wined3d_shader_resource_view_create
(
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
struct
wined3d_shader_resource_view
**
view
);
ULONG
__cdecl
wined3d_shader_resource_view_decref
(
struct
wined3d_shader_resource_view
*
view
);
void
*
__cdecl
wined3d_shader_resource_view_get_parent
(
const
struct
wined3d_shader_resource_view
*
view
);
ULONG
__cdecl
wined3d_shader_resource_view_incref
(
struct
wined3d_shader_resource_view
*
view
);
void
__cdecl
wined3d_stateblock_apply
(
const
struct
wined3d_stateblock
*
stateblock
);
...
...
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