wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

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

19 May '16

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 ZWNJ where appropriate in far.nls.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: d5620dd54bdaa739f41ca6a7cb95da0ce7c1e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5620dd54bdaa739f41ca6a7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:21 2016 +0200 kernel32/nls: Use ZWNJ where appropriate in far.nls. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 07e2a57..3fc430c 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -66,12 +66,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_S2359 "ب.ظ" LOCALE_SABBREVCTRYNAME "IRN" LOCALE_SABBREVDAYNAME1 "دوشنبه" - LOCALE_SABBREVDAYNAME2 "سه شنبه" + LOCALE_SABBREVDAYNAME2 "سه‌شنبه" LOCALE_SABBREVDAYNAME3 "چهارشنبه" - LOCALE_SABBREVDAYNAME4 "پنجشنبه" + LOCALE_SABBREVDAYNAME4 "پنج‌شنبه" LOCALE_SABBREVDAYNAME5 "جمعه" LOCALE_SABBREVDAYNAME6 "شنبه" - LOCALE_SABBREVDAYNAME7 "یکشنبه" + LOCALE_SABBREVDAYNAME7 "یک‌شنبه" LOCALE_SABBREVLANGNAME "FAR" LOCALE_SABBREVMONTHNAME1 "ژانویه" LOCALE_SABBREVMONTHNAME2 "فوریه" @@ -90,12 +90,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SCURRENCY "ریال" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "دوشنبه" - LOCALE_SDAYNAME2 "سه شنبه" + LOCALE_SDAYNAME2 "سه‌شنبه" LOCALE_SDAYNAME3 "چهارشنبه" - LOCALE_SDAYNAME4 "پنجشنبه" + LOCALE_SDAYNAME4 "پنج‌شنبه" LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" - LOCALE_SDAYNAME7 "یکشنبه" + LOCALE_SDAYNAME7 "یک‌شنبه" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial"

1 0

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

19 May '16

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

Henri Verbeet : kernel32/nls: Persian uses a right-to-left writing system.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: f2af3b9b57e45ff121656a339759bdc1b4193b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2af3b9b57e45ff121656a339… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:19 2016 +0200 kernel32/nls: Persian uses a right-to-left writing system. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index fa71dc0..859239b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" - LOCALE_IREADINGLAYOUT "0" + LOCALE_IREADINGLAYOUT "1" LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1"

1 0

Henri Verbeet : usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved ().
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 71cabaa4b93f040e16519c6f8253673480995ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cabaa4b93f040e16519c6f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:18 2016 +0200 usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved(). As in section 5.2 of the Unicode Bidirectional Algorithm. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 5 +++++ dlls/usp10/tests/usp10.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index caa266b..5adce9d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -969,6 +969,11 @@ static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, plevel[j--] = baselevel; plevel[i] = baselevel; } + else if (pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || pcls[i] == RLO || + pcls[i] == PDF || pcls[i] == BN) + { + plevel[i] = i ? plevel[i - 1] : baselevel; + } if (i == eos && (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7881667..d0c698f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -563,6 +563,11 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},2,0,1,0,1,0,FALSE}, {{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; + /* ZWNJ */ + static const WCHAR test56[] = {0x0645, 0x06cc, 0x200c, 0x06a9, 0x0646, 0x0645}; /* می‌کنم */ + static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -643,6 +648,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); + test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -705,6 +711,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t531,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -759,6 +766,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -814,6 +822,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -878,6 +887,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t532,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

1 0

Józef Kucia : d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: d283c5b68e078233cd1e69c1b16d3577af2cc448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283c5b68e078233cd1e69c1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:45 2016 +0200 d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData(). 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/d3d9/device.c | 3 +++ dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dd7f46a..4bbdd42 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1279,6 +1279,9 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); + if (!render_target || !dst_surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); dst_rect.left = 0; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8860bce..4302f76 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11122,6 +11122,55 @@ done: DestroyWindow(window); } +static void test_get_render_target_data(void) +{ + IDirect3DSurface9 *offscreen_surface, *render_target; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &offscreen_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create offscreen surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &render_target, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, offscreen_surface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, offscreen_surface); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(render_target); + IDirect3DSurface9_Release(offscreen_surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11237,6 +11286,7 @@ START_TEST(device) test_swapchain_parameters(); test_check_device_format(); test_miptree_layout(); + test_get_render_target_data(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : wined3d: Use bit fields instead of BOOL arrays.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 57788849fdcee55db551c8134aaf0811c316d61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57788849fdcee55db551c8134… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:44 2016 +0200 wined3d: Use bit fields instead of BOOL arrays. 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 | 96 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8d17788..0fb2f67 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6378,22 +6378,17 @@ static const char *arbfp_texture_target(enum wined3d_gl_resource_type type) static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { - unsigned int stage; + BYTE tex_read = 0, bump_used = 0, luminance_used = 0, constant_used = 0; + BOOL tempreg_used = FALSE, tfactor_used = FALSE; + unsigned int stage, lowest_disabled_stage; struct wined3d_string_buffer buffer; - BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL bump_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL constant_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - UINT lowest_disabled_stage; - const char *textype; - const char *instr; - char colorcor_dst[8]; - GLuint ret; + struct color_fixup_masks masks; + BOOL custom_linear_fog = FALSE; + const char *textype, *instr; DWORD arg0, arg1, arg2; - BOOL tempreg_used = FALSE, tfactor_used = FALSE; + char colorcor_dst[8]; BOOL op_equal; - BOOL custom_linear_fog = FALSE; - struct color_fixup_masks masks; + GLuint ret; if (!string_buffer_init(&buffer)) { @@ -6407,7 +6402,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con { shader_addline(&buffer, "PARAM color_key_low = program.env[%u];\n", ARB_FFP_CONST_COLOR_KEY_LOW); shader_addline(&buffer, "PARAM color_key_high = program.env[%u];\n", ARB_FFP_CONST_COLOR_KEY_HIGH); - tex_read[0] = TRUE; + tex_read |= 1; } /* Find out which textures are read */ @@ -6415,56 +6410,58 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con { if (settings->op[stage].cop == WINED3D_TOP_DISABLE) break; + arg0 = settings->op[stage].carg0 & WINED3DTA_SELECTMASK; arg1 = settings->op[stage].carg1 & WINED3DTA_SELECTMASK; arg2 = settings->op[stage].carg2 & WINED3DTA_SELECTMASK; - if (arg0 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg1 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg2 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - - if (settings->op[stage].cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA) - tex_read[stage] = TRUE; - if (settings->op[stage].cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM) - tex_read[stage] = TRUE; - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP) - { - bump_used[stage] = TRUE; - tex_read[stage] = TRUE; - } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - { - bump_used[stage] = TRUE; - tex_read[stage] = TRUE; - luminance_used[stage] = TRUE; - } - else if (settings->op[stage].cop == WINED3D_TOP_BLEND_FACTOR_ALPHA) - { - tfactor_used = TRUE; - } - if (settings->op[stage].dst == tempreg) tempreg_used = TRUE; + if (arg0 == WINED3DTA_TEXTURE || arg1 == WINED3DTA_TEXTURE || arg2 == WINED3DTA_TEXTURE) + tex_read |= 1u << stage; + if (settings->op[stage].dst == tempreg) + tempreg_used = TRUE; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; if (arg0 == WINED3DTA_TFACTOR || arg1 == WINED3DTA_TFACTOR || arg2 == WINED3DTA_TFACTOR) tfactor_used = TRUE; if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) - constant_used[stage] = TRUE; + constant_used |= 1u << stage; + + switch (settings->op[stage].cop) + { + case WINED3D_TOP_BUMPENVMAP_LUMINANCE: + luminance_used |= 1u << stage; + /* fall through */ + case WINED3D_TOP_BUMPENVMAP: + bump_used |= 1u << stage; + /* fall through */ + case WINED3D_TOP_BLEND_TEXTURE_ALPHA: + case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: + tex_read |= 1u << stage; + break; + + case WINED3D_TOP_BLEND_FACTOR_ALPHA: + tfactor_used = TRUE; + break; + + default: + break; + } if (settings->op[stage].aop == WINED3D_TOP_DISABLE) continue; + arg0 = settings->op[stage].aarg0 & WINED3DTA_SELECTMASK; arg1 = settings->op[stage].aarg1 & WINED3DTA_SELECTMASK; arg2 = settings->op[stage].aarg2 & WINED3DTA_SELECTMASK; - if (arg0 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg1 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg2 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; + if (arg0 == WINED3DTA_TEXTURE || arg1 == WINED3DTA_TEXTURE || arg2 == WINED3DTA_TEXTURE) + tex_read |= 1u << stage; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; if (arg0 == WINED3DTA_TFACTOR || arg1 == WINED3DTA_TFACTOR || arg2 == WINED3DTA_TFACTOR) tfactor_used = TRUE; if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) - constant_used[stage] = TRUE; + constant_used |= 1u << stage; } lowest_disabled_stage = stage; @@ -6494,25 +6491,24 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "TEMP arg2;\n"); for (stage = 0; stage < MAX_TEXTURES; ++stage) { - if (constant_used[stage]) + if (constant_used & (1u << stage)) shader_addline(&buffer, "PARAM const%u = program.env[%u];\n", stage, ARB_FFP_CONST_CONSTANT(stage)); - if (!tex_read[stage]) + if (!(tex_read & (1u << stage))) continue; shader_addline(&buffer, "TEMP tex%u;\n", stage); - if (!bump_used[stage]) + if (!(bump_used & (1u << stage))) continue; shader_addline(&buffer, "PARAM bumpmat%u = program.env[%u];\n", stage, ARB_FFP_CONST_BUMPMAT(stage)); - if (!luminance_used[stage]) + if (!(luminance_used & (1u << stage))) continue; shader_addline(&buffer, "PARAM luminance%u = program.env[%u];\n", stage, ARB_FFP_CONST_LUMINANCE(stage)); } - if(tfactor_used) { + if (tfactor_used) shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); - } shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if (settings->sRGB_write) @@ -6534,7 +6530,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { - if (!tex_read[stage]) + if (!(tex_read & (1u << stage))) continue; textype = arbfp_texture_target(settings->op[stage].tex_type);

1 0

Józef Kucia : wined3d: Implement texture stage constants in ARB program shader backend.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: e62763972eded04e60370e00ba61d00e14404db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62763972eded04e60370e00b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:43 2016 +0200 wined3d: Implement texture stage constants in ARB program shader backend. 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 | 131 ++++++++++++++++++++++++++------------ 1 file changed, 90 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e62763972eded04e60370…

1 0

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

19 May '16

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 : wined3d: Forbid to create BC{1, 2, 3}_UNORM_SRGB 3D textures.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: f9705e3c6cb3592295e4ec4d3d7284f03c0b6055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9705e3c6cb3592295e4ec4d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:42 2016 +0200 wined3d: Forbid to create BC{1, 2, 3}_UNORM_SRGB 3D 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/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cbfd368..8769bd7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3072,10 +3072,16 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC1_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC2_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC3_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016