Chris Robinson : wined3d: Prevent erroneous FIXMEs on newer cards.
Alexandre Julliard
julliard at winehq.org
Mon May 25 10:06:30 CDT 2009
Module: wine
Branch: master
Commit: 1d757fd6da5e5cbd57396ad0c42de78e2d7c4820
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d757fd6da5e5cbd57396ad0c42de78e2d7c4820
Author: Chris Robinson <chris.kcat at gmail.com>
Date: Sun May 10 14:17:43 2009 -0700
wined3d: Prevent erroneous FIXMEs on newer cards.
Cards that have 12 or more combined samplers can trigger a fixme if they have
the same amount of vertex samplers, even though it's plenty enough.
---
dlls/wined3d/directx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 46c1556..5ce84cd 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -901,7 +901,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
* So this is just a check to check that our assumption holds true. If not, write a warning
* and reduce the number of vertex samplers or probably disable vertex texture fetch.
*/
- if(gl_info->max_vertex_samplers &&
+ if(gl_info->max_vertex_samplers && gl_info->max_combined_samplers < 12 &&
MAX_TEXTURES + gl_info->max_vertex_samplers > gl_info->max_combined_samplers) {
FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n",
gl_info->max_vertex_samplers, gl_info->max_combined_samplers);
More information about the wine-cvs
mailing list