October 2017 - Wine-commits

Alex Henrie : quartz/tests: Fix test failures on Windows XP without upgraded DirectX.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 126e3e280e72d70af248095c15d82706d0a52a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126e3e280e72d70af248095c1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 17 23:28:57 2017 -0600 quartz/tests: Fix test failures on Windows XP without upgraded DirectX. As far as I can tell, MP3 decoding in DirectShow requires DirectX 9 or later. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a895071..6d5f8d1 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -392,8 +392,9 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) CloseHandle(handle); hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); - todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older */ - hr == VFW_E_NO_TRANSPORT, /* win7 or newer */ + todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older + DirectX 9 */ + hr == VFW_E_NO_TRANSPORT || /* win7 or newer */ + broken(hr == CLASS_E_CLASSNOTAVAILABLE), /* xp or older + DirectX 8 or older */ "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr); DeleteFileW(mp3file);

1 0

Alex Henrie : psapi/tests: Increase GetPerformanceInfo error margins for Windows 10.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: cf1bbad7144298cc7b261d612b4bcbe22b47f647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1bbad7144298cc7b261d612… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 17 23:28:35 2017 -0600 psapi/tests: Increase GetPerformanceInfo error margins for Windows 10. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index e35a7b6..50dfdd9 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -225,7 +225,7 @@ static void test_GetPerformanceInfo(void) ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 128), + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 512), "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ @@ -237,7 +237,7 @@ static void test_GetPerformanceInfo(void) ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); - ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 8), + ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 16), "expected approximately %ld but got %d\n", info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); /* compare with values from SYSTEM_BASIC_INFORMATION */

1 0

Dmitry Timoshkov : kerberos: Add a stub for Kerberos5 Authentication Package.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: e9063e1243f023e6f2e1ac93d5809b66acd3f23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9063e1243f023e6f2e1ac93d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 18 10:42:13 2017 +0800 kerberos: Add a stub for Kerberos5 Authentication Package. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 ++++++++++++++++++++++++++++++ configure.ac | 17 +++++ dlls/kerberos/Makefile.in | 5 ++ dlls/kerberos/kerberos.spec | 12 +++ dlls/kerberos/krb5_ap.c | 175 ++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++ include/ntsecapi.h | 12 +++ 7 files changed, 349 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9063e1243f023e6f2e1a…

1 0

Dmitry Timoshkov : secur32: Add an initial implementation of the authentication package manager.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: ab318438089cbdc6f952cbed0f48f97f49280430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab318438089cbdc6f952cbed0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 18 10:42:16 2017 +0800 secur32: Add an initial implementation of the authentication package manager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++--- loader/wine.inf.in | 2 +- 2 files changed, 250 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 6fa9972..1028c18 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -1,5 +1,7 @@ -/* Copyright (C) 2004 Juan Lang +/* + * Copyright (C) 2004 Juan Lang * Copyright (C) 2007 Kai Blin + * Copyright (C) 2017 Dmitry Timoshkov * * Local Security Authority functions, as far as secur32 has them. * @@ -24,26 +26,72 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winreg.h" +#include "sspi.h" #include "ntsecapi.h" +#include "ntsecpkg.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(lsa); -NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE LsaHandle, - ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer, - ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, - PULONG ReturnBufferLength, PNTSTATUS ProtocolStatus) +#define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') + +struct lsa_package { - FIXME("%p %d %p %d %p %p %p stub\n", LsaHandle, AuthenticationPackage, - ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer, - ReturnBufferLength, ProtocolStatus); - return STATUS_SUCCESS; + ULONG package_id; + HMODULE mod; + ULONG version; + LSA_STRING *name; + SECPKG_FUNCTION_TABLE *api; + ULONG table_count; +}; + +static struct lsa_package *loaded_packages; +static ULONG loaded_packages_count; + +struct lsa_connection +{ + DWORD magic; +}; + +NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id, + PVOID in_buffer, ULONG in_buffer_length, + PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) +{ + ULONG i; + + TRACE("%p,%u,%p,%u,%p,%p,%p\n", lsa_handle, package_id, in_buffer, + in_buffer_length, out_buffer, out_buffer_length, status); + + for (i = 0; i < loaded_packages_count; i++) + { + if (loaded_packages[i].package_id == package_id) + { + if (loaded_packages[i].api->CallPackageUntrusted) + return loaded_packages[i].api->CallPackageUntrusted(NULL /* FIXME*/, + in_buffer, NULL, in_buffer_length, out_buffer, out_buffer_length, status); + + return SEC_E_UNSUPPORTED_FUNCTION; + } + } + + return STATUS_INVALID_PARAMETER; } NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { - FIXME("%p stub\n", LsaHandle); + struct lsa_connection *lsa_conn; + + TRACE("%p\n", LsaHandle); + + lsa_conn = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsa_conn)); + if (!lsa_conn) return STATUS_NO_MEMORY; + + lsa_conn->magic = LSA_MAGIC; + *LsaHandle = lsa_conn; + return STATUS_SUCCESS; } @@ -92,14 +140,201 @@ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, return STATUS_SUCCESS; } -NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, - PLSA_STRING PackageName, PULONG AuthenticationPackage) +static NTSTATUS NTAPI lsa_CreateLogonSession(LUID *logon_id) +{ + FIXME("%p: stub\n", logon_id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS NTAPI lsa_DeleteLogonSession(LUID *logon_id) +{ + FIXME("%p: stub\n", logon_id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, + LSA_STRING *primary_key, LSA_STRING *credentials) +{ + FIXME("%p,%u,%p,%p: stub\n", logon_id, package_id, primary_key, credentials); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS NTAPI lsa_GetCredentials(LUID *logon_id, ULONG package_id, ULONG *context, + BOOLEAN retrieve_all, LSA_STRING *primary_key, ULONG *primary_key_len, LSA_STRING *credentials) +{ + FIXME("%p,%#x,%p,%d,%p,%p,%p: stub\n", logon_id, package_id, context, + retrieve_all, primary_key, primary_key_len, credentials); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS NTAPI lsa_DeleteCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key) +{ + FIXME("%p,%#x,%p: stub\n", logon_id, package_id, primary_key); + return STATUS_NOT_IMPLEMENTED; +} + +static void * NTAPI lsa_AllocateLsaHeap(ULONG size) +{ + TRACE("%u\n", size); + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void NTAPI lsa_FreeLsaHeap(void *p) +{ + TRACE("%p\n", p); + HeapFree(GetProcessHeap(), 0, p); +} + +static NTSTATUS NTAPI lsa_AllocateClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void **p) +{ + TRACE("%p,%u,%p\n", req, size, p); + *p = HeapAlloc(GetProcessHeap(), 0, size); + return *p ? STATUS_SUCCESS : STATUS_NO_MEMORY; +} + +static NTSTATUS NTAPI lsa_FreeClientBuffer(PLSA_CLIENT_REQUEST req, void *p) +{ + TRACE("%p,%p\n", req, p); + HeapFree(GetProcessHeap(), 0, p); + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI lsa_CopyToClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void *client, void *buf) { - FIXME("%p %p %p stub\n", LsaHandle, PackageName, AuthenticationPackage); - *AuthenticationPackage = 0; + TRACE("%p,%u,%p,%p\n", req, size, client, buf); + memcpy(client, buf, size); return STATUS_SUCCESS; } +static NTSTATUS NTAPI lsa_CopyFromClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void *buf, void *client) +{ + TRACE("%p,%u,%p,%p\n", req, size, buf, client); + memcpy(buf, client, size); + return STATUS_SUCCESS; +} + +static LSA_DISPATCH_TABLE lsa_dispatch = +{ + lsa_CreateLogonSession, + lsa_DeleteLogonSession, + lsa_AddCredential, + lsa_GetCredentials, + lsa_DeleteCredential, + lsa_AllocateLsaHeap, + lsa_FreeLsaHeap, + lsa_AllocateClientBuffer, + lsa_FreeClientBuffer, + lsa_CopyToClientBuffer, + lsa_CopyFromClientBuffer +}; + +static void add_package(struct lsa_package *package) +{ + struct lsa_package *new_loaded_packages; + + if (!loaded_packages) + new_loaded_packages = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_loaded_packages)); + else + new_loaded_packages = HeapReAlloc(GetProcessHeap(), 0, loaded_packages, sizeof(*new_loaded_packages) * (loaded_packages_count + 1)); + + if (new_loaded_packages) + { + loaded_packages = new_loaded_packages; + loaded_packages[loaded_packages_count] = *package; + loaded_packages_count++; + } +} + +static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG package_id) +{ + NTSTATUS (NTAPI *lsa_mode_init)(ULONG,PULONG,PSECPKG_FUNCTION_TABLE *, PULONG); + + package->mod = LoadLibraryW(name); + if (!package->mod) return FALSE; + + lsa_mode_init = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); + if (lsa_mode_init) + { + NTSTATUS status; + + status = lsa_mode_init(SECPKG_INTERFACE_VERSION, &package->version, &package->api, &package->table_count); + if (status == STATUS_SUCCESS) + { + status = package->api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); + if (status == STATUS_SUCCESS) + { + TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", + debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), + package->version, package->api, package->table_count); + package->package_id = package_id; + return TRUE; + } + } + } + + FreeLibrary(package->mod); + return FALSE; +} + +#define MAX_SERVICE_NAME 260 + +static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void **context) +{ + static const WCHAR LSA_KEY[] = { 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','L','s','a',0 }; + DWORD err, i; + HKEY root; + + err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, LSA_KEY, 0, KEY_READ, &root); + if (err != ERROR_SUCCESS) return FALSE; + + i = 0; + for (;;) + { + WCHAR name[MAX_SERVICE_NAME]; + struct lsa_package package; + + err = RegEnumKeyW(root, i++, name, MAX_SERVICE_NAME); + if (err == ERROR_NO_MORE_ITEMS) + break; + + if (err != ERROR_SUCCESS) + continue; + + if (!load_package(name, &package, i)) + continue; + + add_package(&package); + } + + RegCloseKey(root); + + return TRUE; +} + +NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, + PLSA_STRING package_name, PULONG package_id) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + ULONG i; + + TRACE("%p %p %p\n", lsa_handle, package_name, package_id); + + InitOnceExecuteOnce(&init_once, load_auth_packages, NULL, NULL); + + for (i = 0; i < loaded_packages_count; i++) + { + if (!RtlCompareString(loaded_packages[i].name, package_name, FALSE)) + { + *package_id = loaded_packages[i].package_id; + return STATUS_SUCCESS; + } + } + + return STATUS_UNSUCCESSFUL; /* FIXME */ +} + NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) { diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 660e87d..c965e1f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -682,7 +682,7 @@ HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 -HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,""

1 0

Nikolay Sivov : dwrite: Reuse streams when initializing font data and creating faces.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: aa9fc635140cda1caccb0bc617f780ef8f842478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9fc635140cda1caccb0bc61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 18 14:53:06 2017 +0300 dwrite: Reuse streams when initializing font data and creating faces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 126 +++++++++++++++++++------------------------ dlls/dwrite/main.c | 31 +++++++---- dlls/dwrite/opentype.c | 7 +-- 4 files changed, 83 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa9fc635140cda1caccb0…

1 0

Józef Kucia : wined3d: Unroll SM4+ pixel shader inputs.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: f75f581aa2b8f0c494a3c2c5b1cc1d9526c778c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75f581aa2b8f0c494a3c2c5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:05 2017 +0200 wined3d: Unroll SM4+ pixel shader inputs. In order to add interpolation qualifiers per shader input. Hull shader outputs are not unrolled because they can be accessed through the indexable vocp register. 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 | 67 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6a4d32a..ba89ea1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -840,7 +840,7 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 continue; } - string_buffer_sprintf(buffer, "shader_in_out.reg[%u]", e->register_idx); + string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -2124,21 +2124,53 @@ static const char *shader_glsl_shader_output_name(const struct wined3d_gl_info * } static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, - struct wined3d_string_buffer *buffer, unsigned int element_count) + struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL unroll) { + unsigned int i; + if (shader_glsl_use_interface_blocks(gl_info)) - shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); + { + if (unroll) + { + shader_addline(buffer, "in shader_in_out {\n"); + for (i = 0; i < element_count; ++i) + shader_addline(buffer, " vec4 reg%u;\n", i); + shader_addline(buffer, "} shader_in;\n"); + } + else + { + shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); + } + } else + { declare_in_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); + } } static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, - struct wined3d_string_buffer *buffer, unsigned int element_count) + struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup) { + unsigned int i; + if (shader_glsl_use_interface_blocks(gl_info)) - shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); + { + if (rasterizer_setup) + { + shader_addline(buffer, "out shader_in_out {\n"); + for (i = 0; i < element_count; ++i) + shader_addline(buffer, " vec4 reg%u;\n", i); + shader_addline(buffer, "} shader_out;\n"); + } + else + { + shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); + } + } else + { declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); + } } static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) @@ -6531,7 +6563,7 @@ static void shader_glsl_dp2add(const struct wined3d_shader_instruction *ins) static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps, - const struct ps_compile_args *args, const struct wined3d_gl_info *gl_info) + const struct ps_compile_args *args, const struct wined3d_gl_info *gl_info, BOOL unroll) { unsigned int i; @@ -6578,7 +6610,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w { if (input->sysval_semantic) FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); - shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", + shader_addline(buffer, unroll ? "ps_in[%u]%s = %s%u%s;\n" : "ps_in[%u]%s = %s[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, shader_glsl_shader_input_name(gl_info), shader->u.ps.input_reg_map[input->register_idx], reg_mask); @@ -6772,7 +6804,8 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, unsigned int input_count, const struct wined3d_shader_signature *output_signature, - const struct wined3d_shader_reg_maps *reg_maps_out, const char *output_variable_name) + const struct wined3d_shader_reg_maps *reg_maps_out, const char *output_variable_name, + BOOL rasterizer_setup) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; char reg_mask[6]; @@ -6793,7 +6826,8 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, shader_glsl_write_mask_to_str(output->mask, reg_mask); - shader_addline(buffer, "%s.reg[%u]%s = outputs[%u]%s;\n", + shader_addline(buffer, + rasterizer_setup ? "%s.reg%u%s = outputs[%u]%s;\n" : "%s.reg[%u]%s = outputs[%u]%s;\n", output_variable_name, output->register_idx, reg_mask, output->register_idx, reg_mask); } } @@ -6852,7 +6886,7 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_glsl_setup_vs3_output(priv, gl_info, map, input_signature, reg_maps_in, output_signature, reg_maps_out); else - shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "shader_out"); + shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "shader_out", TRUE); } /* Context activation is done by the caller. */ @@ -6984,7 +7018,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl { unsigned int in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); - shader_glsl_declare_shader_outputs(gl_info, buffer, in_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, in_count, FALSE); shader_addline(buffer, "void setup_vs_output(in vec4 outputs[%u])\n{\n", vs->limits->packed_output); shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, 0, &vs->output_signature, &vs->reg_maps, per_vertex_point_size); @@ -7010,7 +7044,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, input_count, rasterizer_setup); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", prefix, shader->limits->packed_output); @@ -7020,7 +7054,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); else shader_glsl_setup_sm4_shader_output(priv, input_count, &shader->output_signature, - &shader->reg_maps, "shader_out"); + &shader->reg_maps, "shader_out", rasterizer_setup); shader_addline(buffer, "}\n"); } @@ -7343,7 +7377,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (args->vp_mode == vertexshader && reg_maps->input_registers) - shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); + shader_glsl_declare_shader_inputs(gl_info, buffer, in_count, version->major >= 4); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } @@ -7474,7 +7508,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context /* Pack 3.0 inputs */ if (reg_maps->shader_version.major >= 3) - shader_glsl_input_pack(shader, buffer, &shader->input_signature, reg_maps, args, gl_info); + shader_glsl_input_pack(shader, buffer, &shader->input_signature, reg_maps, args, gl_info, + reg_maps->shader_version.major >= 4); /* Base Shader Body */ if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) @@ -7703,7 +7738,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_addline(buffer, "void setup_hs_output(in vec4 outputs[%u])\n{\n", shader->limits->packed_output); shader_glsl_setup_sm4_shader_output(priv, shader->limits->packed_output, &shader->output_signature, - &shader->reg_maps, "shader_out[gl_InvocationID]"); + &shader->reg_maps, "shader_out[gl_InvocationID]", FALSE); shader_addline(buffer, "}\n"); }

1 0

Józef Kucia : wined3d: Use GLSL 4.40 if available.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 5deb1a20c3b040658e4da456877371ecc391d5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5deb1a20c3b040658e4da4568… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:06 2017 +0200 wined3d: Use GLSL 4.40 if available. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba89ea1..45a7b98 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -386,7 +386,9 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info) { - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) + if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 40)) + return 440; + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) return 130;

1 0

Józef Kucia : wined3d: Implement interpolation mode when GLSL 4.40 is available.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 46b3a03a97f9299b9c022703523f9524f3b9124c URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b3a03a97f9299b9c0227035… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:07 2017 +0200 wined3d: Implement interpolation mode when GLSL 4.40 is available. 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 +++++++++++++++++++++++++++++---- dlls/wined3d/shader.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45a7b98..911c9fe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2125,8 +2125,25 @@ static const char *shader_glsl_shader_output_name(const struct wined3d_gl_info * return shader_glsl_use_interface_blocks(gl_info) ? "shader_out.reg" : "ps_link"; } +static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_interpolation_mode mode) +{ + switch (mode) + { + case WINED3DSIM_CONSTANT: + return "flat"; + case WINED3DSIM_LINEAR_NOPERSPECTIVE: + return "noperspective"; + default: + FIXME("Unhandled interpolation mode %#x.\n", mode); + case WINED3DSIM_NONE: + case WINED3DSIM_LINEAR: + return ""; + } +} + static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, - struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL unroll) + struct wined3d_string_buffer *buffer, unsigned int element_count, + const enum wined3d_shader_interpolation_mode *interpolation_mode, BOOL unroll) { unsigned int i; @@ -2136,7 +2153,14 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i { shader_addline(buffer, "in shader_in_out {\n"); for (i = 0; i < element_count; ++i) - shader_addline(buffer, " vec4 reg%u;\n", i); + { + const char *interpolation_qualifiers = ""; + if (shader_glsl_get_version(gl_info) >= 440) + interpolation_qualifiers = shader_glsl_interpolation_qualifiers(interpolation_mode[i]); + else if (interpolation_mode[i] && interpolation_mode[i] != WINED3DSIM_LINEAR) + FIXME("Unhandled interpolation mode %#x.\n", interpolation_mode[i]); + shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); + } shader_addline(buffer, "} shader_in;\n"); } else @@ -7379,7 +7403,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (args->vp_mode == vertexshader && reg_maps->input_registers) - shader_glsl_declare_shader_inputs(gl_info, buffer, in_count, version->major >= 4); + shader_glsl_declare_shader_inputs(gl_info, buffer, in_count, + shader->u.ps.interpolation_mode, version->major >= 4); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } @@ -10780,7 +10805,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, - /* WINED3DSIH_DCL_INPUT_PS */ NULL, + /* WINED3DSIH_DCL_INPUT_PS */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, /* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 02880b0..de58ade 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1148,6 +1148,20 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) + { + unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(shader->u.ps.interpolation_mode)) + { + ERR("Invalid register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + shader->u.ps.interpolation_mode[reg_idx] = ins.flags; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT) { if (ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUT diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4fca08d..7ffa45b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -549,6 +549,7 @@ enum wined3d_shader_dst_modifier enum wined3d_shader_interpolation_mode { + WINED3DSIM_NONE = 0, WINED3DSIM_CONSTANT = 1, WINED3DSIM_LINEAR = 2, WINED3DSIM_LINEAR_CENTROID = 3, @@ -3908,6 +3909,7 @@ struct wined3d_pixel_shader BOOL force_early_depth_stencil; enum wined3d_shader_register_type depth_output; + enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; }; struct wined3d_compute_shader

1 0

Józef Kucia : wined3d: Implement SM4+ interpolation modifiers for GLSL < 4.40.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 5189a4f13585f9e90e492ee10d0d110b654ccb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5189a4f13585f9e90e492ee10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:08 2017 +0200 wined3d: Implement SM4+ interpolation modifiers for GLSL < 4.40. 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 | 2 +- dlls/wined3d/glsl_shader.c | 36 ++++++++++++---------- dlls/wined3d/shader.c | 64 +++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 26 ++++++++++++---- 4 files changed, 86 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5189a4f13585f9e90e492…

1 0

Józef Kucia : wined3d: Pack interpolation modes.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 9cb69d91b2132876bdd3941384408bce91cf884b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb69d91b2132876bdd394138… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 18 00:25:09 2017 +0200 wined3d: Pack interpolation modes. 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 | 25 +++++++++++++++------ dlls/wined3d/shader.c | 18 ++++++++++++---- dlls/wined3d/wined3d_private.h | 49 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4aa6c5..a03f179 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2141,10 +2141,18 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte } } +static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode( + const DWORD *packed_interpolation_mode, unsigned int register_idx) +{ + return wined3d_extract_bits(packed_interpolation_mode, + register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT); +} + static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, - const enum wined3d_shader_interpolation_mode *interpolation_mode, BOOL unroll) + const DWORD *interpolation_mode, BOOL unroll) { + enum wined3d_shader_interpolation_mode mode; unsigned int i; if (shader_glsl_use_interface_blocks(gl_info)) @@ -2154,8 +2162,8 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i shader_addline(buffer, "in shader_in_out {\n"); for (i = 0; i < element_count; ++i) { - shader_addline(buffer, "%s vec4 reg%u;\n", - shader_glsl_interpolation_qualifiers(interpolation_mode[i]), i); + mode = wined3d_extract_interpolation_mode(interpolation_mode, i); + shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2172,8 +2180,9 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, - const enum wined3d_shader_interpolation_mode *interpolation_mode) + const DWORD *interpolation_mode) { + enum wined3d_shader_interpolation_mode mode; unsigned int i; if (shader_glsl_use_interface_blocks(gl_info)) @@ -2185,7 +2194,10 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ { const char *interpolation_qualifiers = ""; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) - interpolation_qualifiers = shader_glsl_interpolation_qualifiers(interpolation_mode[i]); + { + mode = wined3d_extract_interpolation_mode(interpolation_mode, i); + interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); + } shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); @@ -7063,8 +7075,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, - const enum wined3d_shader_interpolation_mode *interpolation_mode) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) { const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2c741c8..f80467b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -961,6 +961,16 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, return WINED3D_OK; } +static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, + unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) +{ + if (mode > WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE) + FIXME("Unexpected interpolation mode %#x.\n", mode); + + wined3d_insert_bits(packed_interpolation_mode, + register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT, mode); +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -1151,13 +1161,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) { unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; - if (reg_idx >= ARRAY_SIZE(shader->u.ps.interpolation_mode)) + if (reg_idx >= MAX_REG_INPUT) { ERR("Invalid register index %u.\n", reg_idx); break; } if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) - shader->u.ps.interpolation_mode[reg_idx] = ins.flags; + wined3d_insert_interpolation_mode(shader->u.ps.interpolation_mode, reg_idx, ins.flags); else FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); @@ -3400,13 +3410,13 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -static void init_interpolation_compile_args(enum wined3d_shader_interpolation_mode *interpolation_args, +static void init_interpolation_compile_args(DWORD *interpolation_args, const struct wined3d_shader *pixel_shader, const struct wined3d_gl_info *gl_info) { if (!needs_interpolation_qualifiers_for_shader_outputs(gl_info) || !pixel_shader || pixel_shader->reg_maps.shader_version.major < 4) { - memset(interpolation_args, 0, MAX_REG_INPUT * sizeof(*interpolation_args)); + memset(interpolation_args, 0, sizeof(pixel_shader->u.ps.interpolation_mode)); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26bda61..fad3fad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -561,6 +561,9 @@ enum wined3d_shader_interpolation_mode WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE = 7, }; +#define WINED3D_PACKED_INTERPOLATION_SIZE 3 +#define WINED3D_PACKED_INTERPOLATION_BIT_COUNT 3 + enum wined3d_shader_global_flags { WINED3DSGF_REFACTORING_ALLOWED = 0x1, @@ -1363,7 +1366,7 @@ struct vs_compile_args BYTE padding : 1; WORD swizzle_map; /* MAX_ATTRIBS, 16 */ unsigned int next_shader_input_count; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct ds_compile_args @@ -1374,13 +1377,13 @@ struct ds_compile_args unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; unsigned int padding : 12; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct gs_compile_args { unsigned int output_count; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_context; @@ -3916,7 +3919,7 @@ struct wined3d_pixel_shader BOOL force_early_depth_stencil; enum wined3d_shader_register_type depth_output; - enum wined3d_shader_interpolation_mode interpolation_mode[MAX_REG_INPUT]; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_compute_shader @@ -4293,6 +4296,44 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); } +static inline DWORD wined3d_extract_bits(const DWORD *bitstream, + unsigned int offset, unsigned int count) +{ + const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; + const unsigned int idx = offset / word_bit_count; + const unsigned int shift = offset % word_bit_count; + DWORD mask = (1u << count) - 1; + DWORD ret; + + ret = (bitstream[idx] >> shift) & mask; + if (shift + count > word_bit_count) + { + const unsigned int extracted_bit_count = word_bit_count - shift; + const unsigned int remaining_bit_count = count - extracted_bit_count; + mask = (1u << remaining_bit_count) - 1; + ret |= (bitstream[idx + 1] & mask) << extracted_bit_count; + } + return ret; +} + +static inline void wined3d_insert_bits(DWORD *bitstream, + unsigned int offset, unsigned int count, DWORD bits) +{ + const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; + const unsigned int idx = offset / word_bit_count; + const unsigned int shift = offset % word_bit_count; + DWORD mask = (1u << count) - 1; + + bitstream[idx] |= (bits & mask) << shift; + if (shift + count > word_bit_count) + { + const unsigned int inserted_bit_count = word_bit_count - shift; + const unsigned int remaining_bit_count = count - inserted_bit_count; + mask = (1u << remaining_bit_count) - 1; + bitstream[idx + 1] |= (bits >> inserted_bit_count) & mask; + } +} + static inline struct wined3d_surface *context_get_rt_surface(const struct wined3d_context *context) { struct wined3d_texture *texture = context->current_rt.texture;

1 0