marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Fix handling of a special case in IWineD3DImpl_FillGLCaps() and adjust type of loop variable.

oldstable
Gerald Pfeifer 2007-12-01 02:53:10 +01:00 committed by Alexandre Julliard
parent a20f4a6bbf
commit 04cb111efc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/directx.c
View File

@ -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;