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
d6d345fa
Commit
d6d345fa
authored
Sep 28, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 28, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove IWineD3DStateBlock::InitStartupStateBlock() from the public wined3d interface.
parent
67088eb3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
13 deletions
+5
-13
device.c
dlls/wined3d/device.c
+2
-5
stateblock.c
dlls/wined3d/stateblock.c
+2
-6
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
wined3d.idl
include/wine/wined3d.idl
+0
-2
No files found.
dlls/wined3d/device.c
View file @
d6d345fa
...
...
@@ -1888,7 +1888,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
/* Set up some starting GL setup */
/* Setup all the devices defaults */
IWineD3DStateBlock_InitStartupStateBlock
((
IWineD3DStateBlock
*
)
This
->
stateBlock
);
stateblock_init_default_state
(
This
->
stateBlock
);
context
=
context_acquire
(
This
,
swapchain
->
front_buffer
);
...
...
@@ -6469,10 +6469,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface,
This
->
updateStateBlock
=
This
->
stateBlock
;
IWineD3DStateBlock_AddRef
((
IWineD3DStateBlock
*
)
This
->
updateStateBlock
);
hr
=
IWineD3DStateBlock_InitStartupStateBlock
((
IWineD3DStateBlock
*
)
This
->
stateBlock
);
if
(
FAILED
(
hr
))
{
ERR
(
"Resetting the stateblock failed with error 0x%08x
\n
"
,
hr
);
}
stateblock_init_default_state
(
This
->
stateBlock
);
if
(
wined3d_settings
.
offscreen_rendering_mode
==
ORM_FBO
)
{
...
...
dlls/wined3d/stateblock.c
View file @
d6d345fa
...
...
@@ -1078,9 +1078,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface)
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DStateBlockImpl_InitStartupStateBlock
(
IWineD3DStateBlock
*
iface
)
void
stateblock_init_default_state
(
IWineD3DStateBlockImpl
*
stateblock
)
{
IWineD3DStateBlockImpl
*
stateblock
=
(
IWineD3DStateBlockImpl
*
)
iface
;
IWineD3DDeviceImpl
*
device
=
stateblock
->
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
wined3d_state
*
state
=
&
stateblock
->
state
;
...
...
@@ -1097,7 +1096,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState
IWineD3DSurface
*
backbuffer
;
HRESULT
hr
;
TRACE
(
"
iface %p.
\n
"
,
iface
);
TRACE
(
"
stateblock %p.
\n
"
,
stateblock
);
stateblock
->
blockType
=
WINED3DSBT_INIT
;
...
...
@@ -1328,8 +1327,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState
}
TRACE
(
"Done.
\n
"
);
return
WINED3D_OK
;
}
/**********************************************************
...
...
@@ -1345,7 +1342,6 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl =
/* IWineD3DStateBlock */
IWineD3DStateBlockImpl_Capture
,
IWineD3DStateBlockImpl_Apply
,
IWineD3DStateBlockImpl_InitStartupStateBlock
};
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
)
...
...
dlls/wined3d/wined3d_private.h
View file @
d6d345fa
...
...
@@ -2429,6 +2429,7 @@ struct IWineD3DStateBlockImpl
HRESULT
stateblock_init
(
IWineD3DStateBlockImpl
*
stateblock
,
IWineD3DDeviceImpl
*
device
,
WINED3DSTATEBLOCKTYPE
type
)
DECLSPEC_HIDDEN
;
void
stateblock_init_contained_states
(
IWineD3DStateBlockImpl
*
object
)
DECLSPEC_HIDDEN
;
void
stateblock_init_default_state
(
IWineD3DStateBlockImpl
*
stateblock
)
DECLSPEC_HIDDEN
;
static
inline
void
stateblock_apply_state
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
...
...
include/wine/wined3d.idl
View file @
d6d345fa
...
...
@@ -2647,8 +2647,6 @@ interface IWineD3DStateBlock : IUnknown
)
;
HRESULT
Apply
(
)
;
HRESULT
InitStartupStateBlock
(
)
;
}
[
...
...
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