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
14eadb71
Commit
14eadb71
authored
Dec 11, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_sampler_state_GetDesc().
parent
99dcfdf0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
d3d10core_private.h
dlls/d3d10core/d3d10core_private.h
+2
-1
device.c
dlls/d3d10core/device.c
+4
-2
state.c
dlls/d3d10core/state.c
+7
-2
No files found.
dlls/d3d10core/d3d10core_private.h
View file @
14eadb71
...
...
@@ -248,9 +248,10 @@ struct d3d10_sampler_state
LONG
refcount
;
struct
wined3d_sampler
*
wined3d_sampler
;
D3D10_SAMPLER_DESC
desc
;
};
HRESULT
d3d10_sampler_state_init
(
struct
d3d10_sampler_state
*
state
)
DECLSPEC_HIDDEN
;
HRESULT
d3d10_sampler_state_init
(
struct
d3d10_sampler_state
*
state
,
const
D3D10_SAMPLER_DESC
*
desc
)
DECLSPEC_HIDDEN
;
struct
d3d10_sampler_state
*
unsafe_impl_from_ID3D10SamplerState
(
ID3D10SamplerState
*
iface
)
DECLSPEC_HIDDEN
;
/* ID3D10Query */
...
...
dlls/d3d10core/device.c
View file @
14eadb71
...
...
@@ -1476,6 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i
TRACE
(
"iface %p, desc %p, sampler_state %p.
\n
"
,
iface
,
desc
,
sampler_state
);
if
(
!
desc
)
return
E_INVALIDARG
;
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
{
...
...
@@ -1483,8 +1486,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i
return
E_OUTOFMEMORY
;
}
hr
=
d3d10_sampler_state_init
(
object
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
=
d3d10_sampler_state_init
(
object
,
desc
)))
{
WARN
(
"Failed to initialize sampler state, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
...
...
dlls/d3d10core/state.c
View file @
14eadb71
...
...
@@ -490,7 +490,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3
static
void
STDMETHODCALLTYPE
d3d10_sampler_state_GetDesc
(
ID3D10SamplerState
*
iface
,
D3D10_SAMPLER_DESC
*
desc
)
{
FIXME
(
"iface %p, desc %p stub!
\n
"
,
iface
,
desc
);
struct
d3d10_sampler_state
*
state
=
impl_from_ID3D10SamplerState
(
iface
);
TRACE
(
"iface %p, desc %p.
\n
"
,
iface
,
desc
);
*
desc
=
state
->
desc
;
}
static
const
struct
ID3D10SamplerStateVtbl
d3d10_sampler_state_vtbl
=
...
...
@@ -508,12 +512,13 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl =
d3d10_sampler_state_GetDesc
,
};
HRESULT
d3d10_sampler_state_init
(
struct
d3d10_sampler_state
*
state
)
HRESULT
d3d10_sampler_state_init
(
struct
d3d10_sampler_state
*
state
,
const
D3D10_SAMPLER_DESC
*
desc
)
{
HRESULT
hr
;
state
->
ID3D10SamplerState_iface
.
lpVtbl
=
&
d3d10_sampler_state_vtbl
;
state
->
refcount
=
1
;
state
->
desc
=
*
desc
;
if
(
FAILED
(
hr
=
wined3d_sampler_create
(
state
,
&
state
->
wined3d_sampler
)))
{
...
...
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