wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : msxml3/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 9ec291500b6d7e4c5f6e1d92a4d4698875319217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec291500b6d7e4c5f6e1d92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 23:32:16 2011 +0200 msxml3/tests: Add a trailing '\n' to an ok() call. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cc123ff..b205090 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1272,7 +1272,7 @@ static void test_mxwriter_flush(void) pos.QuadPart = 0; hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(pos2.QuadPart == 0, "expected stream beginning"); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); ok(hr == S_OK, "got %08x\n", hr);

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_blit_implementation().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 4503f3d5afa7bc634cb6d2a31f32fbec232298e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503f3d5afa7bc634cb6d2a31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:50 2011 +0200 wined3d: Pass a gl_info pointer to select_blit_implementation(). --- dlls/wined3d/directx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index efee8fb..a43dc9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2162,9 +2162,8 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter) +static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; int vs_selected_mode, ps_selected_mode; select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); @@ -2600,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(gl_info); - adapter->blitter = select_blit_implementation(adapter); + adapter->blitter = select_blit_implementation(gl_info); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages;

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_fragment_implementation().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 86af42a46a9a4af14c2f8fb12ebfdf18ba80145e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86af42a46a9a4af14c2f8fb12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:48 2011 +0200 wined3d: Pass a gl_info pointer to select_fragment_implementation(). --- dlls/wined3d/directx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48d27af..8cb6d5b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2138,9 +2138,8 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return CARD_NVIDIA_RIVA_128; } -static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter) +static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; int vs_selected_mode, ps_selected_mode; select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); @@ -2599,7 +2598,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) LEAVE_GL(); - adapter->fragment_pipe = select_fragment_implementation(adapter); + adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(adapter); adapter->blitter = select_blit_implementation(adapter);

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_shader_backend().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 9aa4f895f084c7384993f3f0a133ced9c1018a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa4f895f084c7384993f3f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:49 2011 +0200 wined3d: Pass a gl_info pointer to select_shader_backend(). --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cb6d5b..efee8fb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2152,11 +2152,11 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru else return &ffp_fragment_pipeline; } -static const struct wined3d_shader_backend_ops *select_shader_backend(struct wined3d_adapter *adapter) +static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { int vs_selected_mode, ps_selected_mode; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; return &none_shader_backend; @@ -2599,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) LEAVE_GL(); adapter->fragment_pipe = select_fragment_implementation(gl_info); - adapter->shader_backend = select_shader_backend(adapter); + adapter->shader_backend = select_shader_backend(gl_info); adapter->blitter = select_blit_implementation(adapter); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps);

1 0

Henri Verbeet : wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state ().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: f65a1ed272a476a2df3c76d3f3ce944fd4eb0d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65a1ed272a476a2df3c76d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:47 2011 +0200 wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state(). We can do this now because SFLAG_INDRAWABLE is no longer ambiguous. --- dlls/wined3d/context.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e13af5f..95ec3ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -415,15 +415,15 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (render_targets) + if (location == SFLAG_INDRAWABLE) { - context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); - context_apply_fbo_entry(context, target, context->current_fbo); + context->current_fbo = NULL; + context_bind_fbo(context, target, NULL); } else { - context->current_fbo = NULL; - context_bind_fbo(context, target, NULL); + context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); + context_apply_fbo_entry(context, target, context->current_fbo); } }

1 0

Henri Verbeet : wined3d: Use draw_binding in context_apply_blit_state().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 47c5711fe235281121c854556570c7ad1cd418a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c5711fe235281121c854556… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:46 2011 +0200 wined3d: Use draw_binding in context_apply_blit_state(). --- dlls/wined3d/context.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4abe18e..e13af5f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1947,6 +1947,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { + struct wined3d_surface *rt = context->current_rt; DWORD rt_mask, old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -1955,12 +1956,12 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de if (context->render_offscreen) { - surface_internal_preload(context->current_rt, SRGB_RGB); + surface_internal_preload(rt, SRGB_RGB); ENTER_GL(); - context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); LEAVE_GL(); - if (context->current_rt && context->current_rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; else rt_mask = 0; @@ -1970,12 +1971,12 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); LEAVE_GL(); - rt_mask = context_generate_rt_mask_from_surface(context->current_rt); + rt_mask = context_generate_rt_mask_from_surface(rt); } } else { - rt_mask = context_generate_rt_mask_no_fbo(device, context->current_rt); + rt_mask = context_generate_rt_mask_no_fbo(device, rt); } old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask;

1 0

Henri Verbeet : wined3d: Use draw_binding in swapchain_gl_present().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: f0d8f2aa8914a41b17de3976f07db68fcfc670dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8f2aa8914a41b17de3976f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:45 2011 +0200 wined3d: Use draw_binding in swapchain_gl_present(). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 20c2323..fe1a510 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -614,7 +614,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->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP) - surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, TRUE); + surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); } if (fb->depth_stencil)

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_unload().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 6cdfb95c8e5f262557e24acd33ab7ae6207165a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cdfb95c8e5f262557e24acd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:44 2011 +0200 wined3d: Use draw_binding in surface_unload(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3edb48b..0572b47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1866,7 +1866,7 @@ static void surface_unload(struct wined3d_resource *resource) { /* Load the surface into system memory */ surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + surface_modify_location(surface, surface->draw_binding, FALSE); } surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE);

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_realize_palette().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 1d43f07239c7a0b9c014443091d9f627bed844f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d43f07239c7a0b9c01444309… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:43 2011 +0200 wined3d: Use draw_binding in surface_realize_palette(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 604073d..3edb48b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -811,7 +811,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - surface_load_location(surface, SFLAG_INDRAWABLE, NULL); + surface_load_location(surface, surface->draw_binding, NULL); } static HRESULT surface_draw_overlay(struct wined3d_surface *surface)

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_unmap().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 683b52ed92fde8f47dce36640225cd16aaf4009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=683b52ed92fde8f47dce36640… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:42 2011 +0200 wined3d: Use draw_binding in surface_unmap(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95f5052..604073d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -984,7 +984,7 @@ static void surface_unmap(struct wined3d_surface *surface) surface->flags |= SFLAG_INSYSMEM; } - surface_load_location(surface, SFLAG_INDRAWABLE, fullsurface ? NULL : &surface->dirtyRect); + surface_load_location(surface, surface->draw_binding, fullsurface ? NULL : &surface->dirtyRect); /* Partial rectangle tracking is not commonly implemented, it is only * done for render targets. INSYSMEM was set before to tell

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
77
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 2011