commit 820b8ca0e87379acbc001e768be735d91a042fd7
author Christian Costa <titan.costa@wanadoo.fr> Mon Jan 20 23:27:08 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 20 23:27:08 2003 +0000
tree 9a6947c48cfa6fc9fa6c109a328baf92c965276e
parent 2a56437f72c052f65ec90fccadcd0d6378a44359

Handle more light states.

dlls/ddraw/d3ddevice/mesa.c

diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 0f35920..9ed79de 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -572,42 +572,65 @@
 					  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 (!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) {
-	        ENTER_GL();
-		mat->activate(mat);
-		LEAVE_GL();
-	    } else {
-	        ERR(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n");
-	    }
-	} break;
+	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 */
-	    IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7),
-					    D3DRENDERSTATE_AMBIENT,
-					    dwLightState);
-	    break;
+	    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;
+	}
 
-#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
-
-	default:
-	    TRACE("Unexpected Light State Type\n");
-	    return DDERR_INVALIDPARAMS;
+	IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7),
+	                   		rs,dwLightState);
     }
-    
+
     return DD_OK;
 }