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
fc844029
Commit
fc844029
authored
Sep 01, 2015
by
Józef Kucia
Committed by
Alexandre Julliard
Sep 01, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d11: Implement d3d11_texture3d_GetDevice().
parent
4665ae62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
d3d11_private.h
dlls/d3d11/d3d11_private.h
+1
-1
texture.c
dlls/d3d11/texture.c
+12
-8
No files found.
dlls/d3d11/d3d11_private.h
View file @
fc844029
...
@@ -126,7 +126,7 @@ struct d3d_texture3d
...
@@ -126,7 +126,7 @@ struct d3d_texture3d
struct
wined3d_private_store
private_store
;
struct
wined3d_private_store
private_store
;
struct
wined3d_texture
*
wined3d_texture
;
struct
wined3d_texture
*
wined3d_texture
;
D3D10_TEXTURE3D_DESC
desc
;
D3D10_TEXTURE3D_DESC
desc
;
ID3D1
0Device1
*
device
;
ID3D1
1Device
*
device
;
};
};
HRESULT
d3d_texture3d_init
(
struct
d3d_texture3d
*
texture
,
struct
d3d_device
*
device
,
HRESULT
d3d_texture3d_init
(
struct
d3d_texture3d
*
texture
,
struct
d3d_device
*
device
,
...
...
dlls/d3d11/texture.c
View file @
fc844029
...
@@ -588,7 +588,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)
...
@@ -588,7 +588,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
ID3D1
0Device1
_AddRef
(
texture
->
device
);
ID3D1
1Device
_AddRef
(
texture
->
device
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
wined3d_texture_incref
(
texture
->
wined3d_texture
);
wined3d_texture_incref
(
texture
->
wined3d_texture
);
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
...
@@ -614,14 +614,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
...
@@ -614,14 +614,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
if
(
!
refcount
)
if
(
!
refcount
)
{
{
ID3D1
0Device1
*
device
=
texture
->
device
;
ID3D1
1Device
*
device
=
texture
->
device
;
wined3d_mutex_lock
();
wined3d_mutex_lock
();
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
/* Release the device last, it may cause the wined3d device to be
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
* destroyed. */
ID3D1
0Device1
_Release
(
device
);
ID3D1
1Device
_Release
(
device
);
}
}
return
refcount
;
return
refcount
;
...
@@ -629,7 +629,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
...
@@ -629,7 +629,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
static
void
STDMETHODCALLTYPE
d3d11_texture3d_GetDevice
(
ID3D11Texture3D
*
iface
,
ID3D11Device
**
device
)
static
void
STDMETHODCALLTYPE
d3d11_texture3d_GetDevice
(
ID3D11Texture3D
*
iface
,
ID3D11Device
**
device
)
{
{
FIXME
(
"iface %p, device %p stub!
\n
"
,
iface
,
device
);
struct
d3d_texture3d
*
texture
=
impl_from_ID3D11Texture3D
(
iface
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
device
);
*
device
=
texture
->
device
;
ID3D11Device_AddRef
(
*
device
);
}
}
static
HRESULT
STDMETHODCALLTYPE
d3d11_texture3d_GetPrivateData
(
ID3D11Texture3D
*
iface
,
static
HRESULT
STDMETHODCALLTYPE
d3d11_texture3d_GetPrivateData
(
ID3D11Texture3D
*
iface
,
...
@@ -740,8 +745,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface,
...
@@ -740,8 +745,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface,
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
device
);
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
device
);
*
device
=
(
ID3D10Device
*
)
texture
->
device
;
ID3D11Device_QueryInterface
(
texture
->
device
,
&
IID_ID3D10Device
,
(
void
**
)
device
);
ID3D10Device_AddRef
(
*
device
);
}
}
static
HRESULT
STDMETHODCALLTYPE
d3d10_texture3d_GetPrivateData
(
ID3D10Texture3D
*
iface
,
static
HRESULT
STDMETHODCALLTYPE
d3d10_texture3d_GetPrivateData
(
ID3D10Texture3D
*
iface
,
...
@@ -917,8 +921,8 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev
...
@@ -917,8 +921,8 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
texture
->
desc
.
MipLevels
=
levels
;
texture
->
desc
.
MipLevels
=
levels
;
texture
->
device
=
&
device
->
ID3D1
0Device1
_iface
;
texture
->
device
=
&
device
->
ID3D1
1Device
_iface
;
ID3D1
0Device1
_AddRef
(
texture
->
device
);
ID3D1
1Device
_AddRef
(
texture
->
device
);
return
S_OK
;
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