wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : wined3d: wined3d_device_set_sampler_state() never fails.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 0d96be2c201e514007327133783b03536c7b8798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d96be2c201e5140073271337… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:57 2012 +0200 wined3d: wined3d_device_set_sampler_state() never fails. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 16 +++++++--------- dlls/wined3d/device.c | 10 ++++------ include/wine/wined3d.h | 2 +- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f6f0501..2b7e7c0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1812,7 +1812,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value); @@ -1826,7 +1826,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - hr = wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); else hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fcdfc6f..ea90e1a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1809,15 +1809,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev DWORD sampler, D3DSAMPLERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, sampler %u, state %#x, value %#x.\n", iface, sampler, state, value); wined3d_mutex_lock(); - hr = wined3d_device_set_sampler_state(device->wined3d_device, sampler, state, value); + wined3d_device_set_sampler_state(device->wined3d_device, sampler, state, value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWORD *pass_count) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 996fca8..908efa3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2509,7 +2509,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE state, DWORD value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); @@ -2552,7 +2552,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag); break; } @@ -2597,7 +2597,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER, tex_mip); - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER, tex_min); break; } @@ -2607,11 +2607,11 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, 0, WINED3D_SAMP_ADDRESS_V, value); /* Drop through */ case D3DRENDERSTATE_TEXTUREADDRESSU: - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U, value); break; case D3DRENDERSTATE_TEXTUREADDRESSV: - hr = wined3d_device_set_sampler_state(device->wined3d_device, + wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V, value); break; @@ -2630,7 +2630,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_ZBIAS: wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); - hr = D3D_OK; break; default: @@ -2643,7 +2642,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, } wined3d_device_set_render_state(device->wined3d_device, state, value); - hr = D3D_OK; break; } wined3d_mutex_unlock(); @@ -4728,7 +4726,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); @@ -4806,7 +4804,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8bb403..596206c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2325,7 +2325,7 @@ DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, return device->stateBlock->state.render_states[state]; } -HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, +void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { DWORD old_value; @@ -2340,7 +2340,7 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, / sizeof(*device->stateBlock->state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + return; /* Windows accepts overflowing this array ... we do not. */ } old_value = device->stateBlock->state.sampler_states[sampler_idx][state]; @@ -2351,18 +2351,16 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (old_value == value) { TRACE("Application is setting the old value over, nothing to do.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4d10fd6..57b6a1b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2223,7 +2223,7 @@ void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport); -HRESULT __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, +void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); HRESULT __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);

1 0

Henri Verbeet : d3d10: Use debugstr_a() on variable names in parse_fx10_object().
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: b0795aafd33aa0e1f4493bc682cb8ec04c8eb79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0795aafd33aa0e1f4493bc68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:56 2012 +0200 d3d10: Use debugstr_a() on variable names in parse_fx10_object(). --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d1337b..e2a4744 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1297,7 +1297,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOO_PARSED_OBJECT: /* This is a local object, we've parsed in parse_fx10_local_object. */ - TRACE("Shader = %s.\n", data + offset); + TRACE("Variable name %s.\n", debugstr_a(data + offset)); o->data = e->lpVtbl->GetVariableByName(e, data + offset); hr = S_OK; @@ -1308,7 +1308,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr data_ptr = data + offset; read_dword(&data_ptr, &offset); read_dword(&data_ptr, &o->index); - TRACE("Shader = %s[%u].\n", data + offset, o->index); + TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), o->index); o->data = e->lpVtbl->GetVariableByName(e, data + offset); hr = S_OK;

1 0

Henri Verbeet : d3d10core: Replace a FIXME with a TRACE in d3d10_device_CreateSamplerState().
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 843db2c3643000cab3fc2f9a3167a8c130fb6112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843db2c3643000cab3fc2f9a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:55 2012 +0200 d3d10core: Replace a FIXME with a TRACE in d3d10_device_CreateSamplerState(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1e54db2..b6c29f4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1091,7 +1091,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i struct d3d10_sampler_state *object; HRESULT hr; - FIXME("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Jacek Caban : jscript: Pack jsval_t to 64-bit structure on i386.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 37509e540fc892c7919613204cf527fde6cd4090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37509e540fc892c7919613204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:02:27 2012 +0200 jscript: Pack jsval_t to 64-bit structure on i386. --- dlls/jscript/jsutils.c | 4 +- dlls/jscript/jsval.h | 143 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 114 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d4260ca..c76d09a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -239,8 +239,8 @@ HRESULT jsval_variant(jsval_t *val, VARIANT *var) VARIANT *v; HRESULT hres; - val->type = JSV_VARIANT; - val->u.v = v = heap_alloc(sizeof(VARIANT)); + __JSVAL_TYPE(*val) = JSV_VARIANT; + __JSVAL_VAR(*val) = v = heap_alloc(sizeof(VARIANT)); if(!v) return E_OUTOFMEMORY; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index a678e05..9909de7 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -19,17 +19,52 @@ #ifndef JSVAL_H #define JSVAL_H +/* + * jsval_t structure is used to represent JavaScript dynamically-typed values. + * It's a (type,value) pair, usually represented as a structure of enum (type) + * and union (value of given type). For both memory and speed performance, we + * use tricks allowing storing both values as a struct with size equal to + * size of double (that is 64-bit) on 32-bit systems. For that, we use the fact + * that NaN value representation has 52 (almost) free bits. + */ + +#ifdef __i386__ +#define JSVAL_DOUBLE_LAYOUT_PTR32 +#endif + +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 +/* NaN exponent and our 0x80000 marker */ +#define JSV_VAL(x) (0x7ff80000|x) +#else +#define JSV_VAL(x) x +#endif + typedef enum { - JSV_UNDEFINED, - JSV_NULL, - JSV_OBJECT, - JSV_STRING, - JSV_NUMBER, - JSV_BOOL, - JSV_VARIANT + JSV_UNDEFINED = JSV_VAL(1), + JSV_NULL = JSV_VAL(2), + JSV_OBJECT = JSV_VAL(3), + JSV_STRING = JSV_VAL(4), + JSV_NUMBER = JSV_VAL(5), + JSV_BOOL = JSV_VAL(6), + JSV_VARIANT = JSV_VAL(7) } jsval_type_t; struct _jsval_t { +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + union { + double n; + struct { + union { + IDispatch *obj; + BSTR str; + BOOL b; + VARIANT *v; + UINT_PTR as_uintptr; + } u; + jsval_type_t tag; + } s; + } u; +#else jsval_type_t type; union { IDispatch *obj; @@ -38,29 +73,50 @@ struct _jsval_t { BOOL b; VARIANT *v; } u; +#endif }; +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + +C_ASSERT(sizeof(jsval_t) == sizeof(double)); + +#define __JSVAL_TYPE(x) ((x).u.s.tag) +#define __JSVAL_BOOL(x) ((x).u.s.u.b) +#define __JSVAL_STR(x) ((x).u.s.u.str) +#define __JSVAL_OBJ(x) ((x).u.s.u.obj) +#define __JSVAL_VAR(x) ((x).u.s.u.v) + +#else + +#define __JSVAL_TYPE(x) ((x).type) +#define __JSVAL_BOOL(x) ((x).u.b) +#define __JSVAL_STR(x) ((x).u.str) +#define __JSVAL_OBJ(x) ((x).u.obj) +#define __JSVAL_VAR(x) ((x).u.v) + +#endif + static inline jsval_t jsval_bool(BOOL b) { jsval_t ret; - ret.type = JSV_BOOL; - ret.u.b = b; + __JSVAL_TYPE(ret) = JSV_BOOL; + __JSVAL_BOOL(ret) = b; return ret; } static inline jsval_t jsval_string(BSTR str) { jsval_t ret; - ret.type = JSV_STRING; - ret.u.str = str; + __JSVAL_TYPE(ret) = JSV_STRING; + __JSVAL_STR(ret) = str; return ret; } static inline jsval_t jsval_disp(IDispatch *obj) { jsval_t ret; - ret.type = JSV_OBJECT; - ret.u.obj = obj; + __JSVAL_TYPE(ret) = JSV_OBJECT; + __JSVAL_OBJ(ret) = obj; return ret; } @@ -71,72 +127,97 @@ static inline jsval_t jsval_obj(jsdisp_t *obj) static inline jsval_t jsval_null(void) { - jsval_t ret = { JSV_NULL }; + jsval_t ret; + __JSVAL_TYPE(ret) = JSV_NULL; return ret; } static inline jsval_t jsval_undefined(void) { - jsval_t ret = { JSV_UNDEFINED }; + jsval_t ret; + __JSVAL_TYPE(ret) = JSV_UNDEFINED; return ret; } static inline jsval_t jsval_number(double n) { jsval_t ret; +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + ret.u.n = n; + /* normalize NaN value */ + if((ret.u.s.tag & 0x7ff00000) == 0x7ff00000) { + /* isinf */ + if(ret.u.s.tag & 0xfffff) { + ret.u.s.tag = 0x7ff00000; + ret.u.s.u.as_uintptr = ~0; + }else if(ret.u.s.u.as_uintptr) { + ret.u.s.tag = 0x7ff00000; + } + } + return ret; +#else ret.type = JSV_NUMBER; ret.u.n = n; +#endif return ret; } -static inline jsval_type_t jsval_type(jsval_t v) -{ - return v.type; -} - static inline BOOL is_object_instance(jsval_t v) { - return v.type == JSV_OBJECT; + return __JSVAL_TYPE(v) == JSV_OBJECT; } static inline BOOL is_undefined(jsval_t v) { - return v.type == JSV_UNDEFINED; + return __JSVAL_TYPE(v) == JSV_UNDEFINED; } static inline BOOL is_null(jsval_t v) { - return v.type == JSV_NULL; + return __JSVAL_TYPE(v) == JSV_NULL; } static inline BOOL is_null_instance(jsval_t v) { - return v.type == JSV_NULL || (v.type == JSV_OBJECT && !v.u.obj); + return is_null(v) || (is_object_instance(v) && !__JSVAL_OBJ(v)); } static inline BOOL is_string(jsval_t v) { - return v.type == JSV_STRING; + return __JSVAL_TYPE(v) == JSV_STRING; } static inline BOOL is_number(jsval_t v) { +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + return (v.u.s.tag & 0x7ff80000) != 0x7ff80000; +#else return v.type == JSV_NUMBER; +#endif } static inline BOOL is_variant(jsval_t v) { - return v.type == JSV_VARIANT; + return __JSVAL_TYPE(v) == JSV_VARIANT; } static inline BOOL is_bool(jsval_t v) { - return v.type == JSV_BOOL; + return __JSVAL_TYPE(v) == JSV_BOOL; +} + +static inline jsval_type_t jsval_type(jsval_t v) +{ +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + return is_number(v) ? JSV_NUMBER : v.u.s.tag; +#else + return v.type; +#endif } static inline IDispatch *get_object(jsval_t v) { - return v.u.obj; + return __JSVAL_OBJ(v); } static inline double get_number(jsval_t v) @@ -146,17 +227,17 @@ static inline double get_number(jsval_t v) static inline BSTR get_string(jsval_t v) { - return v.u.str; + return __JSVAL_STR(v); } static inline VARIANT *get_variant(jsval_t v) { - return v.u.v; + return __JSVAL_VAR(v); } static inline BOOL get_bool(jsval_t v) { - return v.u.b; + return __JSVAL_BOOL(v); } HRESULT variant_to_jsval(VARIANT*,jsval_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Don't store jsexcept_t in exec_ctx_t.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 33331b1ccf8c82a86f5ffa052a6813a01cc59f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33331b1ccf8c82a86f5ffa052… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:02:16 2012 +0200 jscript: Don't store jsexcept_t in exec_ctx_t. --- dlls/jscript/engine.c | 19 ++++++++----------- dlls/jscript/engine.h | 1 - dlls/jscript/jscript.h | 5 ++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ed17b73..6ff55e9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -685,8 +685,8 @@ static HRESULT interp_throw(exec_ctx_t *ctx) { TRACE("\n"); - jsval_release(ctx->ei->val); - ctx->ei->val = stack_pop(ctx); + jsval_release(ctx->script->ei.val); + ctx->script->ei.val = stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -778,7 +778,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) jsval_release(v); stack_popn(ctx, 1); - ctx->ei->val = stack_pop(ctx); + ctx->script->ei.val = stack_pop(ctx); return SUCCEEDED(hres) ? DISP_E_EXCEPTION : hres; } @@ -2395,8 +2395,9 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - except_val = ctx->ei->val; - memset(ctx->ei, 0, sizeof(*ctx->ei)); + except_val = ctx->script->ei.val; + ctx->script->ei.val = jsval_undefined(); + clear_ei(ctx->script); ident = except_frame->ident; heap_free(except_frame); @@ -2431,7 +2432,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsexcept_t *ei, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; except_frame_t *prev_except_frame; @@ -2439,7 +2440,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code unsigned prev_ip, prev_top; scope_chain_t *prev_scope; bytecode_t *prev_code; - jsexcept_t *prev_ei; jsop_t op; HRESULT hres = S_OK; @@ -2449,11 +2449,9 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; - prev_ei = exec_ctx->ei; prev_code = exec_ctx->code; prev_func = exec_ctx->func_code; exec_ctx->ip = func->instr_off; - exec_ctx->ei = ei; exec_ctx->except_frame = NULL; exec_ctx->code = code; exec_ctx->func_code = func; @@ -2477,7 +2475,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code } exec_ctx->ip = prev_ip; - exec_ctx->ei = prev_ei; exec_ctx->except_frame = prev_except_frame; exec_ctx->code = prev_code; exec_ctx->func_code = prev_func; @@ -2535,7 +2532,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO prev_ctx = ctx->script->exec_ctx; ctx->script->exec_ctx = ctx; - hres = enter_bytecode(ctx->script, code, func, &ctx->script->ei, &val); + hres = enter_bytecode(ctx->script, code, func, &val); assert(ctx->script->exec_ctx == ctx); ctx->script->exec_ctx = prev_ctx; if(FAILED(hres)) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bebef3b..f7e03f7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -236,7 +236,6 @@ struct _exec_ctx_t { except_frame_t *except_frame; unsigned ip; - jsexcept_t *ei; }; static inline void exec_addref(exec_ctx_t *ctx) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b3b1f0a..87d43e8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -37,7 +37,6 @@ typedef struct _jsval_t jsval_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; -typedef struct _jsexcept_t jsexcept_t; typedef struct { void **blocks; @@ -295,10 +294,10 @@ typedef struct { #include "jsval.h" -struct _jsexcept_t { +typedef struct { EXCEPINFO ei; jsval_t val; -}; +} jsexcept_t; struct _script_ctx_t { LONG ref;

1 0

Jacek Caban : jscript: Store exception value in script_ctx_t instead of passing it everywhere.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 6f5475dd26f4241ccab55fe11f377168d6e5afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5475dd26f4241ccab55fe11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:01:49 2012 +0200 jscript: Store exception value in script_ctx_t instead of passing it everywhere. --- dlls/jscript/activex.c | 6 +- dlls/jscript/array.c | 191 ++++++++++++++-------------- dlls/jscript/bool.c | 16 +-- dlls/jscript/date.c | 323 +++++++++++++++++++++++------------------------ dlls/jscript/dispex.c | 114 ++++++++--------- dlls/jscript/engine.c | 181 ++++++++++++++------------- dlls/jscript/engine.h | 2 +- dlls/jscript/error.c | 96 +++++++------- dlls/jscript/function.c | 108 ++++++++--------- dlls/jscript/global.c | 153 +++++++++++----------- dlls/jscript/jscript.c | 8 +- dlls/jscript/jscript.h | 78 ++++++------ dlls/jscript/jsutils.c | 50 ++++---- dlls/jscript/math.c | 78 ++++++------ dlls/jscript/number.c | 56 ++++---- dlls/jscript/object.c | 22 ++-- dlls/jscript/regexp.c | 71 +++++------ dlls/jscript/string.c | 198 ++++++++++++++--------------- dlls/jscript/vbarray.c | 44 ++++---- 19 files changed, 886 insertions(+), 909 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f5475dd26f4241ccab55…

1 0

Matteo Bruni : d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat().
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 19f951e86a253a10bb908bc9c99fc6ab60ca9e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f951e86a253a10bb908bc9c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:09 2012 +0200 d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat(). --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 837a72e..a528e80 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -93,7 +93,7 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, return NULL; } - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A32B32G32R32F, + hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); if (FAILED(hr)) {

1 0

Matteo Bruni : d3dcompiler: Parse "return" statement.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: ae11ba0b2349bd5261b6c4e186233c1a349d2063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae11ba0b2349bd5261b6c4e18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:08 2012 +0200 d3dcompiler: Parse "return" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 +++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++++++++----- dlls/d3dcompiler_43/utils.c | 37 +++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 28e77d3..eb75448 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -837,6 +838,21 @@ struct hlsl_ir_expr struct list *subexpressions; }; +enum hlsl_ir_jump_type +{ + HLSL_IR_JUMP_BREAK, + HLSL_IR_JUMP_CONTINUE, + HLSL_IR_JUMP_DISCARD, + HLSL_IR_JUMP_RETURN, +}; + +struct hlsl_ir_jump +{ + struct hlsl_ir_node node; + enum hlsl_ir_jump_type type; + struct hlsl_ir_node *return_value; +}; + struct hlsl_ir_swizzle { struct hlsl_ir_node node; @@ -1003,6 +1019,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_jump *jump_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_JUMP); + return CONTAINING_RECORD(node, struct hlsl_ir_jump, node); +} + static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_ASSIGNMENT); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 35c9a4c..75b5741 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -497,6 +497,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <list> statement %type <list> statement_list %type <list> compound_statement +%type <list> jump_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter @@ -990,16 +991,32 @@ statement_list: statement } statement: declaration_statement - { - $$ = $1; - } | expr_statement - { - $$ = $1; - } | compound_statement + | jump_statement + + /* FIXME: add rule for return with no value */ +jump_statement: KW_RETURN expr ';' { - $$ = $1; + struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory\n"); + return -1; + } + jump->node.type = HLSL_IR_JUMP; + set_location(&jump->node.loc, &@1); + jump->type = HLSL_IR_JUMP_RETURN; + jump->node.data_type = $2->data_type; + jump->return_value = $2; + + FIXME("Check for valued return on void function.\n"); + FIXME("Implicit conversion to the return type if needed, " + "error out if conversion not possible.\n"); + + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_tail($$, &jump->node.entry); } expr_statement: ';' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c403a98..e0d351c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1742,6 +1742,8 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_FUNCTION_DECL", + "HLSL_IR_JUMP", + "HLSL_IR_SWIZZLE", }; if (type >= sizeof(names) / sizeof(names[0])) @@ -1973,6 +1975,28 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } } +static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) +{ + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + TRACE("break"); + break; + case HLSL_IR_JUMP_CONTINUE: + TRACE("continue"); + break; + case HLSL_IR_JUMP_DISCARD: + TRACE("discard"); + break; + case HLSL_IR_JUMP_RETURN: + TRACE("return "); + if (jump->return_value) + debug_dump_instr(jump->return_value); + TRACE(";"); + break; + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -1995,6 +2019,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTRUCTOR: debug_dump_ir_constructor(constructor_from_node(instr)); break; + case HLSL_IR_JUMP: + debug_dump_ir_jump(jump_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -2132,6 +2159,13 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) d3dcompiler_free(assignment); } +static void free_ir_jump(struct hlsl_ir_jump *jump) +{ + if (jump->type == HLSL_IR_JUMP_RETURN) + free_instr(jump->return_value); + d3dcompiler_free(jump); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -2157,6 +2191,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_ASSIGNMENT: free_ir_assignment(assignment_from_node(node)); break; + case HLSL_IR_JUMP: + free_ir_jump(jump_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Matteo Bruni : d3dcompiler: Only a few modifiers are relevant in type comparison.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 47e931823cd227abc2122610734700665b414b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e931823cd227abc21226107… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:07 2012 +0200 d3dcompiler: Only a few modifiers are relevant in type comparison. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/utils.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a191529..28e77d3 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -732,6 +732,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + struct hlsl_ir_var { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f288efc..c403a98 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -921,7 +921,8 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ return FALSE; if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) return FALSE; - if (t1->modifiers != t2->modifiers) + if ((t1->modifiers & HLSL_MODIFIERS_COMPARISON_MASK) + != (t2->modifiers & HLSL_MODIFIERS_COMPARISON_MASK)) return FALSE; if (t1->dimx != t2->dimx) return FALSE;

1 0

Matteo Bruni : d3dcompiler: Don' t write the shader version tag from the header backend function.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 4ccffd8fa97fab92c795d0de2b3a5ed3fbc0ebec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccffd8fa97fab92c795d0de2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:06 2012 +0200 d3dcompiler: Don't write the shader version tag from the header backend function. --- dlls/d3dcompiler_43/bytecodewriter.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index f24ac9d..d10f6bc 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -744,12 +744,8 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, FALSE); - return; } static HRESULT find_ps_builtin_semantics(struct bc_writer *This, @@ -826,8 +822,6 @@ static void ps_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -847,8 +841,6 @@ static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -1595,14 +1587,10 @@ static void vs_2_header(struct bc_writer *This, return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); - return; } static void vs_2_srcreg(struct bc_writer *This, @@ -1875,8 +1863,6 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_samplers(shader, buffer); write_constF(shader, buffer, TRUE); @@ -2112,16 +2098,12 @@ static const struct bytecode_backend ps_2_x_backend = { }; static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); write_samplers(shader, buffer); - return; } static void sm_3_srcreg(struct bc_writer *This, @@ -2571,6 +2553,9 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR goto error; } + /* Write shader type and version */ + put_dword(buffer, shader->version); + writer->funcs->header(writer, shader, buffer); if(FAILED(writer->state)) { hr = writer->state;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
83
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 September 2012