On 13 October 2011 01:07, Stefan Dösinger stefan@codeweavers.com wrote:
-static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface)
- static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *src,
const struct wined3d_surface *dst)
Whitespace error. The parameter you're adding isn't used anywhere, not even in the same patchset. Perhaps more important though is the point that "set_shader" is pretty much the wrong interface for blitters and should go away. Note that the blitter interface is something I'm actually working on as part of the ddraw work, it's just that other things keep coming up.
On Thursday 13 October 2011 14:39:58 Henri Verbeet wrote:
On 13 October 2011 01:07, Stefan Dösinger stefan@codeweavers.com wrote:
-static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) + static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *src, + const struct wined3d_surface *dst)
Whitespace error. The parameter you're adding isn't used anywhere, not even in the same patchset.
Patch 3: - upload_palette(src, context); + upload_palette(src, dst, context);
Perhaps more important though is the point that "set_shader" is pretty much the wrong interface for blitters and should go away. Note that the blitter interface is something I'm actually working on as part of the ddraw work, it's just that other things keep coming up.
What does the interface you plan look like?
I had a short look at this and my proposal is to separate the blitters into two interfaces: One that sets the shader for the color conversion(blit_shader without colorfill and depthfill), and one that does the drawable setup and initiates the data transfer(That could include blitters that call glTexSubImage2D when blitting from sysmem->vidmem)
The shader setup blitter could be hidden behind a quad draw blitter if you find a way to integrate swapchain_blit and surface_blt_to_drawable(especially frontbuffer texture -> frontbuffer drawable blit)
On 13 October 2011 20:58, Stefan Dösinger stefan@codeweavers.com wrote:
What does the interface you plan look like?
It's mostly a matter of getting rid of set_shader() / unset_shader() and introducing calls for doing color and depth blits. This shouldn't be much of a surprise, I'm pretty sure we looked at this when Roderick was still working on the blit code.
initiates the data transfer(That could include blitters that call glTexSubImage2D when blitting from sysmem->vidmem)
That's not necessarily something that belongs in individual blitters either. The idea is to make the blitters do GPU -> GPU transfers only, and do CPU <-> GPU mostly as uploads / downloads. I have some patches that go in that direction already.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Am 13.10.2011 um 22:27 schrieb Henri Verbeet:
It's mostly a matter of getting rid of set_shader() / unset_shader() and introducing calls for doing color and depth blits. This shouldn't be much of a surprise, I'm pretty sure we looked at this when Roderick was still working on the blit code.
No surprise there. The main question I have is, how do you handle blitting offscreen back/frontbuffers to the screen, and how do you select the correct color fixup shader for this?
On 13 October 2011 20:58, Stefan Dösinger stefan@codeweavers.com wrote:
initiates the data transfer(That could include blitters that call glTexSubImage2D when blitting from sysmem->vidmem)
That's not necessarily something that belongs in individual blitters either. The idea is to make the blitters do GPU -> GPU transfers only, and do CPU <-> GPU mostly as uploads / downloads. I have some patches that go in that direction already.
Do you mean catch it in wined3d_surface_blt with checks that test for those operations? Or do you mean keep the current software blt then upload the entire destination surface?
In the end CPU <-> GPU blits should call surface_upload_data/surface_download_data, no question about that. I'd just use wined3d_select_blitter to select a blitter that calls those functions instead of explicit checks in wined3d_surface_blit.
-
Henri Verbeet -
Stefan Dösinger