Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
dd5fc79f
Commit
dd5fc79f
authored
Dec 04, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 04, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: The stateblock doesn't really need a parent.
parent
ff92e6eb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
16 deletions
+5
-16
device.c
dlls/wined3d/device.c
+1
-1
stateblock.c
dlls/wined3d/stateblock.c
+1
-11
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-3
wined3d.idl
include/wine/wined3d.idl
+1
-1
No files found.
dlls/wined3d/device.c
View file @
dd5fc79f
...
...
@@ -605,7 +605,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface,
return
E_OUTOFMEMORY
;
}
hr
=
stateblock_init
(
object
,
This
,
type
,
parent
);
hr
=
stateblock_init
(
object
,
This
,
type
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize stateblock, hr %#x.
\n
"
,
hr
);
...
...
dlls/wined3d/stateblock.c
View file @
dd5fc79f
...
...
@@ -535,13 +535,6 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
/**********************************************************
* IWineD3DStateBlockImpl parts follows
**********************************************************/
static
HRESULT
WINAPI
IWineD3DStateBlockImpl_GetParent
(
IWineD3DStateBlock
*
iface
,
IUnknown
**
pParent
)
{
IWineD3DStateBlockImpl
*
This
=
(
IWineD3DStateBlockImpl
*
)
iface
;
IUnknown_AddRef
(
This
->
parent
);
*
pParent
=
This
->
parent
;
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DStateBlockImpl_GetDevice
(
IWineD3DStateBlock
*
iface
,
IWineD3DDevice
**
ppDevice
){
IWineD3DStateBlockImpl
*
This
=
(
IWineD3DStateBlockImpl
*
)
iface
;
...
...
@@ -1328,22 +1321,19 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl =
IWineD3DStateBlockImpl_AddRef
,
IWineD3DStateBlockImpl_Release
,
/* IWineD3DStateBlock */
IWineD3DStateBlockImpl_GetParent
,
IWineD3DStateBlockImpl_GetDevice
,
IWineD3DStateBlockImpl_Capture
,
IWineD3DStateBlockImpl_Apply
,
IWineD3DStateBlockImpl_InitStartupStateBlock
};
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
,
IUnknown
*
parent
)
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
)
{
unsigned
int
i
;
HRESULT
hr
;
stateblock
->
lpVtbl
=
&
IWineD3DStateBlock_Vtbl
;
stateblock
->
ref
=
1
;
stateblock
->
parent
=
parent
;
stateblock
->
wineD3DDevice
=
device
;
stateblock
->
blockType
=
type
;
...
...
dlls/wined3d/wined3d_private.h
View file @
dd5fc79f
...
...
@@ -2194,7 +2194,6 @@ struct IWineD3DStateBlockImpl
LONG
ref
;
/* Note: Ref counting not required */
/* IWineD3DStateBlock information */
IUnknown
*
parent
;
IWineD3DDeviceImpl
*
wineD3DDevice
;
WINED3DSTATEBLOCKTYPE
blockType
;
...
...
@@ -2293,8 +2292,8 @@ struct IWineD3DStateBlockImpl
unsigned
int
num_contained_sampler_states
;
};
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
,
IUnknown
*
parent
)
DECLSPEC_HIDDEN
;
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
)
DECLSPEC_HIDDEN
;
void
stateblock_init_contained_states
(
IWineD3DStateBlockImpl
*
object
)
DECLSPEC_HIDDEN
;
/* Direct3D terminology with little modifications. We do not have an issued state
...
...
include/wine/wined3d.idl
View file @
dd5fc79f
...
...
@@ -2724,7 +2724,7 @@ interface IWineD3DVertexDeclaration : IWineD3DBase
local
,
uuid
(
83b073
ce
-
6
f30
-
11
d9
-
c687
-
00046142
c14f
)
]
interface
IWineD3DStateBlock
:
I
WineD3DBase
interface
IWineD3DStateBlock
:
I
Unknown
{
HRESULT
GetDevice
(
[
out
]
IWineD3DDevice
**
device
...
...
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