wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Jacek Caban : jscript: Store variables on the stack if possible.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 765a52e86a65a1c0604b9ef985772195dbe5f67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=765a52e86a65a1c0604b9ef98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:11 2016 +0200 jscript: Store variables on the stack if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 114 +++++++++++++++++++++++++++++++++++++------------- dlls/jscript/engine.h | 2 + 2 files changed, 86 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2305998..642705a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -217,11 +217,16 @@ static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) if(!frame->base_scope->frame && off >= frame->arguments_off) { DISPID id; + BSTR name; HRESULT hres; /* Got stack reference in deoptimized code. Need to convert it back to variable object reference. */ - hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, frame->function->params[off - frame->arguments_off], 0, &id); + assert(off < frame->variables_off + frame->function->var_cnt); + name = off >= frame->variables_off + ? frame->function->variables[off - frame->variables_off].name + : frame->function->params[off - frame->arguments_off]; + hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, name, 0, &id); if(FAILED(hres)) { r->type = EXPRVAL_INVALID; r->u.hres = hres; @@ -541,6 +546,13 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) return S_OK; } +static inline unsigned local_off(call_frame_t *frame, int ref) +{ + return ref < 0 + ? frame->arguments_off - ref-1 + : frame->variables_off + ref; +} + /* * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. @@ -566,8 +578,9 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->param_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->params[i], ctx->stack[frame->arguments_off+i]); + for(i = 0; i < frame->function->locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, + ctx->stack[local_off(frame, frame->function->locals[i].ref)]); if(FAILED(hres)) return hres; } @@ -622,9 +635,10 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re local_ref_t *ref = lookup_local(func, identifier); static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; - if(ref && ref->ref < 0) { + if(ref) { ret->type = EXPRVAL_STACK_REF; - ret->u.off = scope->frame->arguments_off - ref->ref - 1; + ret->u.off = local_off(scope->frame, ref->ref); + TRACE("returning ref %d for %d\n", ret->u.off, ref->ref); return S_OK; } @@ -2532,20 +2546,24 @@ static void pop_call_frame(script_ctx_t *ctx) { call_frame_t *frame = ctx->call_ctx; + frame->stack_base -= frame->pop_locals + frame->pop_variables; + + assert(frame->scope == frame->base_scope); + + /* If current scope will be kept alive, we need to transfer local variables to its variable object. */ + if(frame->scope && frame->scope->ref > 1) { + HRESULT hres = detach_variable_object(ctx, frame); + if(FAILED(hres)) + ERR("Failed to detach variable object: %08x\n", hres); + } + if(frame->arguments_obj) detach_arguments_object(frame->arguments_obj); - - if(frame->scope) { - /* If current scope will be kept alive, we need to transfer local variables to its variable object. */ - if(frame->scope->ref > 1) { - HRESULT hres = detach_variable_object(ctx, frame); - if(FAILED(hres)) - ERR("Failed to detach variable object: %08x\n", hres); - } + if(frame->scope) scope_release(frame->scope); - } - frame->stack_base -= frame->pop_locals; + if(frame->pop_variables) + stack_popn(ctx, frame->pop_variables); stack_popn(ctx, frame->pop_locals); ctx->call_ctx = frame->prev_frame; @@ -2738,6 +2756,36 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc } frame->pop_locals = ctx->stack_top - orig_stack; + + frame->variables_off = ctx->stack_top; + + for(i = 0; i < frame->function->var_cnt; i++) { + hres = stack_push(ctx, jsval_undefined()); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + } + + frame->pop_variables = i; + + for(i = 0; i < frame->function->func_cnt; i++) { + if(frame->function->funcs[i].name && !frame->function->funcs[i].event_target) { + jsdisp_t *func_obj; + unsigned off; + + hres = create_source_function(ctx, frame->bytecode, frame->function->funcs+i, frame->base_scope, &func_obj); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + + off = local_off(frame, frame->function->funcs[i].local_ref); + jsval_release(ctx->stack[off]); + ctx->stack[off] = jsval_obj(func_obj); + } + } + frame->base_scope->frame = frame; return S_OK; } @@ -2752,33 +2800,38 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi for(i = 0; i < function->func_cnt; i++) { jsdisp_t *func_obj; - if(!function->funcs[i].name) + if(!function->funcs[i].event_target) continue; hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); if(FAILED(hres)) return hres; - if(function->funcs[i].event_target) - hres = bind_event_target(ctx, function->funcs+i, func_obj); - else - hres = jsdisp_propput_name(variable_obj, function->funcs[i].name, jsval_obj(func_obj)); + hres = bind_event_target(ctx, function->funcs+i, func_obj); jsdisp_release(func_obj); if(FAILED(hres)) return hres; } - for(i=0; i < function->var_cnt; i++) { - TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); - if(function->variables[i].func_id != -1) - continue; + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + for(i=0; i < function->var_cnt; i++) { + TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); + if(function->variables[i].func_id != -1) { + jsdisp_t *func_obj; - if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { - DISPID id = 0; + hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); + if(FAILED(hres)) + return hres; - hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; + hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); + jsdisp_release(func_obj); + }else if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { + DISPID id = 0; + + hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + } } } @@ -2807,6 +2860,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function = function; frame->ret = jsval_undefined(); frame->argc = argc; + frame->bytecode = bytecode_addref(bytecode); if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -2814,13 +2868,13 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { hres = setup_scope(ctx, frame, argc, argv); if(FAILED(hres)) { + release_bytecode(frame->bytecode); heap_free(frame); return hres; } } } - frame->bytecode = bytecode_addref(bytecode); frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; if(this_obj) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2aaf831..b18b775 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -225,6 +225,8 @@ typedef struct _call_frame_t { unsigned argc; unsigned pop_locals; unsigned arguments_off; + unsigned variables_off; + unsigned pop_variables; bytecode_t *bytecode; function_code_t *function;

1 0

Jacek Caban : jscript: Don't use OP_var_set.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 7694afff4bb33b25fd5899d07ffce4f31d12474f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7694afff4bb33b25fd5899d07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:53 2016 +0200 jscript: Don't use OP_var_set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 9 ++++++++- dlls/jscript/engine.c | 15 --------------- dlls/jscript/engine.h | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e911373..0087459 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1095,11 +1095,18 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + hres = push_instr_bstr_uint(ctx, OP_identid, iter->identifier, 0); + if(FAILED(hres)) + return hres; + hres = compile_expression(ctx, iter->expr, TRUE); if(FAILED(hres)) return hres; - hres = push_instr_bstr(ctx, OP_var_set, iter->identifier); + if(!push_instr(ctx, OP_assign)) + return E_OUTOFMEMORY; + + hres = push_instr_uint(ctx, OP_pop, 1); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bc8eb5b..2305998 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -728,21 +728,6 @@ static inline void jmp_abs(script_ctx_t *ctx, unsigned dst) ctx->call_ctx->ip = dst; } -/* ECMA-262 3rd Edition 12.2 */ -static HRESULT interp_var_set(script_ctx_t *ctx) -{ - const BSTR name = get_op_bstr(ctx, 0); - jsval_t val; - HRESULT hres; - - TRACE("%s\n", debugstr_w(name)); - - val = stack_pop(ctx); - hres = jsdisp_propput_name(ctx->call_ctx->variable_obj, name, val); - jsval_release(val); - return hres; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(script_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0434ff1..2aaf831 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -89,7 +89,6 @@ X(setret, 1, 0,0) \ X(sub, 1, 0,0) \ X(undefined, 1, 0,0) \ - X(var_set, 1, ARG_BSTR, 0) \ X(void, 1, 0,0) \ X(xor, 1, 0,0)

1 0

Jacek Caban : jscript: Store local functions in locals map.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 713051d027cd554cdc3a3ead077245b1ac3ca514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=713051d027cd554cdc3a3ead0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:46 2016 +0200 jscript: Store local functions in locals map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 74 +++++++++++++++++++++++++++--------------------- dlls/jscript/engine.c | 15 ++++++++-- dlls/jscript/engine.h | 8 +++++- dlls/jscript/function.c | 2 +- dlls/jscript/tests/run.c | 2 ++ 5 files changed, 64 insertions(+), 37 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4dea4c7..e911373 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1825,10 +1825,12 @@ static BOOL alloc_variable(compiler_ctx_t *ctx, const WCHAR *name) return alloc_local(ctx, ident, ctx->func->var_cnt++); } -static void visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +static BOOL visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); + + return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier); } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -2234,6 +2236,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(func_expr) { parameter_t *param_iter; + if(func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + + if(func_expr->event_target) { + func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); + if(!func->event_target) + return E_OUTOFMEMORY; + } + func->source = func_expr->src_str; func->source_len = func_expr->src_len; @@ -2260,36 +2274,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - off = ctx->code_off; - hres = compile_block_statement(ctx, source->statement); - if(FAILED(hres)) - return hres; - - resolve_labels(ctx, off); - - hres = push_instr_uint(ctx, OP_ret, !from_eval); - if(FAILED(hres)) - return hres; - - if(TRACE_ON(jscript_disas)) - dump_code(ctx, off); - - func->instr_off = off; - - if(func_expr) { - if(func_expr->identifier) { - func->name = compiler_alloc_bstr(ctx, func_expr->identifier); - if(!func->name) - return E_OUTOFMEMORY; - } - - if(func_expr->event_target) { - func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); - if(!func->event_target) - return E_OUTOFMEMORY; - } - } - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); if(!func->locals) return E_OUTOFMEMORY; @@ -2303,7 +2287,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, for(i = 0, j = 0; i < func->locals_cnt; i++) { if(func->locals[i].ref < 0) continue; /* skip arguments */ - func->variables[func->locals[i].ref] = func->locals[i].name; + func->variables[func->locals[i].ref].name = func->locals[i].name; + func->variables[func->locals[i].ref].func_id = -1; j++; } @@ -2314,10 +2299,35 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; memset(func->funcs, 0, func->func_cnt * sizeof(*func->funcs)); + off = ctx->code_off; + hres = compile_block_statement(ctx, source->statement); + if(FAILED(hres)) + return hres; + + resolve_labels(ctx, off); + + hres = push_instr_uint(ctx, OP_ret, !from_eval); + if(FAILED(hres)) + return hres; + + if(TRACE_ON(jscript_disas)) + dump_code(ctx, off); + + func->instr_off = off; + for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; + + TRACE("[%d] func %s\n", i, debugstr_w(func->funcs[i].name)); + if(func->funcs[i].name && !func->funcs[i].event_target) { + local_ref_t *local_ref = lookup_local(func, func->funcs[i].name); + func->funcs[i].local_ref = local_ref->ref; + TRACE("found ref %s %d for %s\n", debugstr_w(local_ref->name), local_ref->ref, debugstr_w(func->funcs[i].name)); + if(local_ref->ref >= 0) + func->variables[local_ref->ref].func_id = i; + } } assert(i == func->func_cnt); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7861b77..bc8eb5b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -600,6 +600,11 @@ static int local_ref_cmp(const void *key, const void *ref) return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); } +local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) +{ + return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { @@ -614,7 +619,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { function_code_t *func = scope->frame->function; - local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp); + local_ref_t *ref = lookup_local(func, identifier); static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; if(ref && ref->ref < 0) { @@ -2779,10 +2784,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } for(i=0; i < function->var_cnt; i++) { - if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i], NULL)) { + TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); + if(function->variables[i].func_id != -1) + continue; + + if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { DISPID id = 0; - hres = jsdisp_get_id(variable_obj, function->variables[i], fdexNameEnsure, &id); + hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 81be179..0434ff1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -133,6 +133,7 @@ typedef struct { typedef struct _function_code_t { BSTR name; + int local_ref; BSTR event_target; unsigned instr_off; @@ -143,7 +144,10 @@ typedef struct _function_code_t { struct _function_code_t *funcs; unsigned var_cnt; - BSTR *variables; + struct { + BSTR name; + int func_id; /* -1 if not a function */ + } *variables; unsigned param_cnt; BSTR *params; @@ -152,6 +156,8 @@ typedef struct _function_code_t { local_ref_t *locals; } function_code_t; +local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; + typedef struct _bytecode_t { LONG ref; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2475908..704d2ef 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -813,7 +813,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - if(code->global_code.func_cnt != 1 || code->global_code.var_cnt) { + if(code->global_code.func_cnt != 1 || code->global_code.var_cnt != 1) { ERR("Invalid parser result!\n"); release_bytecode(code); return E_UNEXPECTED; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 0101f15..ff6edce 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2530,6 +2530,8 @@ static BOOL run_tests(void) parse_script_a("eval('var testPropGet;');"); CHECK_CALLED(global_propget_d); + parse_script_a("var testPropGet; function testPropGet() {}"); + SET_EXPECT(global_notexists_d); parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d);

1 0

Jacek Caban : jscript: Use locals map for local variables.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 2e06686ef9f9c95caacd3119abc06c6c211fd776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e06686ef9f9c95caacd3119a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:36 2016 +0200 jscript: Use locals map for local variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 395 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/jscript/engine.c | 2 +- dlls/jscript/parser.h | 1 + 3 files changed, 366 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e06686ef9f9c95caacd3…

1 0

Sebastian Lackner : xaudio2_7: Only declare debug channel when needed.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 2fc672098850d22fd08d61e0340e4f9ef2504ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc672098850d22fd08d61e03… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 31 20:01:04 2016 +0200 xaudio2_7: Only declare debug channel when needed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 2 ++ dlls/xaudio2_7/x3daudio.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 516d6c2..b9e720f 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -101,7 +101,9 @@ #include "wine/debug.h" +#if XAUDIO2_VER <= 7 WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index a182852..58f7062 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -23,7 +23,9 @@ #include "wine/debug.h" +#if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif #ifdef X3DAUDIO1_VER BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_gl_frontbuffer_updated().
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: f80ba28a1552db3d455cb88ed063c87bcc72c58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80ba28a1552db3d455cb88ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:59 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_gl_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 52f3e71..802e2bc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -637,12 +637,11 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain) { - struct wined3d_surface *surface; + struct wined3d_texture *front_buffer = swapchain->front_buffer; struct wined3d_context *context; - surface = swapchain->front_buffer->sub_resources[0].u.surface; - context = context_acquire(swapchain->device, surface); - surface_load_location(surface, context, surface->container->resource.draw_binding); + context = context_acquire(swapchain->device, front_buffer->sub_resources[0].u.surface); + wined3d_texture_load_location(front_buffer, 0, context, front_buffer->resource.draw_binding); context_release(context); SetRectEmpty(&swapchain->front_buffer_update); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_gl_present().
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 398f0d024f49ff2fd0958242b92c1461a0b64f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=398f0d024f49ff2fd0958242b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:58 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 13106bf..52f3e71 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -483,14 +483,14 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { - struct wined3d_surface *back_buffer = swapchain->back_buffers[0]->sub_resources[0].u.surface; + struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; - context = context_acquire(swapchain->device, back_buffer); + context = context_acquire(swapchain->device, back_buffer->sub_resources[0].u.surface); if (!context->valid) { context_release(context); @@ -505,7 +505,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_texture_blt(swapchain->back_buffers[0], 0, &rect, logo_texture, 0, &rect, + wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } @@ -525,16 +525,14 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain->device->cursor_texture->resource.width, swapchain->device->cursor_texture->resource.height }; - const RECT clip_rect = {0, 0, - swapchain->back_buffers[0]->resource.width, - swapchain->back_buffers[0]->resource.height}; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; TRACE("Rendering the software cursor.\n"); if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(swapchain->back_buffers[0], 0, &dst_rect, + wined3d_texture_blt(back_buffer, 0, &dst_rect, swapchain->device->cursor_texture, 0, &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } @@ -559,14 +557,14 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, */ if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - surface_load_location(back_buffer, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(back_buffer->container, 0, WINED3D_LOCATION_DRAWABLE); + wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(back_buffer, 0, WINED3D_LOCATION_DRAWABLE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } else { - surface_load_location(back_buffer, context, back_buffer->container->resource.draw_binding); + wined3d_texture_load_location(back_buffer, 0, context, back_buffer->resource.draw_binding); } if (swapchain->render_to_fbo)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_swapchain_rotate().
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 42b90efdfd8d2f019d9e85f9829d6bc2097359cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b90efdfd8d2f019d9e85f98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:57 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_swapchain_rotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0543d77..13106bf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -460,7 +460,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct sub_resource = &texture->sub_resources[0]; if (!(sub_resource->locations & supported_locations)) - surface_load_location(sub_resource->u.surface, context, texture->resource.draw_binding); + wined3d_texture_load_location(texture, 0, context, texture->resource.draw_binding); texture_prev->texture_rgb = texture->texture_rgb; texture_prev->rb_multisample = texture->rb_multisample;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_blit().
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 3e6494321e4c9b6a0f4000077f23da7299025ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6494321e4c9b6a0f4000077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:56 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e3d6259..0543d77 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -330,7 +330,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, if (texture->resource.multisample_type) { location = WINED3D_LOCATION_RB_RESOLVED; - surface_load_location(back_buffer, context, location); + wined3d_texture_load_location(texture, 0, context, location); } context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, back_buffer, NULL, location);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_surface_blt().
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 140220375936ea4f2c5393d46027ed2d7de1d7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140220375936ea4f2c5393d46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:55 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ba63fd..efdea87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4226,7 +4226,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { struct wined3d_context *context = context_acquire(device, dst_surface); - surface_load_location(dst_surface, context, dst_texture->resource.draw_binding); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, + context, dst_texture->resource.draw_binding); context_release(context); } return WINED3D_OK;

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
78
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 2016