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
4a078c83
Commit
4a078c83
authored
Nov 09, 2003
by
Lionel Ulmer
Committed by
Alexandre Julliard
Nov 09, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some stupid bug with missing braces.
parent
5cc4b3ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+8
-4
d3dmaterial.c
dlls/ddraw/d3dmaterial.c
+9
-11
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
4a078c83
...
...
@@ -765,17 +765,20 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
TRACE
(
"(%p/%p)->(%08x,%08lx)
\n
"
,
This
,
iface
,
dwLightStateType
,
dwLightState
);
if
(
!
dwLightStateType
&&
(
dwLightStateType
>
D3DLIGHTSTATE_COLORVERTEX
))
if
(
!
dwLightStateType
&&
(
dwLightStateType
>
D3DLIGHTSTATE_COLORVERTEX
))
{
TRACE
(
"Unexpected Light State Type
\n
"
);
return
DDERR_INVALIDPARAMS
;
}
if
(
dwLightStateType
==
D3DLIGHTSTATE_MATERIAL
/* 1 */
)
{
IDirect3DMaterialImpl
*
mat
=
(
IDirect3DMaterialImpl
*
)
dwLightState
;
if
(
mat
!=
NULL
)
{
TRACE
(
" activating material %p.
\n
"
,
mat
);
mat
->
activate
(
mat
);
}
else
{
ERR
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
return
DDERR_INVALIDPARAMS
;
}
}
else
if
(
dwLightStateType
==
D3DLIGHTSTATE_COLORMODEL
/* 3 */
)
{
switch
(
dwLightState
)
{
...
...
@@ -784,15 +787,15 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
break
;
case
D3DCOLOR_RGB
:
/* We are already in this mode */
TRACE
(
"Setting color model to RGB (no-op).
\n
"
);
break
;
default:
ERR
(
"Unknown color model!
\n
"
);
break
;
return
DDERR_INVALIDPARAMS
;
}
}
else
{
D3DRENDERSTATETYPE
rs
;
switch
(
dwLightStateType
)
{
case
D3DLIGHTSTATE_AMBIENT
:
/* 2 */
rs
=
D3DRENDERSTATE_AMBIENT
;
break
;
...
...
@@ -812,7 +815,8 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
rs
=
D3DRENDERSTATE_COLORVERTEX
;
break
;
default:
break
;
ERR
(
"Unknown D3DLIGHTSTATETYPE %d.
\n
"
,
dwLightStateType
);
return
DDERR_INVALIDPARAMS
;
}
IDirect3DDevice7_SetRenderState
(
ICOM_INTERFACE
(
This
,
IDirect3DDevice7
),
...
...
dlls/ddraw/d3dmaterial.c
View file @
4a078c83
...
...
@@ -309,17 +309,15 @@ static void activate(IDirect3DMaterialImpl* This) {
(
float
*
)
&
(
This
->
mat
.
u3
.
emissive
));
LEAVE_GL
();
if
(
TRACE_ON
(
ddraw
))
{
DPRINTF
(
" - size : %ld
\n
"
,
This
->
mat
.
dwSize
);
DPRINTF
(
" - diffuse : "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u
.
diffuse
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - ambient : "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u1
.
ambient
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - specular: "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u2
.
specular
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - emissive: "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u3
.
emissive
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - power : %f
\n
"
,
This
->
mat
.
u4
.
power
);
DPRINTF
(
" - texture handle : %08lx
\n
"
,
(
DWORD
)
This
->
mat
.
hTexture
);
}
return
;
if
(
TRACE_ON
(
ddraw
))
{
DPRINTF
(
" - size : %ld
\n
"
,
This
->
mat
.
dwSize
);
DPRINTF
(
" - diffuse : "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u
.
diffuse
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - ambient : "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u1
.
ambient
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - specular: "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u2
.
specular
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - emissive: "
);
dump_D3DCOLORVALUE
(
&
(
This
->
mat
.
u3
.
emissive
));
DPRINTF
(
"
\n
"
);
DPRINTF
(
" - power : %f
\n
"
,
This
->
mat
.
u4
.
power
);
DPRINTF
(
" - texture handle : %08lx
\n
"
,
(
DWORD
)
This
->
mat
.
hTexture
);
}
}
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
...
...
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