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
9fbd3bbe
Commit
9fbd3bbe
authored
Dec 09, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_device_PSGetSamplers().
parent
4c4131cd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
1 deletion
+35
-1
device.c
dlls/d3d10core/device.c
+20
-1
device.c
dlls/wined3d/device.c
+13
-0
wined3d.spec
dlls/wined3d/wined3d.spec
+1
-0
wined3d.h
include/wine/wined3d.h
+1
-0
No files found.
dlls/d3d10core/device.c
View file @
9fbd3bbe
...
@@ -607,8 +607,27 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device *iface, ID3D
...
@@ -607,8 +607,27 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device *iface, ID3D
static
void
STDMETHODCALLTYPE
d3d10_device_PSGetSamplers
(
ID3D10Device
*
iface
,
static
void
STDMETHODCALLTYPE
d3d10_device_PSGetSamplers
(
ID3D10Device
*
iface
,
UINT
start_slot
,
UINT
sampler_count
,
ID3D10SamplerState
**
samplers
)
UINT
start_slot
,
UINT
sampler_count
,
ID3D10SamplerState
**
samplers
)
{
{
FIXME
(
"iface %p, start_slot %u, sampler_count %u, samplers %p stub!
\n
"
,
struct
d3d10_device
*
device
=
impl_from_ID3D10Device
(
iface
);
unsigned
int
i
;
TRACE
(
"iface %p, start_slot %u, sampler_count %u, samplers %p.
\n
"
,
iface
,
start_slot
,
sampler_count
,
samplers
);
iface
,
start_slot
,
sampler_count
,
samplers
);
for
(
i
=
0
;
i
<
sampler_count
;
++
i
)
{
struct
d3d10_sampler_state
*
sampler_impl
;
struct
wined3d_sampler
*
wined3d_sampler
;
if
(
!
(
wined3d_sampler
=
wined3d_device_get_ps_sampler
(
device
->
wined3d_device
,
start_slot
+
i
)))
{
samplers
[
i
]
=
NULL
;
continue
;
}
sampler_impl
=
wined3d_sampler_get_parent
(
wined3d_sampler
);
samplers
[
i
]
=
&
sampler_impl
->
ID3D10SamplerState_iface
;
ID3D10SamplerState_AddRef
(
samplers
[
i
]);
}
}
}
static
void
STDMETHODCALLTYPE
d3d10_device_VSGetShader
(
ID3D10Device
*
iface
,
ID3D10VertexShader
**
shader
)
static
void
STDMETHODCALLTYPE
d3d10_device_VSGetShader
(
ID3D10Device
*
iface
,
ID3D10VertexShader
**
shader
)
...
...
dlls/wined3d/device.c
View file @
9fbd3bbe
...
@@ -3073,6 +3073,19 @@ void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx
...
@@ -3073,6 +3073,19 @@ void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx
wined3d_sampler_decref
(
prev
);
wined3d_sampler_decref
(
prev
);
}
}
struct
wined3d_sampler
*
CDECL
wined3d_device_get_ps_sampler
(
const
struct
wined3d_device
*
device
,
UINT
idx
)
{
TRACE
(
"device %p, idx %u.
\n
"
,
device
,
idx
);
if
(
idx
>=
MAX_SAMPLER_OBJECTS
)
{
WARN
(
"Invalid sampler index %u.
\n
"
,
idx
);
return
NULL
;
}
return
device
->
stateBlock
->
state
.
ps_sampler
[
idx
];
}
HRESULT
CDECL
wined3d_device_set_ps_consts_b
(
struct
wined3d_device
*
device
,
HRESULT
CDECL
wined3d_device_set_ps_consts_b
(
struct
wined3d_device
*
device
,
UINT
start_register
,
const
BOOL
*
constants
,
UINT
bool_count
)
UINT
start_register
,
const
BOOL
*
constants
,
UINT
bool_count
)
{
{
...
...
dlls/wined3d/wined3d.spec
View file @
9fbd3bbe
...
@@ -79,6 +79,7 @@
...
@@ -79,6 +79,7 @@
@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long)
@ cdecl wined3d_device_get_ps_sampler(ptr long)
@ cdecl wined3d_device_get_raster_status(ptr long ptr)
@ cdecl wined3d_device_get_raster_status(ptr long ptr)
@ cdecl wined3d_device_get_render_state(ptr long)
@ cdecl wined3d_device_get_render_state(ptr long)
@ cdecl wined3d_device_get_render_target(ptr long)
@ cdecl wined3d_device_get_render_target(ptr long)
...
...
include/wine/wined3d.h
View file @
9fbd3bbe
...
@@ -2147,6 +2147,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi
...
@@ -2147,6 +2147,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi
UINT
start_register
,
float
*
constants
,
UINT
vector4f_count
);
UINT
start_register
,
float
*
constants
,
UINT
vector4f_count
);
HRESULT
__cdecl
wined3d_device_get_ps_consts_i
(
const
struct
wined3d_device
*
device
,
HRESULT
__cdecl
wined3d_device_get_ps_consts_i
(
const
struct
wined3d_device
*
device
,
UINT
start_register
,
int
*
constants
,
UINT
vector4i_count
);
UINT
start_register
,
int
*
constants
,
UINT
vector4i_count
);
struct
wined3d_sampler
*
__cdecl
wined3d_device_get_ps_sampler
(
const
struct
wined3d_device
*
device
,
UINT
idx
);
HRESULT
__cdecl
wined3d_device_get_raster_status
(
const
struct
wined3d_device
*
device
,
HRESULT
__cdecl
wined3d_device_get_raster_status
(
const
struct
wined3d_device
*
device
,
UINT
swapchain_idx
,
struct
wined3d_raster_status
*
raster_status
);
UINT
swapchain_idx
,
struct
wined3d_raster_status
*
raster_status
);
DWORD
__cdecl
wined3d_device_get_render_state
(
const
struct
wined3d_device
*
device
,
enum
wined3d_render_state
state
);
DWORD
__cdecl
wined3d_device_get_render_state
(
const
struct
wined3d_device
*
device
,
enum
wined3d_render_state
state
);
...
...
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