Stefan Dösinger : wined3d: Initialize max_combined_samplers properly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4bc5e760b6545df7793f12ceb5872b9aa19f1663
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4bc5e760b6545df7793f12ceb5...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Mon Dec 15 00:03:43 2008 +0100

wined3d: Initialize max_combined_samplers properly.

Otherwise it will be 0 if GL_ARB_multitexture is not available.

---

 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 525a340..32e46c9 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -713,7 +713,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
     gl_info->max_texture_stages = 1;
     gl_info->max_fragment_samplers = 1;
     gl_info->max_vertex_samplers = 0;
-    gl_info->max_combined_samplers = 0;
+    gl_info->max_combined_samplers = gl_info->max_fragment_samplers + gl_info->max_vertex_samplers;
     gl_info->max_sampler_stages = 1;
     gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED;
     gl_info->ps_arb_max_temps = 0;