http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5315b79
)
wined3d: Initialize max_combined_samplers properly.
author
Stefan Dösinger
<stefan@codeweavers.com>
Sun, 14 Dec 2008 23:03:43 +0000
(
00:03
+0100)
committer
Alexandre Julliard
<julliard@winehq.org>
Tue, 16 Dec 2008 13:36:02 +0000
(14:36 +0100)
Otherwise it will be 0 if GL_ARB_multitexture is not available.
dlls/wined3d/directx.c
patch
|
blob
|
blame
|
history
diff --git
a/dlls/wined3d/directx.c
b/dlls/wined3d/directx.c
index 525a34058b1c5d60060b3bc639b25ed0b389233f..32e46c9a07ad866ed4f1ccbf989bad9f6ca40149 100644
(file)
--- 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;