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
2e5976a8
Commit
2e5976a8
authored
Apr 01, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 02, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw.
parent
af9510f4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
device.c
dlls/ddraw/device.c
+12
-0
state.c
dlls/wined3d/state.c
+0
-8
utils.c
dlls/wined3d/utils.c
+0
-1
wined3d.idl
include/wine/wined3d.idl
+0
-1
No files found.
dlls/ddraw/device.c
View file @
2e5976a8
...
...
@@ -2441,6 +2441,11 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
Value
);
break
;
case
D3DRENDERSTATE_BORDERCOLOR
:
FIXME
(
"Unhandled render state D3DRENDERSTATE_BORDERCOLOR.
\n
"
);
hr
=
E_NOTIMPL
;
break
;
default:
/* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
hr
=
IWineD3DDevice_GetRenderState
(
This
->
wineD3DDevice
,
...
...
@@ -2723,6 +2728,13 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
Value
);
break
;
case
D3DRENDERSTATE_BORDERCOLOR
:
/* This should probably just forward to the corresponding sampler
* state. Needs tests. */
FIXME
(
"Unhandled render state D3DRENDERSTATE_BORDERCOLOR.
\n
"
);
hr
=
E_NOTIMPL
;
break
;
default:
/* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
...
...
dlls/wined3d/state.c
View file @
2e5976a8
...
...
@@ -1873,13 +1873,6 @@ static void state_stippleenable(DWORD state, IWineD3DStateBlockImpl *stateblock,
}
}
static
void
state_bordercolor
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
{
if
(
stateblock
->
renderState
[
WINED3DRS_BORDERCOLOR
])
{
FIXME
(
"Render state WINED3DRS_BORDERCOLOR not implemented yet
\n
"
);
}
}
static
void
state_mipmaplodbias
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
{
if
(
stateblock
->
renderState
[
WINED3DRS_MIPMAPLODBIAS
])
{
...
...
@@ -5528,7 +5521,6 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_PIXELSHADER
,
{
STATE_PIXELSHADER
,
apply_pixelshader
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_SRGBWRITEENABLE
),
{
STATE_PIXELSHADER
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_BORDERCOLOR
),
{
STATE_RENDER
(
WINED3DRS_BORDERCOLOR
),
state_bordercolor
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_TEXTUREFACTOR
),
{
STATE_RENDER
(
WINED3DRS_TEXTUREFACTOR
),
state_texfactor
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_FOGCOLOR
),
{
STATE_RENDER
(
WINED3DRS_FOGCOLOR
),
state_fogcolor
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_FOGDENSITY
),
{
STATE_RENDER
(
WINED3DRS_FOGDENSITY
),
state_fogdensity
},
WINED3D_GL_EXT_NONE
},
...
...
dlls/wined3d/utils.c
View file @
2e5976a8
...
...
@@ -1533,7 +1533,6 @@ const char* debug_d3drenderstate(DWORD state) {
D3DSTATE_TO_STR
(
WINED3DRS_STIPPLEENABLE
);
D3DSTATE_TO_STR
(
WINED3DRS_EDGEANTIALIAS
);
D3DSTATE_TO_STR
(
WINED3DRS_COLORKEYENABLE
);
D3DSTATE_TO_STR
(
WINED3DRS_BORDERCOLOR
);
D3DSTATE_TO_STR
(
WINED3DRS_MIPMAPLODBIAS
);
D3DSTATE_TO_STR
(
WINED3DRS_ZBIAS
);
D3DSTATE_TO_STR
(
WINED3DRS_RANGEFOGENABLE
);
...
...
include/wine/wined3d.idl
View file @
2e5976a8
...
...
@@ -315,7 +315,6 @@ typedef enum _WINED3DRENDERSTATETYPE
WINED3DRS_STIPPLEENABLE
=
39
,
/*
d3d7
*/
WINED3DRS_EDGEANTIALIAS
=
40
,
/*
d3d7
,
d3d8
*/
WINED3DRS_COLORKEYENABLE
=
41
,
/*
d3d7
*/
WINED3DRS_BORDERCOLOR
=
43
,
/*
d3d7
*/
WINED3DRS_MIPMAPLODBIAS
=
46
,
/*
d3d7
*/
WINED3DRS_ZBIAS
=
47
,
/*
d3d7
,
d3d8
*/
WINED3DRS_RANGEFOGENABLE
=
48
,
...
...
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