May 2016 - Wine-Commits - list.winehq.org

Huw Davies : fonts: Fix typo in glyph name.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 6e0a4a8924c1c0b69124a21075713ae051a41064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0a4a8924c1c0b69124a2107… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 19 10:38:27 2016 +0100 fonts: Fix typo in glyph name. Reported by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/wingding.sfd | 2 +- fonts/wingding.ttf | Bin 6720 -> 6720 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 55723b4..c46152b 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -333,7 +333,7 @@ SplineSet EndSplineSet EndChar -StartChar: sqaure2 +StartChar: square2 Encoding: 160 160 14 Width: 641 Flags: W diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index b1e9d58..36539ce 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Andrew Eikum : dsound: Support downmixing quadraphonic to stereo.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 1def346bab59ac447c7f9c34528fb4490b8ed69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def346bab59ac447c7f9c345… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:16 2016 -0500 dsound: Support downmixing quadraphonic to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 +++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 3b4d2e5..d9ed637 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -252,6 +252,33 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 2: /* back left */ + value *= 0.1f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.9f; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 3: /* back right */ + value *= 0.1f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.9f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 49e98ba..63d1226 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4f05ee2..309c338 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_surround512stereo; dsb->put_aux = putieee32_sum; } + else if (ichannels == 4 && ochannels == 2) + { + dsb->mix_channels = 4; + dsb->put = put_quad2stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2)

1 0

Henri Verbeet : kernel32/nls: Persian is called Persian in English.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 49aacb478427e533f5cdc594d4e229326ced710a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49aacb478427e533f5cdc594d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:22 2016 +0200 kernel32/nls: Persian is called Persian in English. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 3fc430c..652c78f 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -1,5 +1,5 @@ /* - * Locale definitions for Farsi + * Locale definitions for Persian * * Copyright 2002 Alexandre Julliard for CodeWeavers * @@ -20,7 +20,7 @@ #pragma code_page(65001) /* UTF-8 */ -STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" LOCALE_ICALENDARTYPE "2" @@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" - LOCALE_SENGLANGUAGE "Farsi" + LOCALE_SENGLANGUAGE "Persian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "IRR" LOCALE_SISO3166CTRYNAME "IR" LOCALE_SISO639LANGNAME "fa" - LOCALE_SLANGUAGE "Farsi" + LOCALE_SLANGUAGE "Persian (Iran)" LOCALE_SLIST ";" LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "/"

1 0

Henri Verbeet : kernel32/nls: Use Persian characters to write Persian.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: e1552209310a20732e9e4561064f62af1ac2f9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1552209310a20732e9e45610… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:20 2016 +0200 kernel32/nls: Use Persian characters to write Persian. For ي and ى there's the excuse that ی doesn't exist in CP1256. There's no such excuse for using ك instead of ک. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 859239b..07e2a57 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -71,23 +71,23 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SABBREVDAYNAME4 "پنجشنبه" LOCALE_SABBREVDAYNAME5 "جمعه" LOCALE_SABBREVDAYNAME6 "شنبه" - LOCALE_SABBREVDAYNAME7 "يكشنبه" + LOCALE_SABBREVDAYNAME7 "یکشنبه" LOCALE_SABBREVLANGNAME "FAR" - LOCALE_SABBREVMONTHNAME1 "ژانويه" - LOCALE_SABBREVMONTHNAME2 "فوريه" + LOCALE_SABBREVMONTHNAME1 "ژانویه" + LOCALE_SABBREVMONTHNAME2 "فوریه" LOCALE_SABBREVMONTHNAME3 "مارس" - LOCALE_SABBREVMONTHNAME4 "آوريل" - LOCALE_SABBREVMONTHNAME5 "مى" + LOCALE_SABBREVMONTHNAME4 "آوریل" + LOCALE_SABBREVMONTHNAME5 "می" LOCALE_SABBREVMONTHNAME6 "ژوئن" - LOCALE_SABBREVMONTHNAME7 "ژوئيه" + LOCALE_SABBREVMONTHNAME7 "ژوئیه" LOCALE_SABBREVMONTHNAME8 "اوت" LOCALE_SABBREVMONTHNAME9 "سپتامبر" - LOCALE_SABBREVMONTHNAME10 "اُكتبر" + LOCALE_SABBREVMONTHNAME10 "اکتبر" LOCALE_SABBREVMONTHNAME11 "نوامبر" LOCALE_SABBREVMONTHNAME12 "دسامبر" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Iran" - LOCALE_SCURRENCY "ريال" + LOCALE_SCURRENCY "ریال" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "دوشنبه" LOCALE_SDAYNAME2 "سه شنبه" @@ -95,7 +95,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SDAYNAME4 "پنجشنبه" LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" - LOCALE_SDAYNAME7 "يكشنبه" + LOCALE_SDAYNAME7 "یکشنبه" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" @@ -109,26 +109,26 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "/" LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "ژانويه" - LOCALE_SMONTHNAME2 "فوريه" + LOCALE_SMONTHNAME1 "ژانویه" + LOCALE_SMONTHNAME2 "فوریه" LOCALE_SMONTHNAME3 "مارس" - LOCALE_SMONTHNAME4 "آوريل" - LOCALE_SMONTHNAME5 "مى" + LOCALE_SMONTHNAME4 "آوریل" + LOCALE_SMONTHNAME5 "می" LOCALE_SMONTHNAME6 "ژوئن" - LOCALE_SMONTHNAME7 "ژوئيه" + LOCALE_SMONTHNAME7 "ژوئیه" LOCALE_SMONTHNAME8 "اوت" LOCALE_SMONTHNAME9 "سپتامبر" - LOCALE_SMONTHNAME10 "اُكتبر" + LOCALE_SMONTHNAME10 "اکتبر" LOCALE_SMONTHNAME11 "نوامبر" LOCALE_SMONTHNAME12 "دسامبر" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "fa-IR" - LOCALE_SNATIVECTRYNAME "ايران" - LOCALE_SNATIVECURRNAME "رىال" + LOCALE_SNATIVECTRYNAME "ایران" + LOCALE_SNATIVECURRNAME "ریال" LOCALE_SNATIVEDIGITS L"\x06f0\x06f1\x06f2\x06f3\x06f4\x06f5\x06f6\x06f7\x06f8\x06f9" - LOCALE_SNATIVEDISPLAYNAME "فارسى (ايران)" - LOCALE_SNATIVELANGNAME "فارسى" + LOCALE_SNATIVEDISPLAYNAME "فارسی (ایران)" + LOCALE_SNATIVELANGNAME "فارسی" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "FAR " LOCALE_SPOSITIVESIGN ""

1 0

Józef Kucia : wined3d: Load color key constants after switching to ARB fixed-function program.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: f993a8e1c0a0bdfa1b686c66edc9214745843b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f993a8e1c0a0bdfa1b686c66e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:42 2016 +0200 wined3d: Load color key constants after switching to ARB fixed-function program. This seems to be missing in f84d741cb3e639018e757d2f86c23117dca7d749. 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/arb_program_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef19ca4..89dece7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6683,7 +6683,8 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi * settings, then activate it. */ gen_ffp_frag_op(context, state, &settings, FALSE); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); - if(!desc) { + if (!desc) + { struct arbfp_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); if (!new_desc) { @@ -6716,6 +6717,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi } state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + color_key_arbfp(context, state, STATE_COLOR_KEY); } context->last_was_pshader = FALSE; }

1 0

Józef Kucia : d3d10core/tests: Add tests for accessing unbound 2d array textures.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 9dde91cb244cdfc85c50a0a53b124bf90cdbb523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dde91cb244cdfc85c50a0a53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:41 2016 +0200 d3d10core/tests: Add tests for accessing unbound 2d array textures. 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/d3d10core/tests/device.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1af2e88..d30293d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4450,6 +4450,8 @@ static void test_texture(void) {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.1f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 9.0f, blue_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, #undef POINT #undef POINT_LINEAR #undef MIP_MAX @@ -4524,17 +4526,25 @@ static void test_texture(void) current_texture = test->texture; - texture_desc.Width = current_texture->width; - texture_desc.Height = current_texture->height; - texture_desc.MipLevels = current_texture->miplevel_count; - texture_desc.ArraySize = current_texture->array_size; - texture_desc.Format = current_texture->format; + if (current_texture) + { + texture_desc.Width = current_texture->width; + texture_desc.Height = current_texture->height; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); - ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); - ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + texture = NULL; + srv = NULL; + } ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); } @@ -4577,9 +4587,11 @@ static void test_texture(void) } release_texture_readback(&rb); } - ID3D10ShaderResourceView_Release(srv); + if (srv) + ID3D10ShaderResourceView_Release(srv); ID3D10SamplerState_Release(sampler); - ID3D10Texture2D_Release(texture); + if (texture) + ID3D10Texture2D_Release(texture); ID3D10PixelShader_Release(ps); ID3D10Buffer_Release(cb);

1 0

Józef Kucia : d3d11/tests: Add tests for accessing unbound 2d array textures.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: e87d51fe5d6879a206f096bf58121221880f582a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87d51fe5d6879a206f096bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:40 2016 +0200 d3d11/tests: Add tests for accessing unbound 2d array textures. 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/d3d11/tests/d3d11.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 72efa3b..04a369c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4339,6 +4339,8 @@ static void test_texture(void) {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.1f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 9.0f, blue_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, #undef POINT #undef POINT_LINEAR #undef MIP_MAX @@ -4415,17 +4417,25 @@ static void test_texture(void) current_texture = test->texture; - texture_desc.Width = current_texture->width; - texture_desc.Height = current_texture->height; - texture_desc.MipLevels = current_texture->miplevel_count; - texture_desc.ArraySize = current_texture->array_size; - texture_desc.Format = current_texture->format; + if (current_texture) + { + texture_desc.Width = current_texture->width; + texture_desc.Height = current_texture->height; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); - ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); - ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + texture = NULL; + srv = NULL; + } ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); } @@ -4468,9 +4478,11 @@ static void test_texture(void) } release_texture_readback(&rb); } - ID3D11ShaderResourceView_Release(srv); + if (srv) + ID3D11ShaderResourceView_Release(srv); ID3D11SamplerState_Release(sampler); - ID3D11Texture2D_Release(texture); + if (texture) + ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); ID3D11Buffer_Release(cb);

1 0

Józef Kucia : wined3d: Add support for 2D array texture samplers.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: b9977194850bca203eb492d960f3656188627b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9977194850bca203eb492d96… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:37 2016 +0200 wined3d: Add support for 2D array texture samplers. 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/glsl_shader.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e58262..c345d67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1860,6 +1860,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "samplerCube"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + if (shadow_sampler) + sampler_type = "sampler2DArrayShadow"; + else + sampler_type = "sampler2DArray"; + break; + default: sampler_type = "unsupported_sampler"; FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); @@ -2699,16 +2706,16 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context } resource_types[] = { - {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 0, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ - {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - {2, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - {3, 0, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - {2, 1, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - {3, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - {3, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, 0, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, 0, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, 1, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, 2, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; @@ -5492,6 +5499,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); if (gl_info->supported[EXT_GPU_SHADER4]) shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); @@ -5581,6 +5590,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); if (gl_info->supported[EXT_GPU_SHADER4]) shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -5668,6 +5679,8 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); if (gl_info->supported[EXT_GPU_SHADER4]) shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.string_buffers = string_buffers;

1 0

Andrey Gusev : wined3d: Fix a typo in a pointer in wined3d_swapchain_ops.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: b868bc4e17d1bf08b808789472994f67b0737b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b868bc4e17d1bf08b80878947… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed May 18 18:43:29 2016 +0300 wined3d: Fix a typo in a pointer in wined3d_swapchain_ops. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f00d1e5..00f34e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3033,7 +3033,7 @@ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags); - void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swaphchain); + void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; struct wined3d_swapchain

1 0

Frédéric Delanoy : include: Fix a typo in a comment.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 137ac892504d8b73734730d27cab1922ab40d5ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=137ac892504d8b73734730d27… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 21:46:03 2016 +0200 include: Fix a typo in a comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mapidefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mapidefs.h b/include/mapidefs.h index be72a95..84e0f2d 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -182,7 +182,7 @@ typedef struct _MAPIUID #define cchProfilePassMax 64 /* Maximum length of a profile password */ #endif -/* Properties: The are the contents of cells in MAPI tables, as well as the +/* Properties: These are the contents of cells in MAPI tables, as well as the * values returned when object properties are queried. */

1 0