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
3ad82a82
Commit
3ad82a82
authored
Jul 30, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 30, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: The stateblock doesn't have a parent.
parent
51a31538
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
16 deletions
+11
-16
device.c
dlls/d3d8/device.c
+1
-2
stateblock.c
dlls/d3d9/stateblock.c
+2
-2
device.c
dlls/ddraw/device.c
+1
-1
device.c
dlls/wined3d/device.c
+6
-9
wined3d.idl
include/wine/wined3d.idl
+1
-2
No files found.
dlls/d3d8/device.c
View file @
3ad82a82
...
...
@@ -1415,8 +1415,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if
}
wined3d_mutex_lock
();
hr
=
IWineD3DDevice_CreateStateBlock
(
This
->
WineD3DDevice
,
(
WINED3DSTATEBLOCKTYPE
)
Type
,
&
stateblock
,
NULL
);
hr
=
IWineD3DDevice_CreateStateBlock
(
This
->
WineD3DDevice
,
(
WINED3DSTATEBLOCKTYPE
)
Type
,
&
stateblock
);
if
(
FAILED
(
hr
))
{
wined3d_mutex_unlock
();
...
...
dlls/d3d9/stateblock.c
View file @
3ad82a82
...
...
@@ -138,8 +138,8 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im
else
{
wined3d_mutex_lock
();
hr
=
IWineD3DDevice_CreateStateBlock
(
device
->
WineD3DDevice
,
(
WINED3DSTATEBLOCKTYPE
)
type
,
&
stateblock
->
wineD3DStateBlock
,
(
IUnknown
*
)
stateb
lock
);
hr
=
IWineD3DDevice_CreateStateBlock
(
device
->
WineD3DDevice
,
(
WINED3DSTATEBLOCKTYPE
)
type
,
&
stateblock
->
wineD3DStateB
lock
);
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
{
...
...
dlls/ddraw/device.c
View file @
3ad82a82
...
...
@@ -5927,7 +5927,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
EnterCriticalSection
(
&
ddraw_cs
);
/* The D3DSTATEBLOCKTYPE enum is fine here. */
hr
=
IWineD3DDevice_CreateStateBlock
(
This
->
wineD3DDevice
,
Type
,
&
wined3d_sb
,
NULL
);
hr
=
IWineD3DDevice_CreateStateBlock
(
This
->
wineD3DDevice
,
Type
,
&
wined3d_sb
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create stateblock, hr %#x.
\n
"
,
hr
);
...
...
dlls/wined3d/device.c
View file @
3ad82a82
...
...
@@ -1012,7 +1012,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateStateBlock
(
IWineD3DDevice
*
iface
,
WINED3DSTATEBLOCKTYPE
type
,
IWineD3DStateBlock
**
stateblock
,
IUnknown
*
parent
)
WINED3DSTATEBLOCKTYPE
type
,
IWineD3DStateBlock
**
stateblock
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
IWineD3DStateBlockImpl
*
object
;
...
...
@@ -1790,12 +1790,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
if
(
!
This
->
adapter
->
opengl
)
return
WINED3DERR_INVALIDCALL
;
TRACE
(
"(%p) : Creating stateblock
\n
"
,
This
);
/* Creating the startup stateBlock - Note Special Case: 0 => Don't fill in yet! */
hr
=
IWineD3DDevice_CreateStateBlock
(
iface
,
WINED3DSBT_INIT
,
(
IWineD3DStateBlock
**
)
&
This
->
stateBlock
,
NULL
);
if
(
WINED3D_OK
!=
hr
)
{
/* Note: No parent needed for initial internal stateblock */
hr
=
IWineD3DDevice_CreateStateBlock
(
iface
,
WINED3DSBT_INIT
,
(
IWineD3DStateBlock
**
)
&
This
->
stateBlock
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create stateblock
\n
"
);
goto
err_out
;
}
...
...
@@ -4488,7 +4485,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface)
if
(
This
->
isRecordingState
)
return
WINED3DERR_INVALIDCALL
;
hr
=
IWineD3DDeviceImpl_CreateStateBlock
(
iface
,
WINED3DSBT_RECORDED
,
&
stateblock
,
NULL
);
hr
=
IWineD3DDeviceImpl_CreateStateBlock
(
iface
,
WINED3DSBT_RECORDED
,
&
stateblock
);
if
(
FAILED
(
hr
))
return
hr
;
IWineD3DStateBlock_Release
((
IWineD3DStateBlock
*
)
This
->
updateStateBlock
);
...
...
@@ -6469,7 +6466,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
}
/* Note: No parent needed for initial internal stateblock */
hr
=
IWineD3DDevice_CreateStateBlock
(
iface
,
WINED3DSBT_INIT
,
(
IWineD3DStateBlock
**
)
&
This
->
stateBlock
,
NULL
);
hr
=
IWineD3DDevice_CreateStateBlock
(
iface
,
WINED3DSBT_INIT
,
(
IWineD3DStateBlock
**
)
&
This
->
stateBlock
);
if
(
FAILED
(
hr
))
ERR
(
"Resetting the stateblock failed with error 0x%08x
\n
"
,
hr
);
else
TRACE
(
"Created stateblock %p
\n
"
,
This
->
stateBlock
);
This
->
updateStateBlock
=
This
->
stateBlock
;
...
...
include/wine/wined3d.idl
View file @
3ad82a82
...
...
@@ -2843,8 +2843,7 @@ interface IWineD3DDevice : IWineD3DBase
)
;
HRESULT
CreateStateBlock
(
[
in
]
WINED3DSTATEBLOCKTYPE
type
,
[
out
]
IWineD3DStateBlock
**
stateblock
,
[
in
]
IUnknown
*
parent
[
out
]
IWineD3DStateBlock
**
stateblock
)
;
HRESULT
CreateSurface
(
[
in
]
UINT
width
,
...
...
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