Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
820b8ca0
Commit
820b8ca0
authored
22 years ago
by
Christian Costa
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Handle more light states.
parent
2a56437f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/ddraw/d3ddevice/mesa.c
+54
-31
54 additions, 31 deletions
dlls/ddraw/d3ddevice/mesa.c
with
54 additions
and
31 deletions
dlls/ddraw/d3ddevice/mesa.c
+
54
−
31
View file @
820b8ca0
...
...
@@ -572,42 +572,65 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
DWORD
dwLightState
)
{
ICOM_THIS_FROM
(
IDirect3DDeviceImpl
,
IDirect3DDevice3
,
iface
);
TRACE
(
"(%p/%p)->(%08x,%08lx)
\n
"
,
This
,
iface
,
dwLightStateType
,
dwLightState
);
switch
(
dwLightStateType
)
{
case
D3DLIGHTSTATE_MATERIAL
:
{
/* 1 */
IDirect3DMaterialImpl
*
mat
=
(
IDirect3DMaterialImpl
*
)
dwLightState
;
if
(
mat
!=
NULL
)
{
ENTER_GL
();
mat
->
activate
(
mat
);
LEAVE_GL
();
}
else
{
ERR
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
}
}
break
;
case
D3DLIGHTSTATE_AMBIENT
:
/* 2 */
IDirect3DDevice7_SetRenderState
(
ICOM_INTERFACE
(
This
,
IDirect3DDevice7
),
D3DRENDERSTATE_AMBIENT
,
dwLightState
);
break
;
if
(
!
dwLightStateType
&&
(
dwLightStateType
>
D3DLIGHTSTATE_COLORVERTEX
))
TRACE
(
"Unexpected Light State Type
\n
"
);
return
DDERR_INVALIDPARAMS
;
if
(
dwLightStateType
==
D3DLIGHTSTATE_MATERIAL
/* 1 */
)
{
IDirect3DMaterialImpl
*
mat
=
(
IDirect3DMaterialImpl
*
)
dwLightState
;
#define UNSUP(x) case D3DLIGHTSTATE_##x: FIXME("unsupported D3DLIGHTSTATE_" #x "!\n");break;
UNSUP
(
COLORMODEL
);
UNSUP
(
FOGMODE
);
UNSUP
(
FOGSTART
);
UNSUP
(
FOGEND
);
UNSUP
(
FOGDENSITY
);
UNSUP
(
COLORVERTEX
);
#undef UNSUP
if
(
mat
!=
NULL
)
{
ENTER_GL
();
mat
->
activate
(
mat
);
LEAVE_GL
();
}
else
{
ERR
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
}
}
else
if
(
dwLightStateType
==
D3DLIGHTSTATE_COLORMODEL
/* 3 */
)
{
switch
(
dwLightState
)
{
case
D3DCOLOR_MONO
:
ERR
(
"DDCOLOR_MONO should not happend!
\n
"
);
break
;
case
D3DCOLOR_RGB
:
/* We are already in this mode */
break
;
default:
ERR
(
"Unknown color model!
\n
"
);
break
;
}
}
else
{
D3DRENDERSTATETYPE
rs
;
switch
(
dwLightStateType
)
{
case
D3DLIGHTSTATE_AMBIENT
:
/* 2 */
rs
=
D3DRENDERSTATE_AMBIENT
;
break
;
case
D3DLIGHTSTATE_FOGMODE
:
/* 4 */
rs
=
D3DRENDERSTATE_FOGVERTEXMODE
;
break
;
case
D3DLIGHTSTATE_FOGSTART
:
/* 5 */
rs
=
D3DRENDERSTATE_FOGSTART
;
break
;
case
D3DLIGHTSTATE_FOGEND
:
/* 6 */
rs
=
D3DRENDERSTATE_FOGEND
;
break
;
case
D3DLIGHTSTATE_FOGDENSITY
:
/* 7 */
rs
=
D3DRENDERSTATE_FOGDENSITY
;
break
;
case
D3DLIGHTSTATE_COLORVERTEX
:
/* 8 */
rs
=
D3DRENDERSTATE_COLORVERTEX
;
break
;
default:
break
;
}
default:
TRACE
(
"Unexpected Light State Type
\n
"
);
return
DDERR_INVALIDPARAMS
;
IDirect3DDevice7_SetRenderState
(
ICOM_INTERFACE
(
This
,
IDirect3DDevice7
),
rs
,
dwLightState
);
}
return
DD_OK
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment