Henri Verbeet
9d2f4cdbdd
wined3d: Use gl_info from the wined3d_shader_context in shader_hw_sample().
...
For simplicity.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-22 11:42:07 +01:00
Henri Verbeet
f31ed9837a
wined3d: Simplify device_resource_released() a little.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-22 11:42:04 +01:00
Henri Verbeet
e5ab987d60
wined3d: Simplify context_resource_released().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-22 11:42:00 +01:00
Henri Verbeet
70f017ac4d
wined3d: Get rid of the "StrictDrawOrdering" setting.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-22 11:41:50 +01:00
Henri Verbeet
d6f45dab82
wined3d: Merge texture2d_upload_data() and texture3d_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-21 10:40:14 +01:00
Henri Verbeet
af47c9406b
wined3d: Handle upload conversion in texture2d_upload_data().
...
For consistency with texture3d_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-21 10:40:12 +01:00
Henri Verbeet
faf4559a76
wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture().
...
We don't use PBOs for those in the first place.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-21 10:40:10 +01:00
Henri Verbeet
15d3155e59
wined3d: Always pass a valid source box to texture3d_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-21 10:40:08 +01:00
Henri Verbeet
a9cf391bed
wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-20 12:59:02 +01:00
Henri Verbeet
17c7f8e3c3
wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-20 12:59:00 +01:00
Henri Verbeet
8647966e9f
wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-20 12:58:58 +01:00
Henri Verbeet
37c516c957
wined3d: Pass a format to wined3d_texture_upload_data().
...
The goal here is to eventually get rid of wined3d_surface_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-20 12:58:55 +01:00
Henri Verbeet
d4b0249c48
wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-19 12:09:39 +01:00
Henri Verbeet
89cd64bcb7
wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
...
For consistency with wined3d_texture_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-19 12:09:37 +01:00
Henri Verbeet
614102c013
wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-19 12:09:35 +01:00
Henri Verbeet
d3baf0355a
wined3d: Resource size should always be non-zero in resource_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-19 12:09:32 +01:00
Henri Verbeet
549934eeea
wined3d: Merge wined3d_texture_init() into texture_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 16:40:32 +01:00
Henri Verbeet
eba15f7042
wined3d: Merge volumetexture_init() and texture_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 16:40:32 +01:00
Henri Verbeet
0a354365bd
wined3d: Merge the surface_created() and volume_created() wined3d_device_parent_ops callbacks.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 16:40:31 +01:00
Henri Verbeet
4d4fc7ae34
wined3d: Reject managed/scratch textures with dynamic usage in texture_init().
...
For consistency with volumetexture_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:21:52 +01:00
Henri Verbeet
543a199dc3
wined3d: Only store dc_info for textures that require it.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:21:50 +01:00
Henri Verbeet
082abe4abe
wined3d: Rename struct wined3d_surface to struct wined3d_dc_info.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:21:48 +01:00
Henri Verbeet
47404a7db6
wined3d: Store the destination as texture + sub-resource index in struct wined3d_overlay_info.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:21:46 +01:00
Henri Verbeet
3abe88f125
wined3d: Get rid of the unused context_get_rt_surface().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-14 15:27:59 +01:00
Henri Verbeet
b7ed6b9b8e
wined3d: Get rid of the "container" field from struct wined3d_surface.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-14 15:27:59 +01:00
Henri Verbeet
50920453b0
wined3d: Pass a resource to context_generate_rt_mask_no_fbo().
...
Instead of a texture, since rendertarget views operate on resources.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-14 15:27:59 +01:00
Henri Verbeet
f4f20e48cf
wined3d: Pass a texture to context_surface_update().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-14 15:27:59 +01:00
Matteo Bruni
c0e49b0e2c
wined3d: Do not apply fixed-function state in context_apply_blit_state().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 20:35:26 +01:00
Henri Verbeet
56464f5e07
wined3d: Pass a texture and sub-resource index to texture2d_destroy_dc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 13:28:36 +01:00
Henri Verbeet
a7c0904a10
wined3d: Pass a texture and sub-resource index to texture2d_create_dc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 13:28:33 +01:00
Henri Verbeet
991b1b77c8
wined3d: Pass a texture and sub-resource index to wined3d_surface_blt().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 13:28:27 +01:00
Henri Verbeet
70a68144c1
wined3d: Pass a texture and sub-resource index to wined3d_blitter_ops.blitter_blit().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 13:28:23 +01:00
Józef Kucia
e318f8c825
wined3d: Replace presentation interval flags with enum.
...
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-03-12 17:58:16 +01:00
Józef Kucia
0554d17611
wined3d: Remove PresentationIntervals from WINED3DCAPS.
...
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-03-12 17:58:14 +01:00
Matteo Bruni
23b4b3cd4c
wined3d: Pass a wined3d_context structure to texture2d_depth_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:58:07 +01:00
Henri Verbeet
9a00e032b7
wined3d: Pass a texture and sub-resource index to context_apply_fbo_state_blit().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:58:02 +01:00
Henri Verbeet
72de747c6a
wined3d: Pass the depth/stencil view as wined3d_rendertarget_info structure to context_apply_fbo_state().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:57:59 +01:00
Henri Verbeet
21257be2a9
wined3d: Pass a texture and sub-resource index to context_restore().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:57:51 +01:00
Henri Verbeet
7cc82c1ea6
wined3d: Recognise AMD RC410 and RV380.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:57:48 +01:00
Kai Krakow
4b08602d57
wined3d: Recognize GTX 1050 Ti card with NVIDIA driver.
...
Signed-off-by: Kai Krakow <kai@kaishome.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:57:36 +01:00
Matteo Bruni
cca2867b3c
wined3d: Restore the correct sub resource in texture2d_load_fb_texture().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 17:57:35 +01:00
Matteo Bruni
acf8c4b76c
wined3d: Only copy the source/destination rectangles when needed in texture2d_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-09 10:40:41 -06:00
Henri Verbeet
286f4cd2a4
wined3d: Pass a texture and sub-resource index to surface_blt_special().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-09 10:40:40 -06:00
Henri Verbeet
21e6abc8a0
wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-09 10:40:40 -06:00
Henri Verbeet
628cd4425b
wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-09 10:40:39 -06:00
Henri Verbeet
2179e99120
wined3d: Pass a texture and sub-resource index to surface_load_fb_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-09 10:40:39 -06:00
Józef Kucia
c114746f6f
wined3d: Allow blits from drawable location when loading renderbuffer locations.
...
Fixes a regression introduced by fb6b3cc872
.
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-03-08 09:24:03 -06:00
Matteo Bruni
d2e89d0b99
wined3d: Pass a wined3d_context structure to texture2d_download_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-08 09:23:53 -06:00
Henri Verbeet
40d5908854
wined3d: Pass a texture and sub-resource index to read_from_framebuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-08 09:23:48 -06:00
Henri Verbeet
c337a46354
wined3d: Pass a texture and sub-resource index to surface_upload_from_surface().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-08 09:23:46 -06:00
Henri Verbeet
4c1b3978dd
wined3d: Pass a texture and sub-resource index to surface_download_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-08 09:23:44 -06:00
Henri Verbeet
ca2aa71775
wined3d: Pass a texture and sub-resource index to surface_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-08 09:23:41 -06:00
Henri Verbeet
243e2ddfde
wined3d: Pass a texture and sub-resource index to surface_depth_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-07 08:48:31 -06:00
Henri Verbeet
433ac881dd
wined3d: Pass boxes instead of rectangles to wined3d_surface_blt().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-07 08:48:27 -06:00
Henri Verbeet
92008ec4cf
wined3d: Pass a texture and sub-resource index to surface_load_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-07 08:48:24 -06:00
Henri Verbeet
42a9563e43
wined3d: Pass a texture and sub-resource index to surface_load_renderbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-07 08:48:21 -06:00
Henri Verbeet
798439ba31
wined3d: Pass a texture and sub-resource index to surface_load_drawable().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:41:11 -06:00
Henri Verbeet
3b47e108a9
wined3d: Pass a texture and sub-resource index to surface_load_sysmem().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:41:09 -06:00
Henri Verbeet
c1f5b9ac67
wined3d: Merge surface_load_location() into texture2d_load_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:41:07 -06:00
Henri Verbeet
3d21ea0807
wined3d: Store the EXT_fbo "renderbuffers" list in the texture instead of the surface.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:41:04 -06:00
Christian Costa
00b1f69cd2
wined3d: Recognize GTX 560M card with NVIDIA driver.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:40:39 -06:00
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
665c8c84c7
wined3d: Explicitly calculate the sub-resource level in wined3d_texture_update_overlay().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-05 06:57:03 -06:00
Henri Verbeet
2eb4d15b13
wined3d: Explicitly calculate the sub-resource level in texture2d_create_dc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-05 06:57:00 -06:00
Henri Verbeet
6639ce4b09
wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage().
...
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
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
Józef Kucia
53639b04eb
wined3d: Fix draw calls when first render target is NULL.
...
In Direct3D 10+, the render target at index 0 can be set to NULL.
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-03-02 10:52:04 +01:00
Józef Kucia
544a7daaeb
wined3d: Factor out get_viewport() function.
...
No attachment draw calls are always offscreen.
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-03-02 10:52:01 +01:00
Józef Kucia
7096e1e02d
wined3d: Implement draw calls with no attachments.
...
Supported when ARB_framebuffer_no_attachments is available.
It was reported that no attachments framebuffers trigger GPU hangs
in The Witcher 3 on some system configurations with radeonsi driver.
MESA_EXTENSION_OVERRIDE=-GL_ARB_framebuffer_no_attachments can be used
as a workaround until it's fixed.
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-03-02 10:51:59 +01:00
Józef Kucia
4998cea070
wined3d: Remove redundant if statement from device_init_swapchain_state().
...
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-03-02 10:51:56 +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
Józef Kucia
beb83eb4ae
wined3d: Add ARB_framebuffer_no_attachments extension.
...
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-28 19:39:29 +01:00
Józef Kucia
e27141e015
wined3d: Use wined3d_bit_scan() in find_draw_buffers_mask().
...
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-28 19:39:28 +01:00
Józef Kucia
cae8ebab91
wined3d: Do not call context_validate_onscreen_formats() in context_apply_blit_state().
...
It does nothing when depth_stencil is NULL.
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-28 19:39:28 +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
Józef Kucia
7b62a970e9
wined3d: Try harder to reacquire context.
...
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-27 18:21:01 +01:00
Józef Kucia
d8c0bc8245
wined3d: Do not allocate framebuffer state structures dynamically.
...
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-27 18:21:01 +01:00
Józef Kucia
f234ce16be
wined3d: Terminate long debug strings with ellipsis.
...
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-27 18:21:01 +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
Henri Verbeet
bca2fc4189
wined3d: Explicitly calculate the sub-resource level in device_clear_render_targets().
...
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
1075b4615b
wined3d: Limit number of supported render targets to 8.
...
Virtually all relatively modern GPUs support 8 render targets.
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-26 16:40:23 +01:00
Józef Kucia
6eb562210c
wined3d: Merge drawprim.c into context.c.
...
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-26 16:40:22 +01:00
Józef Kucia
66cd871060
wined3d: Drop d3d_draw debug channel.
...
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-26 16:40:22 +01:00
Józef Kucia
f8c8498f49
wined3d: Cleanup draw_primitive_arrays() a bit.
...
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-26 16:40:22 +01:00
Józef Kucia
41717a148e
wined3d: Move dispatch_compute() to context.c file.
...
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-26 16:40:22 +01:00
Henri Verbeet
6e16062532
wined3d: Explicitly calculate the sub-resource level in is_full_clear().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-26 11:40:33 +01:00
Henri Verbeet
a9678a1a8c
wined3d: Explicitly calculate the sub-resource level in arbfp_blitter_blit().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-26 11:40:33 +01:00
Henri Verbeet
c86467bdad
wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-26 11:40:33 +01:00
Henri Verbeet
b574fab087
wined3d: Pass a wined3d_rendertarget_info structure to context_find_fbo_entry().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-26 11:40:33 +01:00
Józef Kucia
fb6b3cc872
wined3d: Use multisample textures by default.
...
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
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
Józef Kucia
f59fce24ab
wined3d: Add helper function to construct debug strings.
...
Hardcoded buffer sizes are error-prone.
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:01 +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
Józef Kucia
af3a2c751d
wined3d: Reduce code duplication in context_dump_fbo_attachment().
...
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-21 15:31:29 +01:00
Józef Kucia
62c7a351ec
wined3d: Dump sample counts for cube maps (Coverity).
...
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-21 15:31:28 +01:00
Józef Kucia
e1d4edab4e
wined3d: Fix stack buffer overrun in wined3d_debug_resource_access().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-21 15:31:28 +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
4e3cd97d49
wined3d: Use wined3d_texture_get_sub_resource_target() in wined3d_texture_allocate_gl_mutable_storage().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-21 09:25:00 +01:00
Henri Verbeet
4678dac730
wined3d: Introduce a helper to retrieve the texture target in context_set_fbo_key_for_render_target().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-21 09:24:57 +01:00
Henri Verbeet
90696dfe5e
wined3d: Store overlay info in textures instead of in surfaces.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-21 09:24:54 +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
dd0ea0a614
wined3d: Enable the multi-threaded command stream by default.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-16 14:25:05 +01:00
Henri Verbeet
b6f917b102
d3d11: Set resource access based on usage and CPU access flags.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-16 14:24:55 +01:00
Józef Kucia
1b3b2b2268
wined3d: Introduce structure for dummy 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-15 19:34:52 +01:00
Józef Kucia
d9fa6bb6c2
wined3d: Create dummy textures for multisample texture targets.
...
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-15 19:34:50 +01:00
Józef Kucia
a9e3088231
wined3d: Align OpenGL version comments for newer core functions.
...
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-15 19:34:48 +01:00
Henri Verbeet
d612495a72
dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-15 08:02:14 +01:00
Henri Verbeet
0cf21e85a5
wined3d: Print a fixme for unimplemented swap effects during swapchain (re)creation.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-15 08:02:07 +01:00
Matteo Bruni
9a13d48e4e
wined3d: Get rid of legacy mipmap autogeneration support.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-14 20:37:55 +01:00
Matteo Bruni
c7ebc8ec32
wined3d: Update feature check for mipmap generation support.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-14 20:37:55 +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
Henri Verbeet
16e54c80c8
wined3d: Get rid of the WINED3D_SWAP_EFFECT_FLIP fixme in swapchain_gl_present().
...
I think this works about as well as it's going to. There may be a theoretical
issue that GDI draws to the window should end up in the backbuffer after a
flip, but I don't think we have tests showing that to actually be the case,
and generally speaking I'm not all that worried about it.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-14 09:06:53 +01:00
Henri Verbeet
02dc04bcc9
wined3d: Do not implicitly set WINED3D_RESOURCE_ACCESS_MAP for dynamic resources.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-14 09:06:51 +01:00
Henri Verbeet
7772c4fdbf
wined3d: Enforce map access on all resources.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-14 09:06:49 +01:00
Matteo Bruni
882742e17a
wined3d: Introduce a WINED3DFMT_FLAG_GEN_MIPMAP flag.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-13 20:23:26 +01:00
Henri Verbeet
469dd87899
d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-13 20:23:26 +01:00
Józef Kucia
ae5d802bda
wined3d: Query supported sample counts for 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:26 +01:00
Józef Kucia
2f42f5c911
wined3d: Implement multisample resolve for typed resources.
...
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
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
Józef Kucia
b688f6ee34
wined3d: Add STATE_BLEND to debug_d3dstate().
...
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-09 18:53:13 +01:00
Józef Kucia
220841f33a
wined3d: Do not enable GL_ARB_texture_multisample in GLSL.
...
GLSL 1.50 is required for SM4+.
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-09 18:53:11 +01:00
Józef Kucia
7517d8c2e4
wined3d: Add support for multisample textures in wined3d_texture_update_desc().
...
This might be called from wined3d_device_reset().
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-09 18:53:07 +01:00
Józef Kucia
2fd86a17bb
wined3d: Create 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-09 18:53:06 +01:00
Józef Kucia
11dd0601c5
wined3d: Add registry setting to enable multisample textures.
...
The registry key helps to add multisample textures support incrementally
without breaking the current support for multisample renderbuffers. It
might be also useful to have a possibility to disable multisample
textures when they are the default code path for multisampling in
wined3d.
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-09 18:53:04 +01:00
Józef Kucia
32e61de282
wined3d: Add support for multisample textures in context_dump_fbo_attachment().
...
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-09 18:53:02 +01:00
Józef Kucia
7221ccecdd
wined3d: Avoid guessing texture target if OpenGL 4.5 is available.
...
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-09 18:53:00 +01:00
Henri Verbeet
a93120c340
wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-09 09:19:19 +01:00
Henri Verbeet
1b7f06acb1
wined3d: Update the depth/stencil resource location for stencil clears as well.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-09 09:19:17 +01:00
Henri Verbeet
eb83a7c993
wined3d: Get rid of wined3d_get_draw_rect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-09 09:19:15 +01:00
Henri Verbeet
96432c4cc2
d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-09 09:19:12 +01:00
Józef Kucia
87f823ad91
wined3d: Simplify shader_calculate_clip_or_cull_distance_mask().
...
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-08 21:07:12 +01:00
Józef Kucia
cd5f8f786b
wined3d: Fix resinfo for 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-08 21:07:12 +01:00
Józef Kucia
350a757e37
wined3d: Introduce blend state object.
...
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-08 21:07:12 +01:00
Henri Verbeet
f181da61a0
d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-07 10:05:42 +01:00
Józef Kucia
b5f1d3085f
wined3d: Factor out wined3d_texture_get_gl_sample_count() function.
...
For creating 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-06 19:38:31 +01:00
Józef Kucia
7cdf7f5609
wined3d: Add support for multisample texture views.
...
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-06 19:38:31 +01:00
Józef Kucia
9ab04c564e
wined3d: Use wined3d_bit_scan() in context_apply_compute_state().
...
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-06 19:38:30 +01:00
Józef Kucia
dea7b8890c
wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances().
...
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-06 19:38:30 +01:00
Józef Kucia
e8d2febaad
wined3d: Introduce wined3d_bit_scan().
...
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-06 19:38:30 +01:00
Józef Kucia
89eaa4aa37
wined3d: Do not validate texture type in resolve_depth_buffer().
...
It's validated in wined3d_texture_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>
2018-02-05 16:24:52 +01:00
Józef Kucia
f2e614b1f8
wined3d: Implement ld2dms instruction.
...
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-05 16:24:50 +01:00
Józef Kucia
780ec0c1f9
wined3d: Add support for multisample samplers.
...
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-05 16:24:48 +01:00
Józef Kucia
fea8cf8b36
wined3d: Add ARB_texture_storage_multisample extension.
...
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-05 16:24:46 +01:00
Józef Kucia
416f8d2e86
wined3d: Add ARB_texture_multisample extension.
...
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-05 16:24:44 +01:00
Henri Verbeet
c0f92bd318
wined3d: Implement wined3d_buffer_create_ib() on top of wined3d_buffer_create().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-05 10:00:07 +01:00
Henri Verbeet
1377e7a608
wined3d: Implement wined3d_buffer_create_vb() on top of wined3d_buffer_create().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-05 10:00:07 +01:00
Henri Verbeet
8623bd3b6b
wined3d: Replace the CPU access flags in struct wined3d_buffer_desc with resource access flags.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-05 10:00:07 +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
916c13c6c1
wined3d: Replace the pool in struct wined3d_sub_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:42 +01:00
Henri Verbeet
def8363476
wined3d: Use the resource access flags in texture_resource_sub_resource_map().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-02 18:36:40 +01:00
Henri Verbeet
2420d37a9d
wined3d: Use the resource access flags in wined3d_texture_unload().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-02 18:36:37 +01:00
Henri Verbeet
e6909c8f50
wined3d: Use the resource access flags in wined3d_texture_set_lod().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-02 18:36:34 +01:00
Henri Verbeet
bfc0f3bdf1
wined3d: Use more resource access flags in wined3d_texture_use_pbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-01 09:18:35 +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
51b9a9bb6b
wined3d: Use the resource access flags in wined3d_resource_set_priority().
...
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
d099e45e46
wined3d: Use the resource access flags in resource_cleanup().
...
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
7ef8b31965
wined3d: Use the resource access flags in resource_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-31 17:54:54 +01:00
Józef Kucia
0735c53138
wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource().
...
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-01-30 20:42:07 +01:00
Henri Verbeet
0bf0e0d3ae
wined3d: Use the resource access flags in wined3d_device_evict_managed_resources().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-30 20:42:06 +01:00
Henri Verbeet
72a2f02486
wined3d: Use the resource access flags in wined3d_device_update_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-30 20:42:06 +01:00
Henri Verbeet
c26c9badc4
wined3d: Use the resource access flags in buffer_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-30 20:42:06 +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
a3b6f8ceb9
wined3d: Use the resource access flags in arbfp_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
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
798504700b
wined3d: Introduce WINED3D_RESOURCE_ACCESS_MAP.
...
In order to distinguish between resources that exist purely in CPU memory and
resources that exist in GPU memory but can be mapped.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-29 20:28:59 +01:00
Józef Kucia
4701425f3c
wined3d: Add buffer usage to wined3d_swapchain_desc.
...
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-01-25 16:27:10 +01:00
Józef Kucia
b0415bbc22
wined3d: Fix linestrips output for geometry shaders.
...
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-01-10 23:16:09 +01:00
Józef Kucia
ca11278067
wined3d: Load buffer before applying state for indirect dispatches.
...
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-01-09 20:32:22 +01:00
Józef Kucia
6280926e3b
wined3d: Load buffer before applying state for indirect draws.
...
wined3d_load_buffer() might invalidate the current state.
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-01-09 20:32:19 +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
Henri Verbeet
63ed42ac39
wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
...
This fixes a performance issue exposed by commit
afb2aa2512
.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-03 17:46:56 +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 56128d18d4
("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
Józef Kucia
4a55ddce47
wined3d: Recognize SM5 eval_sample_index instruction.
...
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-11 18:21:15 +01:00
Józef Kucia
6e5df50ac8
wined3d: Fix device format support checks for multiple usages.
...
We can return WINED3DOK_NOAUTOGEN only when all other resource usages
are supported.
Fixes 25a8773d21
("wined3d: Advertise AUTOGENMIPMAP only for
renderable and filterable formats."). The problem was present before
25a8773d21
, but the mentioned commit made it much worse. Previously,
it was an issue only for OpenGL implementations which do not support
the GL_SGIS_generate_mipmap extension.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
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-12-11 18:21:09 +01:00
Józef Kucia
9673a36727
wined3d: Avoid calling removed/deprecated GL functions in SetupForBlit().
...
Eliminates possible GL errors when core contexts are used.
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-08 18:20:18 +01:00
Matteo Bruni
83a30fad0a
wined3d: Only allow swapchain textures to have mismatched sRGB setting in resource views.
...
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-12-08 18:20:08 +01:00