commit c301b39005edc6bc789483640fdf88e5b24c4d38
author Christian Costa <titan.costa@wanadoo.fr> Mon Dec 16 22:50:30 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 16 22:50:30 2002 +0000
tree 55913e45191e3c15014d4e6469923bd2bc3a6fc6
parent 8377b9d49b233fdf3f51754bd2099d3d665c587f

Improve traces + small fix.

dlls/ddraw/d3dtexture.c

diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index 07c5143..2a9ee21 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -854,8 +854,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);

dlls/ddraw/mesa.c

diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c
index 1149e74..b205c15 100644
--- a/dlls/ddraw/mesa.c
+++ b/dlls/ddraw/mesa.c
@@ -127,7 +127,7 @@
 			glPolygonMode(GL_FRONT_AND_BACK,GL_FILL); 
 			break;
 		    default:
-			ERR("Unhandled fill mode !\n");
+			ERR("Unhandled fill mode %ld !\n",dwRenderState);
 		 }
 	         break;
 
@@ -140,7 +140,7 @@
 			glShadeModel(GL_SMOOTH);
 			break;
 		    default:
-			ERR("Unhandled shade mode !\n");
+			ERR("Unhandled shade mode %ld !\n",dwRenderState);
 		}
 	        break;
 
@@ -167,7 +167,7 @@
 			rs->mag = GL_LINEAR;
 			break;
 		    default:
-			ERR("Unhandled texture mag !\n");
+			ERR("Unhandled texture mag %ld !\n",dwRenderState);
 	        }
 	        break;
 
@@ -180,7 +180,7 @@
 			rs->mag = GL_LINEAR;
 			break;
 		    default:
-			ERR("Unhandled texture min !\n");
+			ERR("Unhandled texture min %ld !\n",dwRenderState);
 		}
 	        break;
 
@@ -193,7 +193,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;
@@ -207,7 +207,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;
@@ -219,7 +219,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;
 
@@ -237,7 +237,7 @@
 			 glFrontFace(GL_CCW);
 			 break;
 		    default:
-			 ERR("Unhandled cull mode !\n");
+			 ERR("Unhandled cull mode %ld !\n",dwRenderState);
 		}
 	        break;