Commit c301b390 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard

Improve traces + small fix.

parent 8377b9d4
...@@ -854,8 +854,8 @@ HRESULT d3dtexture_create(IDirect3DImpl *d3d, IDirectDrawSurfaceImpl *surf, BOOL ...@@ -854,8 +854,8 @@ HRESULT d3dtexture_create(IDirect3DImpl *d3d, IDirectDrawSurfaceImpl *surf, BOOL
ICOM_INIT_INTERFACE(surf, IDirect3DTexture, VTABLE_IDirect3DTexture); ICOM_INIT_INTERFACE(surf, IDirect3DTexture, VTABLE_IDirect3DTexture);
ICOM_INIT_INTERFACE(surf, IDirect3DTexture2, VTABLE_IDirect3DTexture2); ICOM_INIT_INTERFACE(surf, IDirect3DTexture2, VTABLE_IDirect3DTexture2);
if (mipmap_level == 0) {
ENTER_GL(); ENTER_GL();
if (mipmap_level == 0) {
glGenTextures(1, &(private->tex_name)); glGenTextures(1, &(private->tex_name));
if (private->tex_name == 0) ERR("Error at creation of OpenGL texture ID !\n"); 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); TRACE(" GL texture created (private data at %p and GL id %d).\n", private, private->tex_name);
......
...@@ -127,7 +127,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -127,7 +127,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glPolygonMode(GL_FRONT_AND_BACK,GL_FILL); glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
break; break;
default: default:
ERR("Unhandled fill mode !\n"); ERR("Unhandled fill mode %ld !\n",dwRenderState);
} }
break; break;
...@@ -140,7 +140,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -140,7 +140,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
break; break;
default: default:
ERR("Unhandled shade mode !\n"); ERR("Unhandled shade mode %ld !\n",dwRenderState);
} }
break; break;
...@@ -167,7 +167,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -167,7 +167,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
rs->mag = GL_LINEAR; rs->mag = GL_LINEAR;
break; break;
default: default:
ERR("Unhandled texture mag !\n"); ERR("Unhandled texture mag %ld !\n",dwRenderState);
} }
break; break;
...@@ -180,7 +180,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -180,7 +180,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
rs->mag = GL_LINEAR; rs->mag = GL_LINEAR;
break; break;
default: default:
ERR("Unhandled texture min !\n"); ERR("Unhandled texture min %ld !\n",dwRenderState);
} }
break; break;
...@@ -193,7 +193,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -193,7 +193,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
rs->src = GL_SRC_ALPHA; rs->src = GL_SRC_ALPHA;
break; break;
default: default:
ERR("Unhandled blend mode !\n"); ERR("Unhandled blend mode %ld !\n",dwRenderState);
} }
glBlendFunc(rs->src, rs->dst); glBlendFunc(rs->src, rs->dst);
break; break;
...@@ -207,7 +207,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -207,7 +207,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
rs->dst = GL_ONE_MINUS_SRC_ALPHA; rs->dst = GL_ONE_MINUS_SRC_ALPHA;
break; break;
default: default:
ERR("Unhandled blend mode !\n"); ERR("Unhandled blend mode %ld !\n",dwRenderState);
} }
glBlendFunc(rs->src, rs->dst); glBlendFunc(rs->src, rs->dst);
break; break;
...@@ -219,7 +219,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -219,7 +219,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
break; break;
default: default:
ERR("Unhandled texture environment !\n"); ERR("Unhandled texture environment %ld !\n",dwRenderState);
} }
break; break;
...@@ -237,7 +237,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, ...@@ -237,7 +237,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
glFrontFace(GL_CCW); glFrontFace(GL_CCW);
break; break;
default: default:
ERR("Unhandled cull mode !\n"); ERR("Unhandled cull mode %ld !\n",dwRenderState);
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment