H. Verbeet : wined3d: Fix a few FIXME's.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 7 06:12:55 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 78a43b3dbcb3f65677171acc03af7d2a98eeae27
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78a43b3dbcb3f65677171acc03af7d2a98eeae27
Author: H. Verbeet <hverbeet at gmail.com>
Date: Mon Mar 6 23:29:03 2006 +0000
wined3d: Fix a few FIXME's.
---
dlls/wined3d/drawprim.c | 3 ++-
dlls/wined3d/pixelshader.c | 3 ++-
dlls/wined3d/vertexshader.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 4a7468b..bf5bc54 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1820,7 +1820,8 @@ UINT numberOfvertices, UINT numberOfIndi
/* check for any errors */
glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos );
if (errPos != -1) {
- FIXME("HW VertexShader Error at position: %d\n%s\n", errPos, glGetString( GL_PROGRAM_ERROR_STRING_ARB) );
+ FIXME("HW VertexShader Error at position %d: %s\n",
+ errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB)));
}
/* disable any attribs */
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 81b8bd3..f534171 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -1512,7 +1512,8 @@ inline static VOID IWineD3DPixelShaderIm
if (glGetError() == GL_INVALID_OPERATION) {
GLint errPos;
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos);
- FIXME("HW PixelShader Error at position: %d\n%s\n", errPos, glGetString(GL_PROGRAM_ERROR_STRING_ARB));
+ FIXME("HW PixelShader Error at position %d: %s\n",
+ errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB)));
This->prgId = -1;
}
}
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 32dd70f..f444ca7 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -1650,7 +1650,8 @@ inline static VOID IWineD3DVertexShaderI
if (glGetError() == GL_INVALID_OPERATION) {
GLint errPos;
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos);
- FIXME("HW VertexShader Error at position: %d\n%s\n", errPos, glGetString(GL_PROGRAM_ERROR_STRING_ARB));
+ FIXME("HW VertexShader Error at position %d: %s\n",
+ errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB)));
This->prgId = -1;
}
}
More information about the wine-cvs
mailing list