August 2019 - Wine-Commits - list.winehq.org

Conor McCarthy : dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: 9d3687ad324f866c835c4b73922f859a30e47aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3687ad324f866c835c4b73… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 16 13:41:08 2019 +1000 dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails. A NULL test is always applied to the return value from pe_map_full(), but IMAGE_NO_MAP is not NULL, it is ((void*)-1). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 58530e7..4b7c7ba 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -53,7 +53,7 @@ static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) fmap->u.pe.full_count++; return fmap->u.pe.full_map; } - return IMAGE_NO_MAP; + return NULL; } static void pe_unmap_full(struct image_file_map* fmap)

1 0

Zebediah Figura : dbghelp: Use RtlComputeCrc32().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: a91b0faefd801d44063c8d9289dbc69de985f8b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a91b0faefd801d44063c8d92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 1 18:53:58 2019 -0500 dbghelp: Use RtlComputeCrc32(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/crc32.c | 149 ----------------------------------------- dlls/dbghelp/dbghelp.c | 14 ++++ dlls/dbghelp/dbghelp_private.h | 2 - 4 files changed, 14 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a91b0faefd801d44063c…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind ().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: aaf57e761aeb0185e3895fc027c4cceabb253d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf57e761aeb0185e3895fc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 2 03:50:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32cbc02..fb39339 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3809,7 +3809,7 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context_gl); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7962496..d26ff6e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -828,10 +828,9 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, - unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) + unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture_gl *texture_gl; wined3d_context_gl_active_texture(context_gl, gl_info, unit); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae46b4a..c7d9cd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4137,7 +4137,7 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, - struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_desc_from_sampler_states ().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: e246d9227f88f0946404f985ec099b13a7418134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e246d9227f88f0946404f985… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 2 03:50:08 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_desc_from_sampler_states(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bf110bc..9b53bd1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3527,7 +3527,7 @@ static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct } static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, - const struct wined3d_context *context, const DWORD *sampler_states, + const struct wined3d_context_gl *context_gl, const DWORD *sampler_states, const struct wined3d_texture_gl *texture_gl) { union @@ -3578,7 +3578,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) { desc->mip_filter = WINED3D_TEXF_NONE; - if (context->gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (context_gl->c.gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) desc->min_filter = WINED3D_TEXF_POINT; } } @@ -3615,7 +3615,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture_gl); + wined3d_sampler_desc_from_sampler_states(&desc, context_gl, sampler_states, texture_gl); wined3d_texture_gl_bind(texture_gl, context_gl, srgb);

1 0

Henri Verbeet : wined3d: Use d3d_info to determine BGRA vertex support in wined3d_buffer_load().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: 25bc1a334c7883f035bc83f37503c08c683d1b48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25bc1a334c7883f035bc83f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 2 03:50:12 2019 +0430 wined3d: Use d3d_info to determine BGRA vertex support in wined3d_buffer_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2ed3984..fed63ca 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -898,7 +898,7 @@ static void buffer_mark_used(struct wined3d_buffer *buffer) void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; BOOL decl_changed = FALSE; TRACE("buffer %p.\n", buffer); @@ -932,9 +932,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!use_vs(state)) { - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !context->d3d_info->ffp_generic_attributes) + if (!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; - if (!context->d3d_info->xyzrhw) + if (!d3d_info->xyzrhw) fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to swapchain_gl_set_swap_interval().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: df5357cda0f2ac5e98a742dc656543194b400c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5357cda0f2ac5e98a742dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 2 03:50:09 2019 +0430 wined3d: Pass a wined3d_context_gl structure to swapchain_gl_set_swap_interval(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 37b0a78..7d73dd1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -367,9 +367,9 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } static void swapchain_gl_set_swap_interval(struct wined3d_swapchain *swapchain, - struct wined3d_context *context, unsigned int swap_interval) + struct wined3d_context_gl *context_gl, unsigned int swap_interval) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; swap_interval = swap_interval <= 4 ? swap_interval : 1; if (swapchain->swap_interval == swap_interval) @@ -383,7 +383,7 @@ static void swapchain_gl_set_swap_interval(struct wined3d_swapchain *swapchain, if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) { ERR("Failed to set swap interval %u for context %p, last error %#x.\n", - swap_interval, context, GetLastError()); + swap_interval, context_gl, GetLastError()); } } @@ -458,7 +458,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info = context->gl_info; - swapchain_gl_set_swap_interval(swapchain, context, swap_interval); + swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); if ((logo_texture = swapchain->device->logo_texture)) {

1 0

Zebediah Figura : secur32: Use RtlComputeCrc32().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: d56f6847071c80c0e3b65e63f2870829694f7913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d56f6847071c80c0e3b65e63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 1 18:53:57 2019 -0500 secur32: Use RtlComputeCrc32(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 6 ++--- dlls/secur32/secur32_priv.h | 1 - dlls/secur32/util.c | 64 --------------------------------------------- 3 files changed, 2 insertions(+), 69 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3280fa1..b368a5f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winnls.h" #include "wincred.h" +#include "winternl.h" #include "rpc.h" #include "sspi.h" #include "lm.h" @@ -1636,10 +1637,7 @@ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc p for(i=0; i < pMessage->cBuffers; ++i) { if(pMessage->pBuffers[i].BufferType & SECBUFFER_DATA) - { - crc = ComputeCrc32(pMessage->pBuffers[i].pvBuffer, - pMessage->pBuffers[i].cbBuffer, crc); - } + crc = RtlComputeCrc32(crc, pMessage->pBuffers[i].pvBuffer, pMessage->pBuffers[i].cbBuffer); } sig[ 0] = (sign_version >> 0) & 0xff; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index a62d6cb..5ed26d6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -161,7 +161,6 @@ SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, int max_len, int *out_len) DECLSPEC_HIDDEN; /* Functions from util.c */ -ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) DECLSPEC_HIDDEN; SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) DECLSPEC_HIDDEN; SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper) DECLSPEC_HIDDEN; arc4_info *SECUR32_arc4Alloc(void) DECLSPEC_HIDDEN; diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index acb6290..b5cac5b 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -28,57 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); -/* The CRC32 code is copyright (C) 1986 Gary S. Brown and was placed in the - * public domain. - * CRC polynomial 0xedb88320 - */ -static const ULONG CRC_table[256] = -{ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - static const char client_to_server_sign_constant[] = "session key to client-to-server signing key magic constant"; static const char client_to_server_seal_constant[] = "session key to client-to-server sealing key magic constant"; static const char server_to_client_sign_constant[] = "session key to server-to-client signing key magic constant"; @@ -108,19 +57,6 @@ VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); VOID WINAPI MD5Final( MD5_CTX *ctx ); -ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) -{ - ULONG crc = ~initial_crc; - - while (iLen > 0) - { - crc = CRC_table[(crc ^ *pData) & 0xff] ^ (crc >> 8); - pData++; - iLen--; - } - return ~crc; -} - SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to texture_download_data_slow_path().
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: wine Branch: master Commit: b848b2bcf38c09f08bf9d28a59ba21bc885730ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b848b2bcf38c09f08bf9d28a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 2 03:50:10 2019 +0430 wined3d: Pass a wined3d_context_gl structure to texture_download_data_slow_path(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 71 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 19c2f3b..2717057 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2145,10 +2145,10 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s } } -static void texture_download_data_slow_path(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_bo_address *data) +static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; @@ -2158,53 +2158,54 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns GLenum target; void *mem; - format_gl = wined3d_format_gl(texture->resource.format); + format_gl = wined3d_format_gl(texture_gl->t.resource.format); /* Only support read back of converted P8 textures. */ - if (texture->flags & WINED3D_TEXTURE_CONVERTED && format_gl->f.id != WINED3DFMT_P8_UINT && !format_gl->f.download) + if (texture_gl->t.flags & WINED3D_TEXTURE_CONVERTED && format_gl->f.id != WINED3DFMT_P8_UINT + && !format_gl->f.download) { ERR("Trying to read back converted texture %p, %u with format %s.\n", - texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); + texture_gl, sub_resource_idx, debug_d3dformat(format_gl->f.id)); return; } - sub_resource = &texture->sub_resources[sub_resource_idx]; - target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); - level = sub_resource_idx % texture->level_count; + sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; + target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); + level = sub_resource_idx % texture_gl->t.level_count; if (target == GL_TEXTURE_1D_ARRAY || target == GL_TEXTURE_2D_ARRAY) { if (format_gl->f.download) { - FIXME("Reading back converted array texture %p is not supported.\n", texture); + FIXME("Reading back converted array texture %p is not supported.\n", texture_gl); return; } /* NP2 emulation is not allowed on array textures. */ - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - ERR("Array texture %p uses NP2 emulation.\n", texture); + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + ERR("Array texture %p uses NP2 emulation.\n", texture_gl); WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); - if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) + if (!(temporary_mem = heap_calloc(texture_gl->t.layer_count, sub_resource->size))) { ERR("Out of memory.\n"); return; } } - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { if (format_gl->f.download) { - FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture); + FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture_gl); return; } - wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(&format_gl->f, texture->resource.device->surface_alignment, - wined3d_texture_get_level_pow2_width(texture, level), - wined3d_texture_get_level_pow2_height(texture, level), + wined3d_texture_get_pitch(&texture_gl->t, level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&format_gl->f, texture_gl->t.resource.device->surface_alignment, + wined3d_texture_get_level_pow2_width(&texture_gl->t, level), + wined3d_texture_get_level_pow2_height(&texture_gl->t, level), &src_row_pitch, &src_slice_pitch); if (!(temporary_mem = heap_alloc(src_slice_pitch))) { @@ -2214,7 +2215,7 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns if (data->buffer_object) ERR("NP2 emulated texture uses PBO unexpectedly.\n"); - if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) ERR("Unexpected compressed format for NP2 emulated texture.\n"); } @@ -2223,17 +2224,17 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns struct wined3d_format f; if (data->buffer_object) - ERR("Converted texture %p uses PBO unexpectedly.\n", texture); + ERR("Converted texture %p uses PBO unexpectedly.\n", texture_gl); WARN_(d3d_perf)("Downloading converted texture %p, %u with format %s.\n", - texture, sub_resource_idx, debug_d3dformat(format_gl->f.id)); + texture_gl, sub_resource_idx, debug_d3dformat(format_gl->f.id)); f = format_gl->f; f.byte_count = format_gl->f.conv_byte_count; - wined3d_texture_get_pitch(texture, level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level), + wined3d_texture_get_pitch(&texture_gl->t, level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&f, texture_gl->t.resource.device->surface_alignment, + wined3d_texture_get_level_width(&texture_gl->t, level), + wined3d_texture_get_level_height(&texture_gl->t, level), &src_row_pitch, &src_slice_pitch); if (!(temporary_mem = heap_alloc(src_slice_pitch))) @@ -2258,10 +2259,10 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns mem = data->addr; } - if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); + texture_gl, sub_resource_idx, level, format_gl->format, format_gl->type, mem); GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); checkGLcall("glGetCompressedTexImage"); @@ -2269,7 +2270,7 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns else { TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, mem); + texture_gl, sub_resource_idx, level, format_gl->format, format_gl->type, mem); gl_info->gl_ops.gl.p_glGetTexImage(target, level, format_gl->format, format_gl->type, mem); checkGLcall("glGetTexImage"); @@ -2278,10 +2279,10 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns if (format_gl->f.download) { format_gl->f.download(mem, data->addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level), 1); + wined3d_texture_get_level_width(&texture_gl->t, level), + wined3d_texture_get_level_height(&texture_gl->t, level), 1); } - else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + else if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; unsigned int h, y; @@ -2338,7 +2339,7 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns src_data = mem; dst_data = data->addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - h = wined3d_texture_get_level_height(texture, level); + h = wined3d_texture_get_level_height(&texture_gl->t, level); for (y = 0; y < h; ++y) { memcpy(dst_data, src_data, dst_row_pitch); @@ -2348,7 +2349,7 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns } else if (temporary_mem) { - unsigned int layer = sub_resource_idx / texture->level_count; + unsigned int layer = sub_resource_idx / texture_gl->t.level_count; void *src_data = temporary_mem + layer * sub_resource->size; if (data->buffer_object) { @@ -2446,7 +2447,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, || src_texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED))) || target == GL_TEXTURE_1D_ARRAY) { - texture_download_data_slow_path(src_texture, src_sub_resource_idx, context, dst_bo_addr); + wined3d_texture_gl_download_data_slow_path(src_texture_gl, src_sub_resource_idx, context_gl, dst_bo_addr); return; }

1 0

Jactry Zeng : tests: Add tests for sample_b and sample_d instructions.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: vkd3d Branch: master Commit: aecf2ecfbeb84d6876d4ed7ce764526b619a9820 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aecf2ecfbeb84d6876d4ed7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 1 17:28:45 2019 +0200 tests: Add tests for sample_b and sample_d instructions. 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> --- tests/d3d12.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 234 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=aecf2ecfbeb84d6876d…

1 0

Józef Kucia : tests: Add option to enable GPU-based validation.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: vkd3d Branch: master Commit: 55f64cef2fa4213302027852fe575a38b75255da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55f64cef2fa421330202785… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 1 18:10:57 2019 +0200 tests: Add option to enable GPU-based validation. 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> --- include/vkd3d_d3d12.idl | 13 +++++++++++++ tests/d3d12_crosstest.h | 19 ++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2b395aa..067db8d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2330,6 +2330,19 @@ interface ID3D12Debug : IUnknown } [ + uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug1 : IUnknown +{ + void EnableDebugLayer(); + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); +} + +[ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index fbc0e3d..1f7e764 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -647,7 +647,8 @@ static void parse_args(int argc, char **argv) static void enable_d3d12_debug_layer(int argc, char **argv) { - bool enable_debug_layer = false; + bool enable_debug_layer = false, enable_gpu_based_validation = false; + ID3D12Debug1 *debug1; ID3D12Debug *debug; unsigned int i; @@ -655,6 +656,22 @@ static void enable_d3d12_debug_layer(int argc, char **argv) { if (!strcmp(argv[i], "--validate")) enable_debug_layer = true; + else if (!strcmp(argv[i], "--gbv")) + enable_gpu_based_validation = true; + } + + if (enable_gpu_based_validation) + { + if (SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug1, (void **)&debug1))) + { + ID3D12Debug1_SetEnableGPUBasedValidation(debug1, true); + ID3D12Debug1_Release(debug1); + enable_debug_layer = true; + } + else + { + trace("Failed to enable GPU-based validation.\n"); + } } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug)))

1 0