March 2015 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Properly up-scale WINED3DFMT_R5G5_SNORM_L6_UNORM.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: ce836bf6516389725b26b853deb4109682605e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce836bf6516389725b26b853d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:35 2015 +0100 wined3d: Properly up-scale WINED3DFMT_R5G5_SNORM_L6_UNORM. --- dlls/wined3d/utils.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1ce23ac..5f35ffb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -322,8 +322,8 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { unsigned int x, y, z; - const WORD *Source; - unsigned char *Dest; + unsigned char *texel_out, ds_out, dt_out, r_in, g_in, l_in; + const unsigned short *texel_in; /* This makes the gl surface bigger(24 bit instead of 16), but it works with * fixed function and shaders without further conversion once the surface is @@ -333,27 +333,28 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ { for (y = 0; y < height; y++) { - Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); - Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = dst + z * dst_slice_pitch + y * dst_row_pitch; for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - char v = ((color >> 5) & 0x3e); - char u = ((color ) & 0x1f); + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; - /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign - * and doubles the positive range. Thus shift left only once, gl does the 2nd - * shift. GL reads a signed value and converts it into an unsigned value. - */ - /* M */ Dest[2] = l << 1; + ds_out = r_in << 3; + if (!(r_in & 0x10)) /* r > 0 */ + ds_out |= r_in >> 1; - /* Those are read as signed, but kept signed. Just left-shift 3 times to scale - * from 5 bit values to 8 bit values. - */ - /* V */ Dest[1] = v << 3; - /* U */ Dest[0] = u << 3; - Dest += 3; + dt_out = g_in << 3; + if (!(g_in & 0x10)) /* g > 0 */ + dt_out |= g_in >> 1; + + texel_out[0] = ds_out; + texel_out[1] = dt_out; + texel_out[2] = l_in << 1 | l_in >> 5; + + texel_out += 3; + texel_in++; } } }

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_SetPrivateData().
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 21d94883bcd8da242871f45d023e0ece724dacaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d94883bcd8da242871f45d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:57 2015 +0100 d3d10core: Implement d3d10_sampler_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 278e0db..51d021b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -296,6 +296,7 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; struct wine_rb_entry entry; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 4d4c5ea..3e684f5 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -552,6 +552,7 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i wined3d_sampler_decref(state->wined3d_sampler); wine_rb_remove(&device->sampler_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -582,10 +583,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10Sample static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10SamplerState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, @@ -667,6 +670,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; wined3d_desc.address_u = wined3d_texture_address_from_d3d10core(desc->AddressU); @@ -687,6 +691,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); return hr; } @@ -694,6 +699,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 { ERR("Failed to insert sampler state entry.\n"); wined3d_sampler_decref(state->wined3d_sampler); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Michael Stefaniuc : ws2_32: Avoid using bitwise operations on BOOLs ( PVS-Studio).
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 58afc397cb27dc9e8790c53cc7e9d5d4bdd6672e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58afc397cb27dc9e8790c53cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 10 10:20:02 2015 +0100 ws2_32: Avoid using bitwise operations on BOOLs (PVS-Studio). --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b4ed865..a9f60cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3938,7 +3938,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID * because BSD returns TRUE if it's in the OOB mark * while Windows returns TRUE if there are NO OOB bytes. */ - (*(WS_u_long *) out_buff) = oob | !atmark; + (*(WS_u_long *) out_buff) = oob || !atmark; } release_sock_fd( s, fd );

1 0

Sebastian Lackner : ntdll: Move static threadpool variables into a struct.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: ae309c2d00e9abba30bb32fc52be3e571c4f5ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae309c2d00e9abba30bb32fc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 5 14:25:32 2015 +0100 ntdll: Move static threadpool variables into a struct. --- dlls/ntdll/threadpool.c | 99 ++++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index fef26fe..7f2ed65 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -39,32 +39,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(threadpool); #define WORKER_TIMEOUT 30000 /* 30 seconds */ -/* threadpool_cs must be held while modifying the following elements */ -static struct list work_item_list = LIST_INIT(work_item_list); -static LONG num_workers; -static LONG num_busy_workers; -static LONG num_items_processed; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug; +static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug; -static RTL_CONDITION_VARIABLE threadpool_cond = RTL_CONDITION_VARIABLE_INIT; +static struct +{ + /* threadpool_cs must be held while modifying the following four elements */ + struct list work_item_list; + LONG num_workers; + LONG num_busy_workers; + LONG num_items_processed; + RTL_CONDITION_VARIABLE threadpool_cond; + RTL_CRITICAL_SECTION threadpool_cs; + HANDLE compl_port; + RTL_CRITICAL_SECTION threadpool_compl_cs; +} +old_threadpool = +{ + LIST_INIT(old_threadpool.work_item_list), /* work_item_list */ + 0, /* num_workers */ + 0, /* num_busy_workers */ + 0, /* num_items_processed */ + RTL_CONDITION_VARIABLE_INIT, /* threadpool_cond */ + { &critsect_debug, -1, 0, 0, 0, 0 }, /* threadpool_cs */ + NULL, /* compl_port */ + { &critsect_compl_debug, -1, 0, 0, 0, 0 }, /* threadpool_compl_cs */ +}; -static RTL_CRITICAL_SECTION threadpool_cs; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { - 0, 0, &threadpool_cs, + 0, 0, &old_threadpool.threadpool_cs, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } }; -static RTL_CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static HANDLE compl_port = NULL; -static RTL_CRITICAL_SECTION threadpool_compl_cs; static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug = { - 0, 0, &threadpool_compl_cs, + 0, 0, &old_threadpool.threadpool_compl_cs, { &critsect_compl_debug.ProcessLocksList, &critsect_compl_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_compl_cs") } }; -static RTL_CRITICAL_SECTION threadpool_compl_cs = { &critsect_compl_debug, -1, 0, 0, 0, 0 }; struct work_item { @@ -90,18 +104,18 @@ static void WINAPI worker_thread_proc(void * param) LARGE_INTEGER timeout; timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); - RtlEnterCriticalSection( &threadpool_cs ); - num_workers++; + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + old_threadpool.num_workers++; for (;;) { - if ((item = list_head( &work_item_list ))) + if ((item = list_head( &old_threadpool.work_item_list ))) { work_item_ptr = LIST_ENTRY( item, struct work_item, entry ); list_remove( &work_item_ptr->entry ); - num_busy_workers++; - num_items_processed++; - RtlLeaveCriticalSection( &threadpool_cs ); + old_threadpool.num_busy_workers++; + old_threadpool.num_items_processed++; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); /* copy item to stack and do the work */ work_item = *work_item_ptr; @@ -109,15 +123,18 @@ static void WINAPI worker_thread_proc(void * param) TRACE("executing %p(%p)\n", work_item.function, work_item.context); work_item.function( work_item.context ); - RtlEnterCriticalSection( &threadpool_cs ); - num_busy_workers--; + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + old_threadpool.num_busy_workers--; } - else if (RtlSleepConditionVariableCS( &threadpool_cond, &threadpool_cs, &timeout ) != STATUS_SUCCESS) + else if (RtlSleepConditionVariableCS( &old_threadpool.threadpool_cond, + &old_threadpool.threadpool_cs, &timeout ) != STATUS_SUCCESS) + { break; + } } - num_workers--; - RtlLeaveCriticalSection( &threadpool_cs ); + old_threadpool.num_workers--; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); RtlExitUserThread( 0 ); /* never reached */ @@ -161,16 +178,17 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, if (Flags & ~WT_EXECUTELONGFUNCTION) FIXME("Flags 0x%x not supported\n", Flags); - RtlEnterCriticalSection( &threadpool_cs ); - list_add_tail( &work_item_list, &work_item->entry ); - status = (num_workers > num_busy_workers) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - items_processed = num_items_processed; - RtlLeaveCriticalSection( &threadpool_cs ); + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + list_add_tail( &old_threadpool.work_item_list, &work_item->entry ); + status = (old_threadpool.num_workers > old_threadpool.num_busy_workers) ? + STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + items_processed = old_threadpool.num_items_processed; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); /* FIXME: tune this algorithm to not be as aggressive with creating threads * if WT_EXECUTELONGFUNCTION isn't specified */ if (status == STATUS_SUCCESS) - RtlWakeConditionVariable( &threadpool_cond ); + RtlWakeConditionVariable( &old_threadpool.threadpool_cond ); else { status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, @@ -182,12 +200,15 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, NtClose( thread ); else { - RtlEnterCriticalSection( &threadpool_cs ); - if (num_workers > 0 || num_items_processed != items_processed) + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + if (old_threadpool.num_workers > 0 || + old_threadpool.num_items_processed != items_processed) + { status = STATUS_SUCCESS; + } else list_remove( &work_item->entry ); - RtlLeaveCriticalSection( &threadpool_cs ); + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); if (status != STATUS_SUCCESS) RtlFreeHeap( GetProcessHeap(), 0, work_item ); @@ -253,12 +274,12 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO if (Flags) FIXME("Unknown value Flags=0x%x\n", Flags); - if (!compl_port) + if (!old_threadpool.compl_port) { NTSTATUS res = STATUS_SUCCESS; - RtlEnterCriticalSection(&threadpool_compl_cs); - if (!compl_port) + RtlEnterCriticalSection(&old_threadpool.threadpool_compl_cs); + if (!old_threadpool.compl_port) { HANDLE cport; @@ -268,16 +289,16 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO /* FIXME native can start additional threads in case of e.g. hung callback function. */ res = RtlQueueWorkItem( iocp_poller, cport, WT_EXECUTEDEFAULT ); if (!res) - compl_port = cport; + old_threadpool.compl_port = cport; else NtClose( cport ); } } - RtlLeaveCriticalSection(&threadpool_compl_cs); + RtlLeaveCriticalSection(&old_threadpool.threadpool_compl_cs); if (res) return res; } - info.CompletionPort = compl_port; + info.CompletionPort = old_threadpool.compl_port; info.CompletionKey = (ULONG_PTR)Function; return NtSetInformationFile( FileHandle, &iosb, &info, sizeof(info), FileCompletionInformation );

1 0

Francois Gouget : compstui: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 387232e2ac023559072833725cdea72317b8e67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=387232e2ac023559072833725… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:20:54 2015 +0100 compstui: Remove an uneeded NONAMELESSUNION directive. --- dlls/compstui/compstui_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 41b2441..0225036 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Qian Hong : ntdll: Implemented FileNetworkOpenInformation class support in NtQueryInformationFile.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 2a098ab8a8b500362237943770f81c3f063d2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a098ab8a8b50036223794377… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Mar 10 05:17:08 2015 +0800 ntdll: Implemented FileNetworkOpenInformation class support in NtQueryInformationFile. --- dlls/ntdll/file.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b07e5f9..3bd2c31 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2190,7 +2190,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileMoveClusterInformation */ 0, /* FileQuotaInformation */ 0, /* FileReparsePointInformation */ - 0, /* FileNetworkOpenInformation */ + sizeof(FILE_NETWORK_OPEN_INFORMATION), /* FileNetworkOpenInformation */ 0, /* FileAttributeTagInformation */ 0, /* FileTrackingInformation */ 0, /* FileIdBothDirectoryInformation */ @@ -2414,6 +2414,40 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } } break; + case FileNetworkOpenInformation: + { + FILE_NETWORK_OPEN_INFORMATION *info = ptr; + ANSI_STRING unix_name; + + if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) + { + ULONG attributes; + struct stat st; + + if (get_file_info( unix_name.Buffer, &st, &attributes ) == -1) + io->u.Status = FILE_GetNtStatus(); + else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + io->u.Status = STATUS_INVALID_INFO_CLASS; + else + { + FILE_BASIC_INFORMATION basic; + FILE_STANDARD_INFORMATION std; + + fill_file_info( &st, attributes, &basic, FileBasicInformation ); + fill_file_info( &st, attributes, &std, FileStandardInformation ); + + info->CreationTime = basic.CreationTime; + info->LastAccessTime = basic.LastAccessTime; + info->LastWriteTime = basic.LastWriteTime; + info->ChangeTime = basic.ChangeTime; + info->AllocationSize = std.AllocationSize; + info->EndOfFile = std.EndOfFile; + info->FileAttributes = basic.FileAttributes; + } + RtlFreeAnsiString( &unix_name ); + } + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED;

1 0

Stefan Dösinger : wined3d: Support WINED3DFMT_R5G5_SNORM_L6_UNORM with EXT_texture_snorm.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: d4db09d0e91adfdda19fa5b118e39dee2f0ab4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db09d0e91adfdda19fa5b11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:39 2015 +0100 wined3d: Support WINED3DFMT_R5G5_SNORM_L6_UNORM with EXT_texture_snorm. From: Stefan Dösinger <stefandoesinger(a)gmx.at> --- dlls/wined3d/utils.c | 66 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5cd52b3..725318f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -322,6 +322,45 @@ static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT src_row } } +static void convert_r5g5_snorm_l6_unorm_ext(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +{ + unsigned int x, y, z; + unsigned char *texel_out, r_out, g_out, r_in, g_in, l_in; + const unsigned short *texel_in; + + for (z = 0; z < depth; z++) + { + for (y = 0; y < height; y++) + { + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; + + r_out = r_in << 3; + if (!(r_in & 0x10)) /* r > 0 */ + r_out |= r_in >> 1; + + g_out = g_in << 3; + if (!(g_in & 0x10)) /* g > 0 */ + g_out |= g_in >> 1; + + texel_out[0] = r_out; + texel_out[1] = g_out; + texel_out[2] = l_in << 1 | l_in >> 5; + texel_out[3] = 0; + + texel_out += 4; + texel_in++; + } + } + } +} + static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { @@ -331,8 +370,12 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ /* This makes the gl surface bigger(24 bit instead of 16), but it works with * fixed function and shaders without further conversion once the surface is - * loaded - */ + * loaded. + * + * The difference between this function and convert_r5g5_snorm_l6_unorm_ext + * is that convert_r5g5_snorm_l6_unorm_ext creates a 32 bit XRGB texture and + * this function creates a 24 bit DSDT_MAG texture. Trying to load a DSDT_MAG + * internal with a 32 bit DSDT_MAG_INTENSITY or DSDT_MAG_VIB format fails. */ for (z = 0; z < depth; z++) { for (y = 0; y < height; y++) @@ -1080,6 +1123,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, convert_r5g5_snorm_l6_unorm_nv}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB8_SNORM, GL_RGB8_SNORM, 0, + GL_RGBA, GL_BYTE, 4, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, convert_r5g5_snorm_l6_unorm_ext}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -2020,25 +2068,17 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); + idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* If GL_NV_texture_shader is not supported, R5G5_SNORM_L6_UNORM and R8G8_SNORM_L8X8_UNORM - * are converted, incompatiby with each other. */ - idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } - else - { - /* If GL_NV_texture_shader is supported, WINED3DFMT_L6V5U5 and WINED3DFMT_X8L8V8U8 - * are converted at surface loading time, but they do not need any modification in - * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. */ - } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) {

1 0

Stefan Dösinger : wined3d: Add support for GL_EXT_texture_snorm.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 6df52ca7e680498face4a5d80c4e0d2a64bd68fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df52ca7e680498face4a5d80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:38 2015 +0100 wined3d: Add support for GL_EXT_texture_snorm. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 57 +++++++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d04d52..3667840 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -196,6 +196,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, + {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 791ddf3..5cd52b3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1065,6 +1065,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, 0, + GL_RG, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1095,6 +1100,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, 0, + GL_RGBA, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1105,6 +1115,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R16G16_SNORM, GL_RG16_SNORM, GL_RG16_SNORM, 0, + GL_RG, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, @@ -1978,57 +1993,51 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. - * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if - * their extensions are not available. GL_ATI_envmap_bumpmap is not used because - * the only driver that implements it(fglrx) has a buggy implementation. - * - * V8U8 and V16U16 need a fixup of the undefined blue channel. OpenGL - * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader - * conversion for this format. - */ - if (!gl_info->supported[NV_TEXTURE_SHADER]) + /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by + * any driver. */ + if (gl_info->supported[NV_TEXTURE_SHADER] || gl_info->supported[EXT_TEXTURE_SNORM]) { + /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL + * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader + * conversion for this format. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else { + /* Emulate using unsigned formats. This requires load-time conversion in addition to the + * fixups here. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* If GL_NV_texture_shader is not supported, those formats are converted, incompatibly - * with each other - */ + /* If GL_NV_texture_shader is not supported, R5G5_SNORM_L6_UNORM and R8G8_SNORM_L8X8_UNORM + * are converted, incompatiby with each other. */ idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); - idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } else { /* If GL_NV_texture_shader is supported, WINED3DFMT_L6V5U5 and WINED3DFMT_X8L8V8U8 * are converted at surface loading time, but they do not need any modification in - * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. - * WINED3DFMT_Q8W8V8U8 doesn't even need load-time conversion - */ + * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. */ } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 48d25b0..4919cf6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -130,6 +130,7 @@ enum wined3d_gl_extension EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, + EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Bernhard Übelacker : wined3d: Recognize Nvidia GeForce 8100 with Nouveau driver (bug).
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 44ddcac6c372b003c81e36aa9f55bf32f5c0f8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ddcac6c372b003c81e36aa9… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Mar 6 16:49:08 2015 +0100 wined3d: Recognize Nvidia GeForce 8100 with Nouveau driver (bug). --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89996d1..6d04d52 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1203,6 +1203,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8200, "NVIDIA GeForce 8200", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, @@ -2070,7 +2071,7 @@ cards_nvidia_mesa[] = /* Tesla */ {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, - {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, /* 8100 */ {"NVA8", CARD_NVIDIA_GEFORCE_210}, {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, {"NVA3", CARD_NVIDIA_GEFORCE_GT240},

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_SetPrivateDataInterface().
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 5b5498a8b4e0fe74517f3b98153c1291ec5bb346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5498a8b4e0fe74517f3b981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:58 2015 +0100 d3d10core: Implement d3d10_sampler_state_SetPrivateDataInterface(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3e684f5..90e6938 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -594,9 +594,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10Sample static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10SamplerState methods */

1 0