Alexandre Julliard : Revert "wined3d: Update detection of vertex blend capabilities."
Alexandre Julliard
julliard at winehq.org
Tue Jan 4 09:47:25 CST 2011
Module: wine
Branch: master
Commit: 8cbc6efdcad5f5e0b0eace6c6dadabdcfa5fd61f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbc6efdcad5f5e0b0eace6c6dadabdcfa5fd61f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jan 3 19:31:43 2011 +0100
Revert "wined3d: Update detection of vertex blend capabilities."
This reverts commit f41fdb225cf1e1df494237664ce92e51179f3725.
It's wrong and was committed by mistake.
---
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 2b7e5ce..da179a7 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2318,7 +2318,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter)
TRACE_(d3d_caps)("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers);
TRACE_(d3d_caps)("Max combined samplers: %u.\n", gl_info->limits.combined_samplers);
}
- if (gl_info->supported[ARB_VERTEX_BLEND] || gl_info->supported[ARB_VERTEX_PROGRAM])
+ if (gl_info->supported[ARB_VERTEX_BLEND])
{
glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max);
gl_info->limits.blends = gl_max;
More information about the wine-cvs
mailing list