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
d7e55c28
Commit
d7e55c28
authored
Dec 10, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 11, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move WINED3DRS_SCISSORTESTENABLE to the state table.
parent
0c1aba5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
device.c
dlls/wined3d/device.c
+1
-11
state.c
dlls/wined3d/state.c
+11
-1
No files found.
dlls/wined3d/device.c
View file @
d7e55c28
...
@@ -3424,6 +3424,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
...
@@ -3424,6 +3424,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case
WINED3DRS_WRAP14
:
case
WINED3DRS_WRAP14
:
case
WINED3DRS_WRAP15
:
case
WINED3DRS_WRAP15
:
case
WINED3DRS_MULTISAMPLEANTIALIAS
:
case
WINED3DRS_MULTISAMPLEANTIALIAS
:
case
WINED3DRS_SCISSORTESTENABLE
:
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
break
;
break
;
...
@@ -3434,17 +3435,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
...
@@ -3434,17 +3435,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
return
WINED3DERR_INVALIDCALL
;
return
WINED3DERR_INVALIDCALL
;
}
}
case
WINED3DRS_SCISSORTESTENABLE
:
{
if
(
Value
)
{
glEnable
(
GL_SCISSOR_TEST
);
checkGLcall
(
"glEnable(GL_SCISSOR_TEST)"
);
}
else
{
glDisable
(
GL_SCISSOR_TEST
);
checkGLcall
(
"glDisable(GL_SCISSOR_TEST)"
);
}
break
;
}
case
WINED3DRS_SLOPESCALEDEPTHBIAS
:
case
WINED3DRS_SLOPESCALEDEPTHBIAS
:
{
{
if
(
Value
)
{
if
(
Value
)
{
...
...
dlls/wined3d/state.c
View file @
d7e55c28
...
@@ -1115,6 +1115,16 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock)
...
@@ -1115,6 +1115,16 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock)
}
}
}
}
static
void
state_scissor
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
)
{
if
(
stateblock
->
renderState
[
WINED3DRS_SCISSORTESTENABLE
])
{
glEnable
(
GL_SCISSOR_TEST
);
checkGLcall
(
"glEnable(GL_SCISSOR_TEST)"
);
}
else
{
glDisable
(
GL_SCISSOR_TEST
);
checkGLcall
(
"glDisable(GL_SCISSOR_TEST)"
);
}
}
const
struct
StateEntry
StateTable
[]
=
const
struct
StateEntry
StateTable
[]
=
{
{
/* State name representative, apply function */
/* State name representative, apply function */
...
@@ -1296,7 +1306,7 @@ const struct StateEntry StateTable[] =
...
@@ -1296,7 +1306,7 @@ const struct StateEntry StateTable[] =
{
/*173, WINED3DRS_NORMALDEGREE */
STATE_RENDER
(
WINED3DRS_NORMALDEGREE
),
state_unknown
},
{
/*173, WINED3DRS_NORMALDEGREE */
STATE_RENDER
(
WINED3DRS_NORMALDEGREE
),
state_unknown
},
/*172, WINED3DRS_POSITIONORDER */
/* Value assigned to 2 state names */
/*172, WINED3DRS_POSITIONORDER */
/* Value assigned to 2 state names */
/*173, WINED3DRS_NORMALORDER */
/* Value assigned to 2 state names */
/*173, WINED3DRS_NORMALORDER */
/* Value assigned to 2 state names */
{
/*174, WINED3DRS_SCISSORTESTENABLE */
STATE_RENDER
(
WINED3DRS_SCISSORTESTENABLE
),
state_
unknown
},
{
/*174, WINED3DRS_SCISSORTESTENABLE */
STATE_RENDER
(
WINED3DRS_SCISSORTESTENABLE
),
state_
scissor
},
{
/*175, WINED3DRS_SLOPESCALEDEPTHBIAS */
STATE_RENDER
(
WINED3DRS_DEPTHBIAS
),
state_unknown
},
{
/*175, WINED3DRS_SLOPESCALEDEPTHBIAS */
STATE_RENDER
(
WINED3DRS_DEPTHBIAS
),
state_unknown
},
{
/*176, WINED3DRS_ANTIALIASEDLINEENABLE */
STATE_RENDER
(
WINED3DRS_ALPHABLENDENABLE
),
state_blend
},
{
/*176, WINED3DRS_ANTIALIASEDLINEENABLE */
STATE_RENDER
(
WINED3DRS_ALPHABLENDENABLE
),
state_blend
},
{
/*177, undefined */
0
,
state_undefined
},
{
/*177, undefined */
0
,
state_undefined
},
...
...
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