[PATCH] WineD3D: Initialize max_combined_samplers properly=0A=

Stefan Doesinger stefan at codeweavers.com
Mon Dec 15 00:03:43 CST 2008


=0A=
Otherwise it will be 0 if GL_ARB_multitexture is not available.=0A=
---=0A=
 dlls/wined3d/directx.c |    2 +-=0A=
 1 files changed, 1 insertions(+), 1 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c=0A=
index 525a340..32e46c9 100644=0A=
--- a/dlls/wined3d/directx.c=0A=
+++ b/dlls/wined3d/directx.c=0A=
@@ -713,7 +713,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info =
*gl_info) {=0A=
     gl_info->max_texture_stages =3D 1;=0A=
     gl_info->max_fragment_samplers =3D 1;=0A=
     gl_info->max_vertex_samplers =3D 0;=0A=
-    gl_info->max_combined_samplers =3D 0;=0A=
+    gl_info->max_combined_samplers =3D gl_info->max_fragment_samplers + =
gl_info->max_vertex_samplers;=0A=
     gl_info->max_sampler_stages =3D 1;=0A=
     gl_info->ps_arb_version =3D PS_VERSION_NOT_SUPPORTED;=0A=
     gl_info->ps_arb_max_temps =3D 0;=0A=
-- =0A=
1.5.6.4=0A=
=0A=

------=_NextPart_000_0051_01C95EEF.243AD580--




More information about the wine-patches mailing list