Gerald Pfeifer : wined3d: Fix handling of a special case in IWineD3DImpl_FillGLCaps() and adjust type of loop variable.
Alexandre Julliard
julliard at winehq.org
Mon Dec 3 09:17:47 CST 2007
Module: wine
Branch: master
Commit: 04cb111efc50c3169463c446a634276b1c0e87e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cb111efc50c3169463c446a634276b1c0e87e8
Author: Gerald Pfeifer <gerald at pfeifer.com>
Date: Sat Dec 1 02:53:10 2007 +0100
wined3d: Fix handling of a special case in IWineD3DImpl_FillGLCaps() and adjust type of loop variable.
---
dlls/wined3d/directx.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e4b5bdf..7b4ab8f 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -464,7 +464,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
GLfloat gl_floatv[2];
int major = 1, minor = 0;
BOOL return_value = TRUE;
- int i;
+ unsigned i;
HDC hdc;
unsigned int vidmem=0;
@@ -792,7 +792,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n",
gl_info->max_vertex_samplers, gl_info->max_combined_samplers);
FIXME("Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers\n");
- gl_info->max_vertex_samplers = max(0, gl_info->max_combined_samplers - MAX_TEXTURES);
+ if( gl_info->max_combined_samplers > MAX_TEXTURES )
+ gl_info->max_vertex_samplers =
+ gl_info->max_combined_samplers - MAX_TEXTURES;
+ else
+ gl_info->max_vertex_samplers = 0;
}
} else {
gl_info->max_combined_samplers = gl_info->max_fragment_samplers;
More information about the wine-cvs
mailing list