April 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d_device_set_ds_sampler().
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 75bc118ff220459a78f81dc599829926f18f41b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bc118ff220459a78f81dc59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:52 2017 +0200 wined3d: Introduce wined3d_device_set_ds_sampler(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 220167a..c901e9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2740,6 +2740,14 @@ void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx, view); } +void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9dc8265..9b8de3e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -130,6 +130,7 @@ @ cdecl wined3d_device_set_domain_shader(ptr ptr) @ cdecl wined3d_device_set_ds_cb(ptr long ptr) @ cdecl wined3d_device_set_ds_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_ds_sampler(ptr long ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6db8a6f..0d85cb4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2322,6 +2322,8 @@ void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, str void __cdecl wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_ds_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_ds_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_hs_sampler().
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 007e05765c4e20a0c28148eb25bb3fa7dee7ab72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007e05765c4e20a0c28148eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:50 2017 +0200 wined3d: Introduce wined3d_device_set_hs_sampler(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f5825be..220167a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2693,6 +2693,14 @@ void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx, view); } +void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_HULL, idx, sampler); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 11e7777..9dc8265 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -137,6 +137,7 @@ @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hs_cb(ptr long ptr) @ cdecl wined3d_device_set_hs_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_hs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 55a4ed9..6db8a6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2332,6 +2332,8 @@ void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_hs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_hs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);

1 0

Jactry Zeng : zh-cn: Update the Downloads page.
by Jeremy Newman April 26, 2017

April 26, 2017

Module: website Branch: master Commit: ae9d6d0f30f9f20da3ea801f360f7e412437e4cc URL: http://source.winehq.org/git/website.git/?a=commit;h=ae9d6d0f30f9f20da3ea80… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 25 10:50:04 2017 +0800 zh-cn: Update the Downloads page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/download.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 32d5b5e..a372d44 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -71,15 +71,15 @@ <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> <div class="col-md-10"> <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 供给 Ubuntu 12.04，14.04，15.04，15.10，16.04 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Ubuntu 14.04、16.04、16.10 和 17.04 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - 供给 Debian Wheezy，Jessie，Stretch 及 Sid 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Debian Wheezy、Jessie、Stretch 和 Sid 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - 供给 Fedora 22 及 23 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Fedora 24 和 25 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - 供给 Mageia 4 及 5 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Mageia 5 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - 供给 macOS 10.8 或更新版本的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 macOS 10.8 或更新版本的 WineHQ 安装包</p> </div> </div>

1 0

Michael Stefaniuc : dmscript/tests: Just use proper IUnknown implementations for aggregation.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 89ef7b59f548a76960b2278d819a8f915c81e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ef7b59f548a76960b2278d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 20:47:40 2017 +0200 dmscript/tests: Just use proper IUnknown implementations for aggregation. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 82e874c..13540ff 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -88,11 +88,7 @@ static void test_COM(void) ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScript, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dms); - todo_wine ok(hr == E_POINTER, "DirectMusicScript create failed: %08x, expected E_POINTER\n", hr); - /* An invalid non-NULL pUnkOuter crashes newer Windows versions */ + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, @@ -137,15 +133,16 @@ static void test_COM_scripttrack(void) IDirectMusicTrack *dmt; IPersistStream *ps; IUnknown *unk; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dmt); + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dmt, "dmt = %p\n", dmt); + ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER,

1 0

Hugh McMaster : regedit: Re-implement processSetValue().
by Alexandre Julliard April 25, 2017

April 25, 2017

1 0

Daniel Lehman : server: Fix copy & paste for number of subkeys.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 47df3778aa85c20a05d12f8d2869e268c8e979f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47df3778aa85c20a05d12f8d2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 25 09:46:18 2017 -0700 server: Fix copy & paste for number of subkeys. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 0731b22..734a111 100644 --- a/server/registry.c +++ b/server/registry.c @@ -568,7 +568,7 @@ static int grow_subkeys( struct key *key ) } else { - nb_subkeys = MIN_VALUES; + nb_subkeys = MIN_SUBKEYS; if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; } key->subkeys = new_subkeys;

1 0

Paul Gofman : d3dx9: Factor out free_parameter_data() function.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: bb52c5983ddb371eee5c61773e4fc7c213439ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52c5983ddb371eee5c61773… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:50 2017 +0300 d3dx9: Factor out free_parameter_data() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1fd99832..0f5e3e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -502,37 +502,8 @@ static void free_sampler(struct d3dx_sampler *sampler) HeapFree(GetProcessHeap(), 0, sampler->states); } -static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +static void free_parameter_data(struct d3dx_parameter *param, BOOL child) { - unsigned int i; - - TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, - debug_d3dxparameter_type(param->type), child ? "yes" : "no"); - - if (param->param_eval) - { - d3dx_free_param_eval(param->param_eval); - param->param_eval = NULL; - } - - if (param->annotations) - { - for (i = 0; i < param->annotation_count; ++i) - free_parameter(&param->annotations[i], FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, param->annotations); - param->annotations = NULL; - } - - if (param->members) - { - unsigned int count = param->element_count ? param->element_count : param->member_count; - - for (i = 0; i < count; ++i) - free_parameter(&param->members[i], param->element_count != 0, TRUE); - HeapFree(GetProcessHeap(), 0, param->members); - param->members = NULL; - } - if (param->class == D3DXPC_OBJECT && !param->element_count) { switch (param->type) @@ -564,12 +535,38 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil break; } } - if (!child) - { HeapFree(GetProcessHeap(), 0, param->data); +} + +static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +{ + unsigned int i; + + TRACE("Free parameter %p, name %s, type %s, element %#x, child %#x.\n", param, param->name, + debug_d3dxparameter_type(param->type), element, child); + + if (param->param_eval) + d3dx_free_param_eval(param->param_eval); + + if (param->annotations) + { + for (i = 0; i < param->annotation_count; ++i) + free_parameter(&param->annotations[i], FALSE, FALSE); + HeapFree(GetProcessHeap(), 0, param->annotations); } + if (param->members) + { + unsigned int count = param->element_count ? param->element_count : param->member_count; + + for (i = 0; i < count; ++i) + free_parameter(&param->members[i], param->element_count != 0, TRUE); + HeapFree(GetProcessHeap(), 0, param->members); + } + + free_parameter_data(param, child); + /* only the parent has to release name and semantic */ if (!element) {

1 0

Paul Gofman : d3dx9: Fix IsParameterUsed() for the case when state references child parameter.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 1bd3cc24af577f1787d630d89562f58053ba8876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd3cc24af577f1787d630d89… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:48 2017 +0300 d3dx9: Fix IsParameterUsed() for the case when state references child parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 1 + dlls/d3dx9_36/tests/effect.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8861a05..1fd99832 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3728,6 +3728,7 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ unsigned int i; unsigned int member_count; + param = param->top_level_param; if (param_func(data, param)) return TRUE; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fdbc579..9a436d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5949,16 +5949,14 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); ok(!!param, "GetParameterByName failed.\n"); + todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), "Unexpected IsParameterUsed result.\n");

1 0

Paul Gofman : d3dx9/tests: Add more tests for IsParameterUsed() function.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: bc655a40ec6c77c48347aef9e9f508f53ea7bcf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc655a40ec6c77c48347aef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:46 2017 +0300 d3dx9/tests: Add more tests for IsParameterUsed() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b1f7f3e..fdbc579 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5937,6 +5937,34 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) effect3->lpVtbl->GetFloat(effect3, param, &fvect.x); ok(fvect.x == 0.0f, "Unexpected parameter value %g.\n", fvect.x); + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect3->lpVtbl->GetParameterByName(effect3, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + todo_wine + ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + + ok(effect1->lpVtbl->IsParameterUsed(effect1, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + hr = effect3->lpVtbl->Begin(effect3, &passes_count, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Józef Kucia : wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 08e68f4fe852022622de7545ec0d3d9870ead795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e68f4fe852022622de7545e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:50 2017 +0200 wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9a9c6f..f5d4882 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3655,8 +3655,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN] = gl_max; TRACE("Max domain samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN]); } - if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) - && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS);

1 0