wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Jacek Caban : jscript: Store value as double in NumberInstance object.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 7bb41e75b63a2bd2362555d74317b2923aca90c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb41e75b63a2bd2362555d74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:30:51 2012 +0200 jscript: Store value as double in NumberInstance object. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 2 +- dlls/jscript/number.c | 33 ++++++++++++++------------------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index fbe3142..3948a9c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -242,7 +242,7 @@ HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,jsdisp_t**) DECLSPEC HRESULT create_regexp_var(script_ctx_t*,VARIANT*,VARIANT*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_number(script_ctx_t*,VARIANT*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 564dba6..31c471f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -623,7 +623,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) break; case VT_I4: case VT_R8: - hres = create_number(ctx, v, &dispex); + hres = create_number(ctx, num_val(v), &dispex); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 7a3d8b0..de0ff63 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; - VARIANT num; + double value; } NumberInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -76,17 +76,16 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D return throw_type_error(ctx, ei, JS_E_INVALIDARG, NULL); } - if(V_VT(&number->num) == VT_I4) - val = V_I4(&number->num); - else - val = V_R8(&number->num); + val = number->value; if(radix==10 || isnan(val) || isinf(val)) { - hres = to_string(ctx, &number->num, ei, &str); + VARIANT v; + + num_set_val(&v, val); + hres = to_string(ctx, &v, ei, &str); if(FAILED(hres)) return hres; - } - else { + }else { INT idx = 0; DOUBLE integ, frac, log_radix = 0; WCHAR buf[NUMBER_TOSTRING_BUF_SIZE+16]; @@ -218,7 +217,7 @@ static HRESULT Number_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return throw_type_error(ctx, ei, JS_E_NUMBER_EXPECTED, NULL); if(retv) - *retv = number->num; + num_set_val(retv, number->value); return S_OK; } @@ -231,7 +230,7 @@ static HRESULT Number_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP case INVOKE_FUNC: return throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL); case DISPATCH_PROPERTYGET: - *retv = number->num; + num_set_val(retv, number->value); break; default: @@ -288,20 +287,16 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags case DISPATCH_CONSTRUCT: { jsdisp_t *obj; - VARIANT v; if(arg_cnt(dp)) { hres = to_number(ctx, get_arg(dp, 0), ei, &n); if(FAILED(hres)) return hres; - - num_set_val(&v, n); }else { - V_VT(&v) = VT_I4; - V_I4(&v) = 0; + n = 0; } - hres = create_number(ctx, &v, &obj); + hres = create_number(ctx, n, &obj); if(FAILED(hres)) return hres; @@ -347,7 +342,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi if(FAILED(hres)) return hres; - V_VT(&number->num) = VT_I4; + number->value = 0; hres = create_builtin_function(ctx, NumberConstr_value, NumberW, NULL, PROPF_CONSTR|1, &number->dispex, ret); @@ -355,7 +350,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi return hres; } -HRESULT create_number(script_ctx_t *ctx, VARIANT *num, jsdisp_t **ret) +HRESULT create_number(script_ctx_t *ctx, double value, jsdisp_t **ret) { NumberInstance *number; HRESULT hres; @@ -364,7 +359,7 @@ HRESULT create_number(script_ctx_t *ctx, VARIANT *num, jsdisp_t **ret) if(FAILED(hres)) return hres; - number->num = *num; + number->value = value; *ret = &number->dispex; return S_OK;

1 0

Jacek Caban : jscript: Return double instead of VARIANT from stack_pop_number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0bf61fb64026afb956e765dbc01e899c9a4aa94a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf61fb64026afb956e765dbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:30:03 2012 +0200 jscript: Return double instead of VARIANT from stack_pop_number. --- dlls/jscript/engine.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c4259b9..955ba71 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -145,20 +145,15 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } -static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) +static HRESULT stack_pop_number(exec_ctx_t *ctx, double *r) { VARIANT *v; - double n; HRESULT hres; v = stack_pop(ctx); - hres = to_number(ctx->script, v, ctx->ei, &n); + hres = to_number(ctx->script, v, ctx->ei, r); VariantClear(v); - if(FAILED(hres)) - return hres; - - num_set_val(r, n); - return S_OK; + return hres; } static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) @@ -1569,7 +1564,7 @@ static HRESULT interp_add(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.6.2 */ static HRESULT interp_sub(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1582,13 +1577,13 @@ static HRESULT interp_sub(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)-num_val(&r)); + return stack_push_number(ctx, l-r); } /* ECMA-262 3rd Edition 11.5.1 */ static HRESULT interp_mul(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1601,13 +1596,13 @@ static HRESULT interp_mul(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)*num_val(&r)); + return stack_push_number(ctx, l*r); } /* ECMA-262 3rd Edition 11.5.2 */ static HRESULT interp_div(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1620,13 +1615,13 @@ static HRESULT interp_div(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)/num_val(&r)); + return stack_push_number(ctx, l/r); } /* ECMA-262 3rd Edition 11.5.3 */ static HRESULT interp_mod(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1639,7 +1634,7 @@ static HRESULT interp_mod(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, fmod(num_val(&l), num_val(&r))); + return stack_push_number(ctx, fmod(l, r)); } /* ECMA-262 3rd Edition 11.4.2 */ @@ -1862,7 +1857,7 @@ static HRESULT interp_typeof(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.7 */ static HRESULT interp_minus(exec_ctx_t *ctx) { - VARIANT n; + double n; HRESULT hres; TRACE("\n"); @@ -1871,7 +1866,7 @@ static HRESULT interp_minus(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, -num_val(&n)); + return stack_push_number(ctx, -n); } /* ECMA-262 3rd Edition 11.4.6 */

1 0

Jacek Caban : jscript: Return double instead of VARIANT from date_utc.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0d287ff0b103037470a6064e5248643e9f4f0eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d287ff0b103037470a6064e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:29:21 2012 +0200 jscript: Return double instead of VARIANT from date_utc. --- dlls/jscript/date.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 4ca6e81..d9c0d39 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2431,7 +2431,7 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) +static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, double *ret, jsexcept_t *ei) { double year, month, vdate, hours, minutes, seconds, ms; int arg_no = arg_cnt(dp); @@ -2497,22 +2497,23 @@ static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv, jsexce ms = 0; } - if(retv) { - V_VT(retv) = VT_R8; - V_R8(retv) = time_clip(make_date( - make_day(year, month, vdate), - make_time(hours, minutes,seconds, ms))); - } - + *ret = time_clip(make_date(make_day(year, month, vdate), + make_time(hours, minutes,seconds, ms))); return S_OK; } static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { + double n; + HRESULT hres; + TRACE("\n"); - return date_utc(ctx, dp, retv, ei); + hres = date_utc(ctx, dp, &n, ei); + if(SUCCEEDED(hres) && retv) + num_set_val(retv, n); + return hres; } static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -2567,14 +2568,14 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, /* ECMA-262 3rd Edition 15.9.3.1 */ default: { - VARIANT ret_date; + double ret_date; DateInstance *di; hres = date_utc(ctx, dp, &ret_date, ei); if(FAILED(hres)) return hres; - hres = create_date(ctx, NULL, num_val(&ret_date), &date); + hres = create_date(ctx, NULL, ret_date, &date); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Return double instead of VARIANT from to_number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 451169fb93a645bdf992ea9d727a561903f3854c URL: http://source.winehq.org/git/wine.git/?a=commit;h=451169fb93a645bdf992ea9d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:28:51 2012 +0200 jscript: Return double instead of VARIANT from to_number. --- dlls/jscript/array.c | 39 ++---- dlls/jscript/date.c | 322 +++++++++++++++++++++--------------------------- dlls/jscript/engine.c | 54 +++++---- dlls/jscript/error.c | 14 +-- dlls/jscript/global.c | 18 ++-- dlls/jscript/jscript.h | 9 ++- dlls/jscript/jsutils.c | 83 +++++++------ dlls/jscript/math.c | 101 +++++++--------- dlls/jscript/number.c | 17 ++- dlls/jscript/regexp.c | 12 +-- 10 files changed, 314 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451169fb93a645bdf992e…

1 0

Aric Stewart : strmbase: COM cleanup for TransformFilter.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: f1c9bd444c02898d93e90981add512958c14b30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c9bd444c02898d93e90981a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:06:13 2012 -0500 strmbase: COM cleanup for TransformFilter. --- dlls/strmbase/transform.c | 98 +++++++++++++++++++++++++++++--------------- 1 files changed, 64 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1c9bd444c02898d93e90…

1 0

Aric Stewart : wineqtdecoder: COM cleanup.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: e49e32556d86723a7fc503f4ec215dc1fbfc9d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49e32556d86723a7fc503f4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:05:53 2012 -0500 wineqtdecoder: COM cleanup. --- dlls/wineqtdecoder/qtsplitter.c | 149 +++++++++++++++++++++++---------------- dlls/wineqtdecoder/qtvdecoder.c | 26 +++++-- 2 files changed, 107 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e49e32556d86723a7fc50…

1 0

Henri Verbeet : wined3d: Drop the ORM_BACKBUFFER special case in surface_unmap().
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 00a40114255b3fbdd506f79875d3894b17a5217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a40114255b3fbdd506f7987… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:12 2012 +0200 wined3d: Drop the ORM_BACKBUFFER special case in surface_unmap(). --- dlls/wined3d/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a96db7c..98d259c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,10 +953,8 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } - if ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN && surface->container.u.swapchain->front_buffer == surface) - || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER - && device->fb.render_targets && surface == device->fb.render_targets[0])) { if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width

1 0

Henri Verbeet : wined3d: Only update the drawable on surface unmap for the frontbuffer.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d1e00648ff6aabb5921aaac27f2c697bbe7356a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e00648ff6aabb5921aaac27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:11 2012 +0200 wined3d: Only update the drawable on surface unmap for the frontbuffer. --- dlls/wined3d/surface.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3148473..a96db7c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,12 +953,8 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } - /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows - * what obscure bugs in backbuffer ORM removing it will uncover. Also, - * this should only be needed for the frontbuffer, but that requires - * present calls to call surface_load_location() on the backbuffer. - * Fix both of those after 1.4. */ - if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + if ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface->container.u.swapchain->front_buffer == surface) || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER && device->fb.render_targets && surface == device->fb.render_targets[0])) {

1 0

Henri Verbeet : wined3d: Load the backbuffer in the correct location before presenting in swapchain_gl_present ().
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6f8b8bda2d94e436ce4788bbe9d06a4ef7bfd2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8b8bda2d94e436ce4788bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:10 2012 +0200 wined3d: Load the backbuffer in the correct location before presenting in swapchain_gl_present(). --- dlls/wined3d/swapchain.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index efe2293..2674ce6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -449,13 +449,14 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { + struct wined3d_surface *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; RECT src_rect, dst_rect; BOOL render_to_fbo; - context = context_acquire(swapchain->device, swapchain->back_buffers[0]); + context = context_acquire(swapchain->device, back_buffer); if (!context->valid) { context_release(context); @@ -504,8 +505,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R */ if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(swapchain->back_buffers[0], &destRect, - &cursor, NULL, WINEDDBLT_KEYSRC, NULL, WINED3D_TEXF_POINT); + wined3d_surface_blt(back_buffer, &destRect, &cursor, NULL, WINEDDBLT_KEYSRC, + NULL, WINED3D_TEXF_POINT); } if (swapchain->device->logo_surface) @@ -514,8 +515,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(swapchain->back_buffers[0], &rect, src_surface, &rect, - WINEDDBLT_KEYSRC, NULL, WINED3D_TEXF_POINT); + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + NULL, WINED3D_TEXF_POINT); } TRACE("Presenting HDC %p.\n", context->hdc); @@ -559,11 +560,15 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R */ if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - surface_load_location(swapchain->back_buffers[0], SFLAG_INTEXTURE, NULL); - surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, FALSE); + surface_load_location(back_buffer, SFLAG_INTEXTURE, NULL); + surface_modify_location(back_buffer, SFLAG_INDRAWABLE, FALSE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } + else + { + surface_load_location(back_buffer, back_buffer->draw_binding, NULL); + } if (swapchain->render_to_fbo) { @@ -626,17 +631,17 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R } if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) - || (swapchain->back_buffers[0]->flags & SFLAG_INSYSMEM))) + || (back_buffer->flags & SFLAG_INSYSMEM))) { /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying * Doesn't work with render_to_fbo because we're not flipping */ struct wined3d_surface *front = swapchain->front_buffer; - struct wined3d_surface *back = swapchain->back_buffers[0]; - if(front->resource.size == back->resource.size) { + if (front->resource.size == back_buffer->resource.size) + { DWORD fbflags; - flip_surface(front, back); + flip_surface(front, back_buffer); /* Tell the front buffer surface that is has been modified. However, * the other locations were preserved during that, so keep the flags. @@ -648,7 +653,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R else { surface_modify_location(front, SFLAG_INDRAWABLE, TRUE); - surface_modify_location(back, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(back_buffer, SFLAG_INDRAWABLE, TRUE); } } else @@ -660,7 +665,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * the texture / sysmem copy needs to be reloaded from the drawable */ if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) - surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); + surface_modify_location(back_buffer, back_buffer->draw_binding, TRUE); } if (fb->depth_stencil)

1 0

Henri Verbeet : wined3d: Drop an Apple hack.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 337b63d878bc1b927a6ac19ce79ec82de5a91474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337b63d878bc1b927a6ac19ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:09 2012 +0200 wined3d: Drop an Apple hack. The hack actually breaks things on cards that do support more than 256 uniforms in GLSL. --- dlls/wined3d/directx.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a00a42c..e5be4ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -784,17 +784,8 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } -static void quirk_arb_constants(struct wined3d_gl_info *gl_info) -{ - TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); - gl_info->limits.glsl_vs_float_constants = gl_info->limits.arb_vs_native_constants; - TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->limits.arb_ps_native_constants); - gl_info->limits.glsl_ps_float_constants = gl_info->limits.arb_ps_native_constants; -} - static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { - quirk_arb_constants(gl_info); /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should * allow 48 different offsets or other helper immediate values. */ @@ -918,12 +909,6 @@ static const struct driver_quirk quirk_table[] = quirk_amd_dx9, "AMD normalized texrect quirk" }, - /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are - * used it falls back to software. While the compiler can detect if the shader uses all declared - * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader - * using relative addressing falls back to software. - * - * ARB vp gives the correct amount of uniforms, so use it instead of GLSL. */ { match_apple, quirk_apple_glsl_constants,

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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 March 2012