ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
151,116 Commits 3 Branches 0 Tags 575 MiB
Commit Graph

692 Commits

Author SHA1 Message Date
Henri Verbeet 736ac3eaf9 wined3d: Reference the bo in wined3d_texture_gl_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-12-03 20:18:39 +01:00
Henri Verbeet 6f8c918d86 wined3d: Reference the bo in wined3d_texture_gl_download_data_slow_path(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-12-03 20:18:39 +01:00
Henri Verbeet 17e51124f9 wined3d: Reference the bo in wined3d_texture_gl_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-12-03 20:18:39 +01:00
Henri Verbeet 42f90354ba wined3d: Reference the source/destination bo in wined3d_texture_copy_sysmem_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-12-02 19:08:04 +01:00
Matteo Bruni 77f0149a6c wined3d: Use GL_ARB_buffer_storage if available. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-11-30 21:36:10 +01:00
Matteo Bruni 90f33067da wined3d: Introduce wined3d_context_gl_create_bo(). 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-11-30 21:36:05 +01:00
Henri Verbeet db42859977 wined3d: Store the usage in struct wined3d_bo_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-11-30 21:36:01 +01:00
Matteo Bruni 0638d50b22 wined3d: Introduce wined3d_context_gl_destroy_bo(). 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-11-30 21:35:58 +01:00
Matteo Bruni 881e0a4310 wined3d: Use glClearDepthf() when available. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-11-26 23:25:24 +01:00
Henri Verbeet 1b192ce4cb wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE). 
This is no longer used internally; two-sided stencil is handled as part of
STATE_DEPTH_STENCIL.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-10-13 18:19:06 +02:00
Zebediah Figura 690ff3dbea wined3d: Move the stencil write mask to wined3d_depth_stencil_state. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-09-28 17:03:58 +02:00
Zebediah Figura 4a5760b28b wined3d: Move the depth write enable state to wined3d_depth_stencil_state. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-09-28 17:03:58 +02:00
Paul Gofman cfeefc6b94 wined3d: Set user memory separately for texture sub resources. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43232
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-17 18:35:07 +02:00
Paul Gofman 5b287bb0ca wined3d: Merge _USER_MEMORY and _SYSMEM locations. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49375
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-17 00:05:44 +02:00
Henri Verbeet 9b8847ed7b wined3d: Introduce WINED3DFMT_FLAG_DEPTH_STENCIL. 
To indicate whether WINED3D_BIND_DEPTH_STENCIL is valid for the format.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-05 16:54:35 +02:00
Henri Verbeet f570c9b655 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-04 13:50:42 +02:00
Henri Verbeet 8d7c39b860 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-03 21:49:01 +02:00
Henri Verbeet 97a250075a wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-03 21:48:55 +02:00
Henri Verbeet 2b2a6ebdd1 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-03 21:48:52 +02:00
Henri Verbeet 4616867798 wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-03 21:48:39 +02:00
Paul Gofman a389f32967 wined3d: Use a single wined3d_texture_is_full_rect() function. 
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-05-28 20:18:32 +02:00
Henri Verbeet eccff1add8 wined3d: Implement Vulkan draws. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-05-18 19:35:27 +02:00
Paul Gofman f02b0226ca wined3d: Allow setting user memory for mipmapped textures in wined3d_texture_update_desc(). 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-05-14 23:12:31 +02:00
Henri Verbeet a3874561cd wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-05-01 21:51:31 +02:00
Henri Verbeet fcbdddfb55 wined3d: Create Vulkan image views for shader resource views. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-30 21:01:18 +02:00
Henri Verbeet f793f4446c wined3d: Implement depth/stencil clears in the Vulkan blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-28 11:17:37 +02:00
Henri Verbeet f5d4d3ebbd wined3d: Implement clears in the Vulkan blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-27 19:30:38 +02:00
Henri Verbeet a8e34f3851 wined3d: Create Vulkan image views for rendertarget views. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-27 19:11:18 +02:00
Henri Verbeet dad42f3c80 wined3d: Use the view instead of the texture in is_full_clear(). 
Using the texture is a left-over from when rendertargets were surfaces.
Using the view is in fact more straightforward.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-27 19:11:15 +02:00
Henri Verbeet ee8e4d2010 wined3d: Move device_clear_render_targets() to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-27 19:11:12 +02:00
Henri Verbeet cd94aa8fa8 wined3d: Do not flush read-only mappings in wined3d_texture_vk_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-27 19:11:09 +02:00
Henri Verbeet 01f640556f wined3d: Handle MSAA resolves in the Vulkan blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-24 10:10:23 +02:00
Henri Verbeet 6601bc3443 wined3d: Implement raw blits in the Vulkan GPU blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-24 10:10:18 +02:00
Henri Verbeet d6ef8b0700 wined3d: Introduce a Vulkan GPU blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-24 10:10:06 +02:00
Henri Verbeet 0aee4d9a88 wined3d: Introduce wined3d_context_vk_reference_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-24 10:10:00 +02:00
Henri Verbeet 036d0d29a6 wined3d: Introduce wined3d_context_vk_reference_bo(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-24 10:09:43 +02:00
Henri Verbeet 2c842f71bf wined3d: Move the raw blitter to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-23 09:12:25 +02:00
Henri Verbeet 6ec2110cde wined3d: Move the FBO blitter to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-23 09:12:22 +02:00
Henri Verbeet 445d37f5d2 wined3d: Move the OpenGL fixed-function blitter to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-23 09:12:19 +02:00
Henri Verbeet 32d17f1e9a wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_map_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-22 16:47:41 +02:00
Henri Verbeet cef12f97d6 wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_unmap_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-22 16:47:41 +02:00
Henri Verbeet b29ea85885 wined3d: Use the bo binding in wined3d_context_gl_unmap_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-22 16:47:41 +02:00
Henri Verbeet 7d43577d89 wined3d: Use the bo binding in wined3d_context_gl_map_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-22 16:47:41 +02:00
Henri Verbeet 1fb85cd573 wined3d: Store the preferred binding in the wined3d_bo_gl structure. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-21 22:54:26 +02:00
Henri Verbeet 77fe33f5d9 wined3d: Introduce a structure for OpenGL buffer objects. 
Analogous to the wined3d_bo_vk structure for Vulkan.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-21 22:54:26 +02:00
Henri Verbeet f31a29b8d1 wined3d: Introduce a slab allocator for small buffers. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-20 21:11:14 +02:00
Henri Verbeet 01cd409e3c wined3d: Implement Vulkan texture downloads. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-20 21:11:06 +02:00
Henri Verbeet 3685c2199b wined3d: Implement Vulkan texture uploads. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-20 21:10:58 +02:00
Henri Verbeet 07981fa64f wined3d: Create Vulkan images for texture resources. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-20 21:10:48 +02:00
Paul Gofman e9961039ec wined3d: Validate the filter in wined3d_texture_blt(). 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-16 21:37:43 +01:00
Matteo Bruni 8d87bce071 wined3d: Rename struct wined3d_map_range to struct wined3d_range. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-27 23:34:51 +01:00
Akihiro Sagawa c90d34178d wined3d: Record dirty regions for d3d9 textures. 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-10 22:15:05 +01:00
Henri Verbeet ca0c3f770a wined3d: Unload texture resources through texture ops. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-06 22:30:24 +01:00
Henri Verbeet 153db6a757 wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload(). 
Since we remove any potential PBO a few lines later.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-03 21:27:14 +01:00
Henri Verbeet b941665b42 wined3d: Destroy PBOs in wined3d_texture_gl_destroy_object(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-03 21:27:14 +01:00
Henri Verbeet 7930553efc wined3d: Store texture sub-resource buffer objects as uintptr_t. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-03 21:27:14 +01:00
Akihiro Sagawa 0a61ddbdf1 wined3d: Validate dirty regions in wined3d_texture_add_dirty_region(). 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-12-02 22:02:57 +01:00
Paul Gofman e2dfb91093 wined3d: Fixup alpha component in wined3d_texture_gl_upload_data(). 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35194
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25486
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-11-13 19:53:37 +01:00
Paul Gofman a73a892f46 wined3d: Use software decompression for converting from compressed format. 
The motivation under this is not just supporting conversion between
compressed formats. Currently fallback CPU blitter cannot convert
from DXTn formats at all, this patch allows for that if software
decompression function is available.

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-11-11 20:01:40 +01:00
Paul Gofman 06909230c4 wined3d: Upload 3d GL textures per-slice when conversion is involved. 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-18 20:04:45 +02:00
Paul Gofman b7d2ba9d8f wined3d: Pass correct map size in wined3d_texture_gl_upload_data(). 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-18 20:04:42 +02:00
Paul Gofman 7474d665be wined3d: Factor out wined3d_texture_gl_upload_bo() function. 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-18 20:04:40 +02:00
Paul Gofman 85c0c49af7 wined3d: Support zero row pitch in wined3d_texture_gl_upload_data(). 
Fixes Wine test failure in d3d11 test_copy_subresource_region().
The test failure could be unstable as there was read after data
end in glTexSubImage2D() called from wined3d_texture_gl_upload_data().

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-09-30 22:24:27 +02:00
Henri Verbeet c2f0ae50b4 wined3d: Use explicit flushing in wined3d_context_gl_unmap_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-09-23 19:44:17 +02:00
Henri Verbeet 2bc6941ab0 wined3d: Derive the GL bind point for buffer object maps from the bind flags. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-09-23 19:44:17 +02:00
Henri Verbeet af8401ba0c wined3d: Introduce WINED3D_TEXTURE_DOWNLOADABLE. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-19 14:12:49 +02:00
Henri Verbeet 1419a06819 wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-16 10:09:06 +02:00
Henri Verbeet 400a0dcc8b wined3d: Map/unmap bo addresses through the adapter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-16 10:09:04 +02:00
Henri Verbeet 75ee0aa9b9 wined3d: Introduce wined3d_texture_ops.texture_prepare_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-16 10:09:02 +02:00
Henri Verbeet 3179a6af29 wined3d: Introduce wined3d_resource_prepare_sysmem(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-16 10:08:52 +02:00
Henri Verbeet e3e9bdeedb wined3d: Make the adapter responsible for texture creation and destruction. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-13 11:02:40 +02:00
Henri Verbeet da3eb0e752 wined3d: Don't call wined3d_texture_prepare_location() with a NULL context in wined3d_texture_update_desc(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-12 09:32:31 +02:00
Henri Verbeet 3bc8df5166 wined3d: Invalidate the relevant sampler when unloading a currently bound texture. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-07 19:56:20 +02:00
Henri Verbeet 74b9ef2c1d wined3d: Move the "gl_info" field from struct wined3d_context to struct wined3d_context_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-07 19:56:16 +02:00
Henri Verbeet b848b2bcf3 wined3d: Pass a wined3d_context_gl structure to texture_download_data_slow_path(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-02 08:58:53 +02:00
Henri Verbeet 7b62dcf0bb wined3d: Don't acquire a context in wined3d_texture_load_drawable(). 
The one we already have should be fine.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-07-31 08:29:31 +02:00
Henri Verbeet 3bc3fce811 wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-07-05 17:43:54 +02:00
Henri Verbeet 1f8a3b04b9 wined3d: Move texture2d_load_renderbuffer() to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-25 08:27:21 +02:00
Henri Verbeet 7fae37c0e1 wined3d: Move texture2d_load_drawable() to texture.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-24 10:08:27 +02:00
Henri Verbeet 3595c42a62 wined3d: Merge the wined3d_texture_gl texture ops implementations. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-21 08:05:52 +02:00
Henri Verbeet 9de80e1edd wined3d: Use wined3d_texture_gl_load_texture() in texture3d_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-20 08:47:34 +02:00
Henri Verbeet c4ba02aac4 wined3d: Use texture2d_load_texture() in texture1d_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-19 10:26:16 +02:00
Henri Verbeet 19470fc870 wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-18 08:57:16 +02:00
Henri Verbeet 410cf7d24c wined3d: Use texture2d_load_sysmem() in texture1d_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-17 20:47:46 +02:00
Henri Verbeet 8e6d89b752 wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-14 18:19:20 +02:00
Henri Verbeet eb5afc560c wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-13 20:55:35 +02:00
Henri Verbeet f3ee4d40ce wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-13 20:55:35 +02:00
Henri Verbeet 5fcffb10f7 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-12 16:11:35 +02:00
Henri Verbeet 6811cc6414 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_apply_sampler_desc(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-12 16:11:33 +02:00
Henri Verbeet ed9a6a2d67 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-12 16:11:30 +02:00
Henri Verbeet e3d28cd45d wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-12 16:11:28 +02:00
Henri Verbeet fd29561e97 wined3d: Pass a wined3d_context_gl structure to context_map_bo_address(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-11 09:46:13 +02:00
Henri Verbeet c7badafb9c wined3d: Upload texture data through the texture ops in wined3d_cs_exec_blt_sub_resource(). 
Since we want to avoid directly calling GL-specific code here.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-10 12:16:56 +02:00
Henri Verbeet 6937b98700 wined3d: Make the adapter responsible for acquiring and releasing contexts. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-05 16:44:45 +02:00
Henri Verbeet 52c5abb3d7 wined3d: Move the "active_texture" field from struct wined3d_context to struct wined3d_context_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-06-05 16:44:41 +02:00
Henri Verbeet 2b350f9d52 wined3d: Use wined3d_texture_get_level_box() in wined3d_texture_create(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-21 18:08:37 +02:00
Henri Verbeet fc7ea69e80 wined3d: Pass a wined3d_context_gl structure to context_texture_update(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-15 19:26:28 +02:00
Henri Verbeet 3171193bcf wined3d: Move the texture unit map from struct wined3d_context to struct wined3d_context_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-13 12:45:08 +02:00
Henri Verbeet 77bc74c637 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-09 10:01:53 -05:00
Henri Verbeet 6de1837955 wined3d: Pass a wined3d_context_gl structure to context_bind_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-07 08:46:07 -05:00