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
0c1aba5f
Commit
0c1aba5f
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_MULTISAMPLEANTIALIAS to the state table.
parent
81dce718
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
19 deletions
+18
-19
device.c
dlls/wined3d/device.c
+1
-18
state.c
dlls/wined3d/state.c
+17
-1
No files found.
dlls/wined3d/device.c
View file @
0c1aba5f
...
@@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
...
@@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case
WINED3DRS_WRAP13
:
case
WINED3DRS_WRAP13
:
case
WINED3DRS_WRAP14
:
case
WINED3DRS_WRAP14
:
case
WINED3DRS_WRAP15
:
case
WINED3DRS_WRAP15
:
case
WINED3DRS_MULTISAMPLEANTIALIAS
:
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
StateTable
[
STATE_RENDER
(
State
)].
apply
(
STATE_RENDER
(
State
),
This
->
stateBlock
);
break
;
break
;
...
@@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
...
@@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
return
WINED3DERR_INVALIDCALL
;
return
WINED3DERR_INVALIDCALL
;
}
}
case
WINED3DRS_MULTISAMPLEANTIALIAS
:
{
if
(
GL_SUPPORT
(
ARB_MULTISAMPLE
)
)
{
if
(
Value
)
{
glEnable
(
GL_MULTISAMPLE_ARB
);
checkGLcall
(
"glEnable(GL_MULTISAMPLE_ARB)"
);
}
else
{
glDisable
(
GL_MULTISAMPLE_ARB
);
checkGLcall
(
"glDisable(GL_MULTISAMPLE_ARB)"
);
}
}
else
{
if
(
Value
)
{
ERR
(
"Multisample antialiasing not supported by gl
\n
"
);
}
}
break
;
}
case
WINED3DRS_SCISSORTESTENABLE
:
case
WINED3DRS_SCISSORTESTENABLE
:
{
{
if
(
Value
)
{
if
(
Value
)
{
...
...
dlls/wined3d/state.c
View file @
0c1aba5f
...
@@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock) {
...
@@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock) {
}
}
}
}
static
void
state_multisampleaa
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
)
{
if
(
GL_SUPPORT
(
ARB_MULTISAMPLE
)
)
{
if
(
stateblock
->
renderState
[
WINED3DRS_MULTISAMPLEANTIALIAS
])
{
glEnable
(
GL_MULTISAMPLE_ARB
);
checkGLcall
(
"glEnable(GL_MULTISAMPLE_ARB)"
);
}
else
{
glDisable
(
GL_MULTISAMPLE_ARB
);
checkGLcall
(
"glDisable(GL_MULTISAMPLE_ARB)"
);
}
}
else
{
if
(
stateblock
->
renderState
[
WINED3DRS_MULTISAMPLEANTIALIAS
])
{
ERR
(
"Multisample antialiasing not supported by gl
\n
"
);
}
}
}
const
struct
StateEntry
StateTable
[]
=
const
struct
StateEntry
StateTable
[]
=
{
{
/* State name representative, apply function */
/* State name representative, apply function */
...
@@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] =
...
@@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] =
{
/*158, WINED3DRS_POINTSCALE_A */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*158, WINED3DRS_POINTSCALE_A */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*159, WINED3DRS_POINTSCALE_B */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*159, WINED3DRS_POINTSCALE_B */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*160, WINED3DRS_POINTSCALE_C */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*160, WINED3DRS_POINTSCALE_C */
STATE_RENDER
(
WINED3DRS_POINTSCALEENABLE
),
state_pscale
},
{
/*161, WINED3DRS_MULTISAMPLEANTIALIAS */
STATE_RENDER
(
WINED3DRS_MULTISAMPLEANTIALIAS
),
state_
unknown
},
{
/*161, WINED3DRS_MULTISAMPLEANTIALIAS */
STATE_RENDER
(
WINED3DRS_MULTISAMPLEANTIALIAS
),
state_
multisampleaa
},
{
/*162, WINED3DRS_MULTISAMPLEMASK */
STATE_RENDER
(
WINED3DRS_MULTISAMPLEMASK
),
state_unknown
},
{
/*162, WINED3DRS_MULTISAMPLEMASK */
STATE_RENDER
(
WINED3DRS_MULTISAMPLEMASK
),
state_unknown
},
{
/*163, WINED3DRS_PATCHEDGESTYLE */
STATE_RENDER
(
WINED3DRS_PATCHEDGESTYLE
),
state_unknown
},
{
/*163, WINED3DRS_PATCHEDGESTYLE */
STATE_RENDER
(
WINED3DRS_PATCHEDGESTYLE
),
state_unknown
},
{
/*164, WINED3DRS_PATCHSEGMENTS */
STATE_RENDER
(
WINED3DRS_PATCHSEGMENTS
),
state_unknown
},
{
/*164, WINED3DRS_PATCHSEGMENTS */
STATE_RENDER
(
WINED3DRS_PATCHSEGMENTS
),
state_unknown
},
...
...
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