commit c3d89f55661b3601bf21331aa2ffac92ee49ec08
author Lionel Ulmer <lionel.ulmer@free.fr> Thu Jan 02 19:45:23 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 02 19:45:23 2003 +0000
tree 93e3f62cb2171fd9b70b544a7f18eb1f40830e7a
parent 62d4f41ee87f7d04aeb7c868f50022f2237dd38f

- do not use the alpha coordinates when ALPHABLEND is disabled
- disable fogging in the XYZRHW case
- various other small fixes

dlls/ddraw/d3ddevice/mesa.c

diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 873c941..9493225 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -710,6 +710,8 @@
 	glMultMatrixf((float *) glThis->world_mat);
 	glMatrixMode(GL_PROJECTION);
 	glLoadMatrixf((float *) glThis->proj_mat);
+
+	if (glThis->render_state.fog_on == TRUE) glEnable(GL_FOG);
     } else if ((vertex_transformed == TRUE) &&
 	       ((glThis->last_vertices_transformed == FALSE) ||
 		(glThis->matrices_changed == TRUE))) {
@@ -732,6 +734,9 @@
 	glLoadIdentity();
 	glMatrixMode(GL_PROJECTION);
 	glLoadMatrixf(trans_mat);
+
+	/* Remove also fogging... */
+	glDisable(GL_FOG);
     }
     glThis->matrices_changed = FALSE;
     
@@ -936,10 +941,15 @@
 	       (*color >> 24) & 0xFF);
 }
 inline static void handle_diffuse_and_specular(DWORD *color_d, DWORD *color_s) {
-    glColor4ub((*color_d >> 16) & 0xFF,
-	       (*color_d >>  8) & 0xFF,
-	       (*color_d >>  0) & 0xFF,
-	       (*color_d >> 24) & 0xFF);
+    handle_diffuse(color_d);
+}
+inline static void handle_diffuse_no_alpha(DWORD *color) {
+    glColor3ub((*color >> 16) & 0xFF,
+	       (*color >>  8) & 0xFF,
+	       (*color >>  0) & 0xFF);
+}
+inline static void handle_diffuse_and_specular_no_alpha(DWORD *color_d, DWORD *color_s) {
+    handle_diffuse_no_alpha(color_d);
 }
 inline static void handle_texture(D3DVALUE *coords) {
     glTexCoord2fv(coords);
@@ -1005,7 +1015,10 @@
 	    D3DVALUE *position =
 	      (D3DVALUE *) (((char *) lpD3DDrawPrimStrideData->position.lpvData) + i * lpD3DDrawPrimStrideData->position.dwStride);
 
-	    handle_diffuse_and_specular(color_d, color_s);
+	    if (glThis->render_state.alpha_blend_enable == TRUE)
+	        handle_diffuse_and_specular(color_d, color_s);
+	    else
+	        handle_diffuse_and_specular_no_alpha(color_d, color_s);
 	    handle_texture(tex_coord);
 	    handle_xyzrhw(position);
 
@@ -1040,7 +1053,10 @@
 		  (DWORD *) (((char *) lpD3DDrawPrimStrideData->diffuse.lpvData) + i * lpD3DDrawPrimStrideData->diffuse.dwStride);
 		DWORD *color_s = 
 		  (DWORD *) (((char *) lpD3DDrawPrimStrideData->specular.lpvData) + i * lpD3DDrawPrimStrideData->specular.dwStride);
-		handle_diffuse_and_specular(color_d, color_s);
+		if (glThis->render_state.alpha_blend_enable == TRUE)
+		    handle_diffuse_and_specular(color_d, color_s);
+		else
+		    handle_diffuse_and_specular_no_alpha(color_d, color_s);
 	    } else {
 	        if (d3dvtVertexType & D3DFVF_SPECULAR) { 
 		    DWORD *color_s = 
@@ -1049,7 +1065,10 @@
 		} else if (d3dvtVertexType & D3DFVF_DIFFUSE) {
 		    DWORD *color_d = 
 		      (DWORD *) (((char *) lpD3DDrawPrimStrideData->diffuse.lpvData) + i * lpD3DDrawPrimStrideData->diffuse.dwStride);
-		    handle_diffuse(color_d);
+		    if (glThis->render_state.alpha_blend_enable == TRUE)
+		        handle_diffuse(color_d);
+		    else
+		        handle_diffuse_no_alpha(color_d);
 		}
 	    }
 		
@@ -1866,6 +1885,8 @@
     gl_object->render_state.min = GL_NEAREST;
     gl_object->render_state.alpha_ref = 0.0; /* No actual idea about the real default value... */
     gl_object->render_state.alpha_func = GL_ALWAYS; /* Here either but it seems logical */
+    gl_object->render_state.alpha_blend_enable = FALSE;
+    gl_object->render_state.fog_on = FALSE;
     
     /* Allocate memory for the matrices */
     gl_object->world_mat = (D3DMATRIX *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
@@ -1884,7 +1905,6 @@
     ENTER_GL();
     TRACE(" current context set\n");
     glClearColor(0.0, 0.0, 0.0, 0.0);
-    glColor3f(1.0, 1.0, 1.0);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     glDrawBuffer(buffer);
     glReadBuffer(buffer);