Michael Stefaniuc : wined3d: Fix some checkGLcall() messages.
Alexandre Julliard
julliard at winehq.org
Fri Nov 5 13:47:18 CDT 2010
Module: wine
Branch: master
Commit: 1183383a6ff8db5cee85848c83336a0fa5e67e73
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1183383a6ff8db5cee85848c83336a0fa5e67e73
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Nov 5 11:17:51 2010 +0100
wined3d: Fix some checkGLcall() messages.
---
dlls/wined3d/basetexture.c | 2 +-
dlls/wined3d/context.c | 2 +-
dlls/wined3d/drawprim.c | 2 +-
dlls/wined3d/state.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index e49ba21..7461adf 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -425,7 +425,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
D3DCOLORTOGLFLOAT4(state, col);
TRACE("Setting border color for %u to %x\n", textureDimensions, state);
glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]);
- checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)");
+ checkGLcall("glTexParameterfv(..., GL_TEXTURE_BORDER_COLOR, ...)");
gl_tex->states[WINED3DTEXSTA_BORDERCOLOR] = state;
}
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 618ccd4..b615a76 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1758,7 +1758,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,
GL_TEXTURE_LOD_BIAS_EXT,
0.0f);
- checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ...");
+ checkGLcall("glTexEnvf GL_TEXTURE_LOD_BIAS_EXT ...");
}
if (sampler != WINED3D_UNMAPPED_STAGE)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 6b6102b..4804ced 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -842,7 +842,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This,
glMatrixMode(GL_PROJECTION);
checkGLcall("glMatrixMode(GL_PROJECTION)");
glLoadIdentity();
- checkGLcall("glLoadIndentity()");
+ checkGLcall("glLoadIdentity()");
glScalef(1.0f / (max_x), 1.0f / (max_y), max_z == 0.0f ? 1.0f : 1.0f / (2.0f * max_z));
glTranslatef(0.0f, 0.0f, 0.5f);
checkGLcall("glScalef");
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 9e0df6a..81a505d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3656,7 +3656,7 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,
GL_TEXTURE_LOD_BIAS_EXT,
tmpvalue.f);
- checkGLcall("glTexEnvi(GL_TEXTURE_LOD_BIAS_EXT, ...)");
+ checkGLcall("glTexEnvf(GL_TEXTURE_LOD_BIAS_EXT, ...)");
}
if (!use_ps(state) && sampler < state->lowest_disabled_stage)
@@ -4387,7 +4387,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB
{
static const GLbyte one = 1;
GL_EXTCALL(glWeightbvARB(1, &one));
- checkGLcall("glWeightivARB(gl_info->max_blends, weights)");
+ checkGLcall("glWeightbvARB(gl_info->max_blends, weights)");
}
}
More information about the wine-cvs
mailing list