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
ae10e9c5
Commit
ae10e9c5
authored
Jan 02, 2003
by
Lionel Ulmer
Committed by
Alexandre Julliard
Jan 02, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- removed some useless WARNs
- fixed backface culling and material settings
parent
f78cf542
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+5
-5
d3dmaterial.c
dlls/ddraw/d3dmaterial.c
+4
-4
d3dvertexbuffer.c
dlls/ddraw/d3dvertexbuffer.c
+1
-1
mesa.c
dlls/ddraw/mesa.c
+2
-2
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
ae10e9c5
...
...
@@ -1478,19 +1478,19 @@ GL_IDirect3DDeviceImpl_7_SetMaterial(LPDIRECT3DDEVICE7 iface,
This
->
current_material
=
*
lpMat
;
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_DIFFUSE
,
(
float
*
)
&
(
This
->
current_material
.
u
.
diffuse
));
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_AMBIENT
,
(
float
*
)
&
(
This
->
current_material
.
u1
.
ambient
));
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_SPECULAR
,
(
float
*
)
&
(
This
->
current_material
.
u2
.
specular
));
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_EMISSION
,
(
float
*
)
&
(
This
->
current_material
.
u3
.
emissive
));
glMaterialf
(
GL_FRONT
,
glMaterialf
(
GL_FRONT
_AND_BACK
,
GL_SHININESS
,
This
->
current_material
.
u4
.
power
);
/* Not sure about this... */
...
...
dlls/ddraw/d3dmaterial.c
View file @
ae10e9c5
...
...
@@ -290,19 +290,19 @@ static void activate(IDirect3DMaterialImpl* This) {
/* Set the current Material */
_dump_colorvalue
(
"Diffuse"
,
This
->
mat
.
u
.
diffuse
);
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_DIFFUSE
,
(
float
*
)
&
(
This
->
mat
.
u
.
diffuse
));
_dump_colorvalue
(
"Ambient"
,
This
->
mat
.
u1
.
ambient
);
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_AMBIENT
,
(
float
*
)
&
(
This
->
mat
.
u1
.
ambient
));
_dump_colorvalue
(
"Specular"
,
This
->
mat
.
u2
.
specular
);
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_SPECULAR
,
(
float
*
)
&
(
This
->
mat
.
u2
.
specular
));
_dump_colorvalue
(
"Emissive"
,
This
->
mat
.
u3
.
emissive
);
glMaterialfv
(
GL_FRONT
,
glMaterialfv
(
GL_FRONT
_AND_BACK
,
GL_EMISSION
,
(
float
*
)
&
(
This
->
mat
.
u3
.
emissive
));
...
...
dlls/ddraw/d3dvertexbuffer.c
View file @
ae10e9c5
...
...
@@ -110,7 +110,7 @@ Main_IDirect3DVertexBufferImpl_7_1T_Unlock(LPDIRECT3DVERTEXBUFFER7 iface)
{
ICOM_THIS_FROM
(
IDirect3DVertexBufferImpl
,
IDirect3DVertexBuffer7
,
iface
);
TRACE
(
"(%p/%p)->()
\n
"
,
This
,
iface
);
/* Nothing to do */
/* Nothing to do
here for now. Maybe some optimizations if ever we want to do some :-)
*/
return
DD_OK
;
}
...
...
dlls/ddraw/mesa.c
View file @
ae10e9c5
...
...
@@ -312,12 +312,12 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
/* Not sure about these... The DirectX doc is, well, pretty unclear :-) */
case
D3DCULL_CW
:
glEnable
(
GL_CULL_FACE
);
glFrontFace
(
GL_CW
);
glFrontFace
(
GL_C
C
W
);
glCullFace
(
GL_BACK
);
break
;
case
D3DCULL_CCW
:
glEnable
(
GL_CULL_FACE
);
glFrontFace
(
GL_C
C
W
);
glFrontFace
(
GL_CW
);
glCullFace
(
GL_BACK
);
break
;
default:
...
...
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