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
40686f48
Commit
40686f48
authored
Feb 13, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 13, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_rendertarget_view_GetDevice().
parent
01d43528
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
8 deletions
+26
-8
d3d10core_private.h
dlls/d3d10core/d3d10core_private.h
+2
-1
device.c
dlls/d3d10core/device.c
+4
-5
device.c
dlls/d3d10core/tests/device.c
+10
-0
view.c
dlls/d3d10core/view.c
+10
-2
No files found.
dlls/d3d10core/d3d10core_private.h
View file @
40686f48
...
...
@@ -138,9 +138,10 @@ struct d3d10_rendertarget_view
struct
wined3d_rendertarget_view
*
wined3d_view
;
D3D10_RENDER_TARGET_VIEW_DESC
desc
;
ID3D10Resource
*
resource
;
ID3D10Device1
*
device
;
};
HRESULT
d3d10_rendertarget_view_init
(
struct
d3d10_rendertarget_view
*
view
,
HRESULT
d3d10_rendertarget_view_init
(
struct
d3d10_rendertarget_view
*
view
,
struct
d3d10_device
*
device
,
ID3D10Resource
*
resource
,
const
D3D10_RENDER_TARGET_VIEW_DESC
*
desc
)
DECLSPEC_HIDDEN
;
struct
d3d10_rendertarget_view
*
unsafe_impl_from_ID3D10RenderTargetView
(
ID3D10RenderTargetView
*
iface
)
DECLSPEC_HIDDEN
;
...
...
dlls/d3d10core/device.c
View file @
40686f48
...
...
@@ -1188,17 +1188,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev
static
HRESULT
STDMETHODCALLTYPE
d3d10_device_CreateRenderTargetView
(
ID3D10Device1
*
iface
,
ID3D10Resource
*
resource
,
const
D3D10_RENDER_TARGET_VIEW_DESC
*
desc
,
ID3D10RenderTargetView
**
view
)
{
struct
d3d10_device
*
device
=
impl_from_ID3D10Device
(
iface
);
struct
d3d10_rendertarget_view
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, resource %p, desc %p, view %p
stub!
\n
"
,
iface
,
resource
,
desc
,
view
);
TRACE
(
"iface %p, resource %p, desc %p, view %p
.
\n
"
,
iface
,
resource
,
desc
,
view
);
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
if
(
!
(
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
hr
=
d3d10_rendertarget_view_init
(
object
,
resource
,
desc
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
=
d3d10_rendertarget_view_init
(
object
,
device
,
resource
,
desc
)))
{
WARN
(
"Failed to initialize rendertarget view, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
...
...
dlls/d3d10core/tests/device.c
View file @
40686f48
...
...
@@ -308,8 +308,18 @@ static void test_create_rendertarget_view(void)
U
(
rtv_desc
).
Buffer
.
ElementOffset
=
0
;
U
(
rtv_desc
).
Buffer
.
ElementWidth
=
64
;
expected_refcount
=
get_refcount
((
IUnknown
*
)
device
)
+
1
;
hr
=
ID3D10Device_CreateRenderTargetView
(
device
,
(
ID3D10Resource
*
)
buffer
,
&
rtv_desc
,
&
rtview
);
ok
(
SUCCEEDED
(
hr
),
"Failed to create a rendertarget view, hr %#x
\n
"
,
hr
);
refcount
=
get_refcount
((
IUnknown
*
)
device
);
ok
(
refcount
>=
expected_refcount
,
"Got unexpected refcount %u, expected >= %u.
\n
"
,
refcount
,
expected_refcount
);
tmp
=
NULL
;
expected_refcount
=
refcount
+
1
;
ID3D10RenderTargetView_GetDevice
(
rtview
,
&
tmp
);
ok
(
tmp
==
device
,
"Got unexpected device %p, expected %p.
\n
"
,
tmp
,
device
);
refcount
=
get_refcount
((
IUnknown
*
)
device
);
ok
(
refcount
==
expected_refcount
,
"Got unexpected refcount %u, expected %u.
\n
"
,
refcount
,
expected_refcount
);
ID3D10Device_Release
(
tmp
);
ID3D10RenderTargetView_Release
(
rtview
);
ID3D10Buffer_Release
(
buffer
);
...
...
dlls/d3d10core/view.c
View file @
40686f48
...
...
@@ -587,6 +587,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge
{
wined3d_rendertarget_view_decref
(
This
->
wined3d_view
);
ID3D10Resource_Release
(
This
->
resource
);
ID3D10Device1_Release
(
This
->
device
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
}
...
...
@@ -597,7 +598,12 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge
static
void
STDMETHODCALLTYPE
d3d10_rendertarget_view_GetDevice
(
ID3D10RenderTargetView
*
iface
,
ID3D10Device
**
device
)
{
FIXME
(
"iface %p, device %p stub!
\n
"
,
iface
,
device
);
struct
d3d10_rendertarget_view
*
view
=
impl_from_ID3D10RenderTargetView
(
iface
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
device
);
*
device
=
(
ID3D10Device
*
)
view
->
device
;
ID3D10Device_AddRef
(
*
device
);
}
static
HRESULT
STDMETHODCALLTYPE
d3d10_rendertarget_view_GetPrivateData
(
ID3D10RenderTargetView
*
iface
,
...
...
@@ -668,7 +674,7 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl =
d3d10_rendertarget_view_GetDesc
,
};
HRESULT
d3d10_rendertarget_view_init
(
struct
d3d10_rendertarget_view
*
view
,
HRESULT
d3d10_rendertarget_view_init
(
struct
d3d10_rendertarget_view
*
view
,
struct
d3d10_device
*
device
,
ID3D10Resource
*
resource
,
const
D3D10_RENDER_TARGET_VIEW_DESC
*
desc
)
{
struct
wined3d_resource
*
wined3d_resource
;
...
...
@@ -703,6 +709,8 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view,
view
->
resource
=
resource
;
ID3D10Resource_AddRef
(
resource
);
view
->
device
=
&
device
->
ID3D10Device1_iface
;
ID3D10Device1_AddRef
(
view
->
device
);
return
S_OK
;
}
...
...
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