From 515eb3d7c4e57590e4978dd3466d4497f98be22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Wed, 28 Jul 2010 19:07:19 +0200 Subject: [PATCH] wined3d: MSVC fixes in state.c. --- dlls/wined3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f350914a97..d0526968463 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1459,7 +1459,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { GLfloat scaleFactor; - float h = stateblock->viewport.Height; + DWORD h = stateblock->viewport.Height; if (pointSize.f < gl_info->limits.pointsize_min) { @@ -1487,7 +1487,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } else { scaleFactor = 1.0f; } - scaleFactor = pow(h * scaleFactor, 2); + scaleFactor = powf(h * scaleFactor, 2); att[0] = A.f / scaleFactor; att[1] = B.f / scaleFactor; @@ -3600,7 +3600,7 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w IWineD3DDeviceImpl *device = stateblock->device; BOOL use_pshader = use_ps(stateblock); BOOL use_vshader = use_vs(stateblock); - int i; + unsigned int i; if (use_pshader) { if(!context->last_was_pshader) {