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
2ac48e81
Commit
2ac48e81
authored
Dec 08, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 08, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move WINED3DRS_ZFUNCENABLE to the state table.
parent
8879c7d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
device.c
dlls/wined3d/device.c
+1
-11
state.c
dlls/wined3d/state.c
+10
-1
No files found.
dlls/wined3d/device.c
View file @
2ac48e81
...
...
@@ -3443,18 +3443,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case
WINED3DRS_SHADEMODE
:
case
WINED3DRS_DITHERENABLE
:
case
WINED3DRS_ZWRITEENABLE
:
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
break
;
case
WINED3DRS_ZFUNC
:
{
int
glParm
=
CompareFunc
(
Value
);
if
(
glParm
)
{
glDepthFunc
(
glParm
);
checkGLcall
(
"glDepthFunc"
);
}
}
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
break
;
case
WINED3DRS_AMBIENT
:
...
...
dlls/wined3d/state.c
View file @
2ac48e81
...
...
@@ -195,6 +195,15 @@ static void state_zwritenable(DWORD state, IWineD3DStateBlockImpl *stateblock) {
}
}
static
void
state_zfunc
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
)
{
int
glParm
=
CompareFunc
(
stateblock
->
renderState
[
WINED3DRS_ZFUNC
]);
if
(
glParm
)
{
glDepthFunc
(
glParm
);
checkGLcall
(
"glDepthFunc"
);
}
}
const
struct
StateEntry
StateTable
[]
=
{
/* State name representative, apply function */
...
...
@@ -221,7 +230,7 @@ const struct StateEntry StateTable[] =
{
/* 20, WINED3DRS_DESTBLEND */
STATE_RENDER
(
WINED3DRS_ALPHABLENDENABLE
),
state_unknown
},
{
/* 21, WINED3DRS_TEXTUREMAPBLEND */
0
/* Handled in ddraw */
,
state_undefined
},
{
/* 22, WINED3DRS_CULLMODE */
STATE_RENDER
(
WINED3DRS_CULLMODE
),
state_cullmode
},
{
/* 23, WINED3DRS_ZFUNC */
STATE_RENDER
(
WINED3DRS_ZFUNC
),
state_
unknown
},
{
/* 23, WINED3DRS_ZFUNC */
STATE_RENDER
(
WINED3DRS_ZFUNC
),
state_
zfunc
},
{
/* 24, WINED3DRS_ALPHAREF */
STATE_RENDER
(
WINED3DRS_ALPHATESTENABLE
),
state_unknown
},
{
/* 25, WINED3DRS_ALPHAFUNC */
STATE_RENDER
(
WINED3DRS_ALPHATESTENABLE
),
state_unknown
},
{
/* 26, WINED3DRS_DITHERENABLE */
STATE_RENDER
(
WINED3DRS_DITHERENABLE
),
state_ditherenable
},
...
...
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