wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Jacek Caban : stdlib.h: Forward strtoll to _strtoi64.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 351a87359d6b812c277cc40460cddde1f782209f URL: https://source.winehq.org/git/wine.git/?a=commit;h=351a87359d6b812c277cc404… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:23:12 2019 +0200 stdlib.h: Forward strtoll to _strtoi64. Instead of depending on mingw implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 47a50bc..7ca7021 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -220,9 +220,7 @@ double __cdecl strtod(const char*,char**); double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); -__int64 __cdecl strtoll(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); -unsigned __int64 __cdecl strtoull(const char*,char**,int); unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); @@ -297,6 +295,8 @@ static inline char* itoa(int value, char* str, int radix) { return _itoa(value, static inline char* ltoa(__msvcrt_long value, char* str, int radix) { return _ltoa(value, str, radix); } static inline _onexit_t onexit(_onexit_t func) { return _onexit(func); } static inline int putenv(const char* str) { return _putenv(str); } +static inline __int64 strtoll(const char *ptr, char **endptr, int base) { return _strtoi64(ptr, endptr, base); } +static inline unsigned __int64 __cdecl strtoull(const char *ptr, char **endptr, int base) { return _strtoui64(ptr, endptr, base); } static inline void swab(char* src, char* dst, int len) { _swab(src, dst, len); } static inline char* ultoa(__msvcrt_ulong value, char* str, int radix) { return _ultoa(value, str, radix); }

1 0

Alexandre Julliard : ntdll: Silence FIXME for LdrResolveDelayLoadedAPI().
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 9b6d2d33102ced7724232c40a41c4fb446737a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d2d33102ced7724232c40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 17:45:18 2019 +0200 ntdll: Silence FIXME for LdrResolveDelayLoadedAPI(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 67efcaf..ae04da6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3227,7 +3227,7 @@ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIP FARPROC fp; DWORD id; - FIXME("(%p, %p, %p, %p, %p, 0x%08x), partial stub\n", base, desc, dllhook, syshook, addr, flags); + TRACE( "(%p, %p, %p, %p, %p, 0x%08x)\n", base, desc, dllhook, syshook, addr, flags ); phmod = get_rva(base, desc->ModuleHandleRVA); pIAT = get_rva(base, desc->ImportAddressTableRVA);

1 0

Alexandre Julliard : ntdll: Reimplement thread initialization in assembler on ARM64.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: e91e6cc9bdb484643cb73665170a3f91ce6278ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91e6cc9bdb484643cb73665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 10:08:41 2019 +0200 ntdll: Reimplement thread initialization in assembler on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 128 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 98 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d2d43b3..900fd3b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -94,6 +94,20 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; +struct arm64_thread_data +{ + void *exit_frame; /* exit frame pointer */ + CONTEXT *context; /* context to set with SIGUSR2 */ +}; + +C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct arm64_thread_data, exit_frame ) == 0x300 ); + +static inline struct arm64_thread_data *arm64_thread_data(void) +{ + return (struct arm64_thread_data *)NtCurrentTeb()->SystemReserved2; +} + /*********************************************************************** * dispatch_signal */ @@ -1084,35 +1098,91 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * abort(); /* should not be reached */ } -typedef void (WINAPI *thread_start_func)(LPTHREAD_START_ROUTINE,void *); +extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, + void *relay, TEB *teb ); +__ASM_GLOBAL_FUNC( start_thread, + "stp x29, x30, [sp,#-16]!\n\t" + "mov x18, x4\n\t" /* teb */ + /* store exit frame */ + "mov x29, sp\n\t" + "str x29, [x4, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ + /* switch to thread stack */ + "ldr x5, [x4, #8]\n\t" /* teb->Tib.StackBase */ + "sub sp, x5, #0x1000\n\t" + /* attach dlls */ + "bl " __ASM_NAME("attach_thread") "\n\t" + "mov sp, x0\n\t" + /* clear the stack */ + "and x0, x0, #~0xfff\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "mov x0, sp\n\t" + "ldp x1, x2, [x0, #0x10]\n\t" /* context->X1,2 */ + "ldp x3, x4, [x0, #0x20]\n\t" /* context->X3,4 */ + "ldp x5, x6, [x0, #0x30]\n\t" /* context->X5,6 */ + "ldp x7, x8, [x0, #0x40]\n\t" /* context->X7,8 */ + "ldp x9, x10, [x0, #0x50]\n\t" /* context->X9,10 */ + "ldp x11, x12, [x0, #0x60]\n\t" /* context->X11,12 */ + "ldp x13, x14, [x0, #0x70]\n\t" /* context->X13,14 */ + "ldp x15, x16, [x0, #0x80]\n\t" /* context->X15,16 */ + "ldp x17, x18, [x0, #0x90]\n\t" /* context->X17,18 */ + "ldp x19, x20, [x0, #0xa0]\n\t" /* context->X19,20 */ + "ldp x21, x22, [x0, #0xb0]\n\t" /* context->X21,22 */ + "ldp x23, x24, [x0, #0xc0]\n\t" /* context->X23,24 */ + "ldp x25, x26, [x0, #0xd0]\n\t" /* context->X25,26 */ + "ldp x27, x28, [x0, #0xe0]\n\t" /* context->X27,28 */ + "ldp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "ldr x17, [x0, #0x100]\n\t" /* context->Sp */ + "mov sp, x17\n\t" + "ldr x17, [x0, #0x108]\n\t" /* context->Pc */ + "ldr x0, [x0, #0x8]\n\t" /* context->X0 */ + "br x17" ) + +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + "ldr x3, [x2, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ + "str xzr, [x2, #0x300]\n\t" + "cbz x3, 1f\n\t" + "mov sp, x3\n" + "1:\tblr x1" ) -struct startup_info +/*********************************************************************** + * init_thread_context + */ +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, void *relay ) { - thread_start_func start; - LPTHREAD_START_ROUTINE entry; - void *arg; - BOOL suspend; -}; + context->u.s.X0 = (DWORD64)entry; + context->u.s.X1 = (DWORD64)arg; + context->u.s.X18 = (DWORD64)NtCurrentTeb(); + context->Sp = (DWORD64)NtCurrentTeb()->Tib.StackBase; + context->Pc = (DWORD64)relay; +} /*********************************************************************** - * thread_startup + * attach_thread */ -static void thread_startup( void *param ) +PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, + BOOL suspend, void *relay ) { - CONTEXT context = { 0 }; - struct startup_info *info = param; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - context.u.s.X0 = (DWORD_PTR)info->entry; - context.u.s.X1 = (DWORD_PTR)info->arg; - context.Sp = (DWORD_PTR)NtCurrentTeb()->Tib.StackBase; - context.Pc = (DWORD_PTR)info->start; + CONTEXT *ctx; - if (info->suspend) wait_suspend( &context ); - LdrInitializeThunk( &context, (void **)&context.u.s.X0, 0, 0 ); + if (suspend) + { + CONTEXT context = { CONTEXT_ALL }; - ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); + init_thread_context( &context, entry, arg, relay ); + wait_suspend( &context ); + ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; + *ctx = context; + } + else + { + ctx = (CONTEXT *)NtCurrentTeb()->Tib.StackBase - 1; + init_thread_context( ctx, entry, arg, relay ); + } + ctx->ContextFlags = CONTEXT_FULL; + LdrInitializeThunk( ctx, (void **)&ctx->u.s.X0, 0, 0 ); + return ctx; } /*********************************************************************** @@ -1120,13 +1190,12 @@ static void thread_startup( void *param ) * * Thread startup sequence: * signal_start_thread() - * -> thread_startup() - * -> call_thread_entry_point() + * -> start_thread() + * -> call_thread_func() */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - struct startup_info info = { call_thread_entry_point, entry, arg, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, arg, suspend, call_thread_entry_point, NtCurrentTeb() ); } /********************************************************************** @@ -1134,13 +1203,12 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend * * Process startup sequence: * signal_start_process() - * -> thread_startup() + * -> start_thread() * -> kernel32_start_process() */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - struct startup_info info = { kernel32_start_process, entry, NtCurrentTeb()->Peb, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, NtCurrentTeb() ); } /*********************************************************************** @@ -1148,7 +1216,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - exit_thread( status ); + call_thread_exit_func( status, exit_thread, NtCurrentTeb() ); } /*********************************************************************** @@ -1156,7 +1224,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - exit( status ); + call_thread_exit_func( status, exit, NtCurrentTeb() ); } /**********************************************************************

1 0

Alexandre Julliard : wpcap: Avoid deprecated pcap_lookupdev().
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 732d0db63b5b494ce409e496cb77cf661eb7e6e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=732d0db63b5b494ce409e496… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 10:05:18 2019 +0200 wpcap: Avoid deprecated pcap_lookupdev(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 6450a0e..d2f1be7 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -202,8 +202,18 @@ int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer) char* CDECL wine_pcap_lookupdev(char *errbuf) { + static char *ret; + pcap_if_t *devs; + TRACE("(%p)\n", errbuf); - return pcap_lookupdev(errbuf); + if (!ret) + { + if (pcap_findalldevs( &devs, errbuf ) == -1) return NULL; + if (!devs) return NULL; + if ((ret = heap_alloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name ); + pcap_freealldevs( devs ); + } + return ret; } int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp,

1 0

Zebediah Figura : wineqtdecoder: Fix build.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 0f37157bf95da146e54b9427cb2693e4dc96e965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f37157bf95da146e54b9427… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 18:10:59 2019 -0500 wineqtdecoder: Fix build. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 1b97740..5591816 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ filter.c \ main.c \ mediatype.c \ + outputqueue.c \ pin.c \ qtdatahandler.c \ qtsplitter.c \

1 0

Henri Verbeet : wined3d: Store the maximum number of "compat" varyings in struct wined3d_d3d_limits.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: c3e2909fd3640dc6209c6e8bdae3ac0f384f2b0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e2909fd3640dc6209c6e8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:18 2019 +0430 wined3d: Store the maximum number of "compat" varyings in struct wined3d_d3d_limits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 16 +++------------- dlls/wined3d/wined3d_private.h | 9 +++++---- 6 files changed, 26 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e2909fd3640dc6209c…

1 0

Henri Verbeet : wined3d: Store fixed-function alpha test support in struct wined3d_d3d_info.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: ca6cbb73e1808452b3f2a94bc99560520eeffc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca6cbb73e1808452b3f2a94b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:17 2019 +0430 wined3d: Store fixed-function alpha test support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 52fd685..90d9ba6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3777,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ac3de3d..116dd56 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4146,7 +4146,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 31eca98..1dfb170 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6226,7 +6226,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) settings->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else settings->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76a938a..add1f1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -202,6 +202,7 @@ struct wined3d_d3d_info uint32_t xyzrhw : 1; uint32_t emulated_flatshading : 1; uint32_t ffp_generic_attributes : 1; + uint32_t ffp_alpha_test : 1; uint32_t vs_clipping : 1; uint32_t shader_color_key : 1; uint32_t shader_double_precision : 1;

1 0

Henri Verbeet : wined3d: Store clip control support in struct wined3d_d3d_info.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: e795ddb3d80d7b94d29cf97a24a01bb157b0138d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e795ddb3d80d7b94d29cf97a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:16 2019 +0430 wined3d: Store clip control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/utils.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index abfa31b..52fd685 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3796,6 +3796,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; + d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e99deb..31eca98 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5392,8 +5392,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) { - BOOL clip_control = context->gl_info->supported[ARB_CLIP_CONTROL]; - BOOL flip = !clip_control && context->render_offscreen; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + BOOL clip_control, flip; float center_offset; /* There are a couple of additional things we have to take into account @@ -5411,7 +5411,9 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ - if (!clip_control && context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + clip_control = d3d_info->clip_control; + flip = !clip_control && context->render_offscreen; + if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a21721a..76a938a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -214,6 +214,7 @@ struct wined3d_d3d_info uint32_t texture_swizzle : 1; uint32_t srgb_read_control : 1; uint32_t srgb_write_control : 1; + uint32_t clip_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Henri Verbeet : wined3d: Store sRGB write control support in struct wined3d_d3d_info.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: d4fa7e4cfcfe6e2d4c2bead0d4460dbcdc77366a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4fa7e4cfcfe6e2d4c2bead0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:15 2019 +0430 wined3d: Store sRGB write control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++--------------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8e06bf2..abfa31b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3795,6 +3795,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; + d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1d8540e..ac3de3d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3902,7 +3902,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb)) { static unsigned int warned = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0872b10..1e99deb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6167,7 +6167,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe4510e..a21721a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -198,21 +198,22 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - unsigned int wined3d_creation_flags; - unsigned int xyzrhw : 1; - unsigned int emulated_flatshading : 1; - unsigned int ffp_generic_attributes : 1; - unsigned int vs_clipping : 1; - unsigned int shader_color_key : 1; - unsigned int shader_double_precision : 1; - unsigned int shader_output_interpolation : 1; - unsigned int viewport_array_index_any_shader : 1; - unsigned int texture_npot : 1; - unsigned int texture_npot_conditional : 1; - unsigned int draw_base_vertex_offset : 1; - unsigned int vertex_bgra : 1; - unsigned int texture_swizzle : 1; - unsigned int srgb_read_control : 1; + uint32_t wined3d_creation_flags; + uint32_t xyzrhw : 1; + uint32_t emulated_flatshading : 1; + uint32_t ffp_generic_attributes : 1; + uint32_t vs_clipping : 1; + uint32_t shader_color_key : 1; + uint32_t shader_double_precision : 1; + uint32_t shader_output_interpolation : 1; + uint32_t viewport_array_index_any_shader : 1; + uint32_t texture_npot : 1; + uint32_t texture_npot_conditional : 1; + uint32_t draw_base_vertex_offset : 1; + uint32_t vertex_bgra : 1; + uint32_t texture_swizzle : 1; + uint32_t srgb_read_control : 1; + uint32_t srgb_write_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Henri Verbeet : wined3d: Store sRGB read control support in struct wined3d_d3d_info.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 60938b4e941624754fb3729f668989caf2eb6266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60938b4e941624754fb3729f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:14 2019 +0430 wined3d: Store sRGB read control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5f6d673..8e06bf2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3794,6 +3794,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; + d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd68cbd..fe4510e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -212,6 +212,7 @@ struct wined3d_d3d_info unsigned int draw_base_vertex_offset : 1; unsigned int vertex_bgra : 1; unsigned int texture_swizzle : 1; + unsigned int srgb_read_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -4819,7 +4820,7 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context * unsigned int flags = texture->resource.format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); - return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + return (!context->d3d_info->srgb_read_control || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; }

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019