[D3D 20 bis] Improve traces + small fix

[Christian Costa]

Modified files :
dlls/ddraw/mesa.c
dlls/ddraw/d3dtexture.c

Changelog :
Improve traces + small fix

Christian Costa   titan.costa at wanadoo.fr

-------------- next part --------------
diff -u -r ../../../../winebase/wine/dlls/ddraw/d3dtexture.c ./d3dtexture.c
--- ../../../../winebase/wine/dlls/ddraw/d3dtexture.c	Sun Dec 15 15:54:58 2002
+++ ./d3dtexture.c	Sun Dec 15 16:21:17 2002
@@ -839,8 +839,8 @@
     ICOM_INIT_INTERFACE(surf, IDirect3DTexture,  VTABLE_IDirect3DTexture);
     ICOM_INIT_INTERFACE(surf, IDirect3DTexture2, VTABLE_IDirect3DTexture2);
 
+    ENTER_GL();
     if (mipmap_level == 0) {
-        ENTER_GL();
 	glGenTextures(1, &(private->tex_name));
 	if (private->tex_name == 0) ERR("Error at creation of OpenGL texture ID !\n");
 	TRACE(" GL texture created (private data at %p and GL id %d).\n", private, private->tex_name);

diff -u -r ../../../../winebase/wine/dlls/ddraw/mesa.c ./mesa.c
--- ../../../../winebase/wine/dlls/ddraw/mesa.c	Sun Dec 15 15:55:43 2002
+++ ./mesa.c	Sun Dec 15 16:17:55 2002
@@ -126,7 +126,7 @@
 			glPolygonMode(GL_FRONT_AND_BACK,GL_FILL); 
 			break;
 		    default:
-			ERR("Unhandled fill mode !\n");
+			ERR("Unhandled fill mode %ld !\n",dwRenderState);
 		 }
 	         break;
 
@@ -139,7 +139,7 @@
 			glShadeModel(GL_SMOOTH);
 			break;
 		    default:
-			ERR("Unhandled shade mode !\n");
+			ERR("Unhandled shade mode %ld !\n",dwRenderState);
 		}
 	        break;
 
@@ -166,7 +166,7 @@
 			rs->mag = GL_LINEAR;
 			break;
 		    default:
-			ERR("Unhandled texture mag !\n");
+			ERR("Unhandled texture mag %ld !\n",dwRenderState);
 	        }
 	        break;
 
@@ -179,7 +179,7 @@
 			rs->mag = GL_LINEAR;
 			break;
 		    default:
-			ERR("Unhandled texture min !\n");
+			ERR("Unhandled texture min %ld !\n",dwRenderState);
 		}
 	        break;
 
@@ -192,7 +192,7 @@
 		          rs->src = GL_SRC_ALPHA;
 			  break;
 		    default:
-			  ERR("Unhandled blend mode !\n");
+			  ERR("Unhandled blend mode %ld !\n",dwRenderState);
 		}
 	        glBlendFunc(rs->src, rs->dst);
 	        break;
@@ -206,7 +206,7 @@
 		        rs->dst = GL_ONE_MINUS_SRC_ALPHA;
 			break;
 		    default:
-			ERR("Unhandled blend mode !\n");
+			ERR("Unhandled blend mode %ld !\n",dwRenderState);
 		}
 	        glBlendFunc(rs->src, rs->dst);
 	        break;
@@ -218,7 +218,7 @@
 		          glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 			  break;
 		    default:
-			  ERR("Unhandled texture environment !\n");
+			  ERR("Unhandled texture environment %ld !\n",dwRenderState);
 		}
 	        break;
 
@@ -236,7 +236,7 @@
 			 glFrontFace(GL_CCW);
 			 break;
 		    default:
-			 ERR("Unhandled cull mode !\n");
+			 ERR("Unhandled cull mode %ld !\n",dwRenderState);
 		}
 	        break;