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
16e9d728
Commit
16e9d728
authored
Jan 02, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 03, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the WINED3DSHADEMODE typedef.
parent
49d811d8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
state.c
dlls/wined3d/state.c
+5
-5
stateblock.c
dlls/wined3d/stateblock.c
+1
-1
wined3d.h
include/wine/wined3d.h
+5
-6
No files found.
dlls/wined3d/state.c
View file @
16e9d728
...
...
@@ -155,19 +155,19 @@ static void state_shademode(struct wined3d_context *context, const struct wined3
{
switch
(
state
->
render_states
[
WINED3D_RS_SHADEMODE
])
{
case
WINED3DSHADE_FLAT
:
case
WINED3D
_
SHADE_FLAT
:
glShadeModel
(
GL_FLAT
);
checkGLcall
(
"glShadeModel(GL_FLAT)"
);
break
;
case
WINED3DSHADE_GOURAUD
:
case
WINED3D
_
SHADE_GOURAUD
:
glShadeModel
(
GL_SMOOTH
);
checkGLcall
(
"glShadeModel(GL_SMOOTH)"
);
break
;
case
WINED3DSHADE_PHONG
:
FIXME
(
"WINED3D
SHADE_PHONG isn't supported
\n
"
);
case
WINED3D
_
SHADE_PHONG
:
FIXME
(
"WINED3D
_SHADE_PHONG isn't supported.
\n
"
);
break
;
default:
FIXME
(
"Unrecognized
/Unhandled WINED3DSHADEMODE valu
e %#x.
\n
"
,
FIXME
(
"Unrecognized
shade mod
e %#x.
\n
"
,
state
->
render_states
[
WINED3D_RS_SHADEMODE
]);
}
}
...
...
dlls/wined3d/stateblock.c
View file @
16e9d728
...
...
@@ -1124,7 +1124,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
else
state
->
render_states
[
WINED3D_RS_ZENABLE
]
=
WINED3D_ZB_FALSE
;
state
->
render_states
[
WINED3D_RS_FILLMODE
]
=
WINED3DFILL_SOLID
;
state
->
render_states
[
WINED3D_RS_SHADEMODE
]
=
WINED3DSHADE_GOURAUD
;
state
->
render_states
[
WINED3D_RS_SHADEMODE
]
=
WINED3D
_
SHADE_GOURAUD
;
lp
.
lp
.
repeat_factor
=
0
;
lp
.
lp
.
line_pattern
=
0
;
state
->
render_states
[
WINED3D_RS_LINEPATTERN
]
=
lp
.
d
;
...
...
include/wine/wined3d.h
View file @
16e9d728
...
...
@@ -448,13 +448,12 @@ enum wined3d_fog_mode
WINED3D_FOG_LINEAR
=
3
,
};
typedef
enum
_WINED3DSHADEMODE
enum
wined3d_shade_mode
{
WINED3DSHADE_FLAT
=
1
,
WINED3DSHADE_GOURAUD
=
2
,
WINED3DSHADE_PHONG
=
3
,
WINED3DSHADE_FORCE_DWORD
=
0x7fffffff
}
WINED3DSHADEMODE
;
WINED3D_SHADE_FLAT
=
1
,
WINED3D_SHADE_GOURAUD
=
2
,
WINED3D_SHADE_PHONG
=
3
,
};
typedef
enum
_WINED3DFILLMODE
{
...
...
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