ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
126,509 Commits 3 Branches 0 Tags
Commit Graph

1660 Commits

Author SHA1 Message Date
Henri Verbeet
c09072e5dd wined3d: Pass a texture and sub-resource index to wined3d_surface_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-05 06:57:07 -06:00
Henri Verbeet
612ceee6a0 wined3d: Pass a texture to surface_translate_drawable_coords(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-05 06:57:05 -06:00
Henri Verbeet
365948bf70 wined3d: Explicitly pass the sub-resource level to surface_is_full_rect(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-02 10:54:20 +01:00
Henri Verbeet
97c7b6ae9a wined3d: Explicitly calculate the sub-resource level in raw_blitter_blit(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-02 10:54:20 +01:00
Henri Verbeet
462b6d1bc8 wined3d: Explicitly calculate the sub-resource level in surface_load_renderbuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-02 10:54:20 +01:00
Henri Verbeet
4fc70a3b6a wined3d: Explicitly calculate the sub-resource level in surface_load_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-01 19:25:56 +01:00
Henri Verbeet
4d84feb542 wined3d: Explicitly calculate the sub-resource level in surface_load_drawable(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-01 19:25:56 +01:00
Henri Verbeet
28d0ee637a wined3d: Explicitly calculate the sub-resource level in surface_blt_special(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-01 19:25:56 +01:00
Henri Verbeet
6be6bf7d70 wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-01 19:25:56 +01:00
Henri Verbeet
c8120f526e wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-28 17:24:38 +01:00
Henri Verbeet
8e7540b602 wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-28 17:24:38 +01:00
Henri Verbeet
64ba3ee4a0 wined3d: Explicitly calculate the sub-resource level in read_from_framebuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-28 17:24:38 +01:00
Henri Verbeet
1cdff1c8a4 wined3d: Explicitly calculate the sub-resource level in surface_set_compatible_renderbuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-28 17:24:37 +01:00
Henri Verbeet
d635d7e51d wined3d: Explicitly calculate the sub-resource level in surface_upload_from_surface(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-27 10:28:12 +01:00
Henri Verbeet
78366806a0 wined3d: Explicitly calculate the sub-resource level in wined3d_surface_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-27 10:28:12 +01:00
Henri Verbeet
ec4be4ba40 wined3d: Explicitly calculate the sub-resource level in surface_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-27 10:28:12 +01:00
Józef Kucia
bd1688af55 wined3d: Implement loading system memory from multisample textures. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-23 19:24:02 +01:00
Henri Verbeet
daf754cea3 wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-23 08:59:23 +01:00
Henri Verbeet
34992108bb wined3d: Explicitly calculate the sub-resource layer in wined3d_surface_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-23 08:59:21 +01:00
Henri Verbeet
cd53e81a80 wined3d: Explicitly calculate the sub-resource layer in surface_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-23 08:59:19 +01:00
Henri Verbeet
cb4b757410 wined3d: Pass a texture and sub-resource index to surface_get_blt_info(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-23 08:59:18 +01:00
Henri Verbeet
623ac9fe04 wined3d: Use wined3d_texture_get_sub_resource_target() in surface_load_fb_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-22 09:43:26 +01:00
Henri Verbeet
00badb07bc wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_hwstretch(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-22 09:43:24 +01:00
Henri Verbeet
1319deec56 wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_direct(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-22 09:43:22 +01:00
Henri Verbeet
c2499e0142 wined3d: Use wined3d_texture_get_sub_resource_target() in draw_textured_quad(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-22 09:43:20 +01:00
Henri Verbeet
29e0230a94 wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_surface_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-21 09:25:05 +01:00
Henri Verbeet
a09edd2446 wined3d: Use wined3d_texture_get_sub_resource_target() in surface_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-21 09:25:03 +01:00
Henri Verbeet
6ca15e9c13 wined3d: Split WINED3D_RESOURCE_ACCESS_MAP into WINED3D_RESOURCE_ACCESS_MAP_R and WINED3D_RESOURCE_ACCESS_MAP_W. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-19 13:43:52 +01:00
Henri Verbeet
acc0f49aae wined3d: Introduce separate read and write resource map flags. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-19 13:43:52 +01:00
Józef Kucia
de9ebcff70 wined3d: Use renderbuffers when resolving multisample textures with conversion. 
Direct3D 9 allows blits from multisample resources to non-multisample
resources with scaling or format conversion. In OpenGL, we resolve
multisample texture to the renderbuffer associated with the texture
before doing the actual blit with scaling/format conversion.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-16 19:19:44 +01:00
Henri Verbeet
f08342f573 wined3d: Use the global memory allocation helpers. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-14 09:06:58 +01:00
Józef Kucia
53ddba5305 wined3d: Avoid raw blits when resolving multisample textures. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-13 20:23:25 +01:00
Henri Verbeet
9275b06cc0 wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-02 18:36:45 +01:00
Henri Verbeet
74c97c9a56 wined3d: Use the resource access flags in wined3d_surface_blt(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-01 09:18:33 +01:00
Henri Verbeet
4928e38c0a wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-02-01 09:18:31 +01:00
Henri Verbeet
15e466690a wined3d: Use the resource access flags in surface_blt_special(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-01-31 17:54:55 +01:00
Henri Verbeet
b7496ebacc wined3d: Use the resource access flags in ffp_blit_supported(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-01-29 20:29:00 +01:00
Henri Verbeet
36f20ec5d1 wined3d: Use the resource access flags in fbo_blitter_supported(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-01-29 20:29:00 +01:00
Henri Verbeet
2abf1dd323 wined3d: Get rid of WINED3D_POOL_SCRATCH. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-01-29 20:29:00 +01:00
Henri Verbeet
bc75bec270 wined3d: Add a download function for WINED3DFMT_X8D24_UNORM. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-01-05 19:20:34 +01:00
Józef Kucia
d38076fd57 wined3d: Consider CPU blitter when clearing discarded textures. 
In order to avoid invalidating system memory for "converted" surfaces.

Fixes a regression introduced by commit 56128d18d4df ("wined3d: Drop the
special case for "converted" surfaces in wined3d_surface_blt().").

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-12-21 16:06:02 +01:00
Henri Verbeet
ac689f0ac9 wined3d: Use raw blits in wined3d_device_copy_resource(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-11-15 23:35:04 +01:00
Henri Verbeet
786ebbdec3 wined3d: Introduce a blitter based on ARB_copy_image. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-11-15 23:35:04 +01:00
Józef Kucia
7f8e30bd1a wined3d: Use ARRAY_SIZE(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-10-19 16:53:49 +02:00
Matteo Bruni
10a62ee062 wined3d: Consider all the system memory locations when choosing the surface upload path. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-09-18 09:22:44 +02:00
Matteo Bruni
58016408c2 wined3d: Don't claim SYSMEM location to be current if memory was evicted. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-09-18 09:22:41 +02:00
Matteo Bruni
a55d384264 wined3d: Don't take the upload path for blits to formats requiring conversion. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-09-06 17:31:00 +02:00
Matteo Bruni
c50090cb6e wined3d: Return the up-to-date locations from blitters. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-09-06 17:31:00 +02:00
Henri Verbeet
56128d18d4 wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt(). 
We still want to avoid invalidating the system memory copy for these surfaces,
but we've become a lot better at preserving the current location for
resources, to the point that the special case actually hurts. In particular,
if the resource wasn't already current on the CPU, using the CPU blitter would
cause us to read it back, which is what we're trying to avoid.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-07-17 22:12:09 +02:00
Henri Verbeet
990be0ba50 wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't current on the CPU. 
Since that would imply reading them back, with associated format conversion.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-07-17 22:12:09 +02:00