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
Józef Kucia
446a2422a9
wined3d: Store texture swizzle capability in struct wined3d_d3d_info.
...
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>
2019-05-07 08:45:43 -05:00
Stefan Dösinger
9e20eda421
wined3d: Adjust video memory when resizing swapchain buffers.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-25 15:56:28 +01:00
Józef Kucia
e4bf926c3b
wined3d: Introduce general helper function to get sample count for resource.
...
For Vulkan backend.
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>
2019-03-04 19:34:46 +01:00
Józef Kucia
57110d5bc2
wined3d: Introduce wined3d_cs_finish() helper.
...
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-11-29 17:48:34 +01:00
Henri Verbeet
74931f9217
wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-26 20:24:54 +01:00
Henri Verbeet
0bae2bed43
wined3d: Require exclusive GPU access for rendertarget and depth/stencil resources.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-19 22:42:41 +01:00
Henri Verbeet
826be9ee10
wined3d: Make "driver private" formats always mappable.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-19 22:42:41 +01:00
Józef Kucia
a586d4e880
wined3d: Fix downloading data for 1D array textures.
...
glGetTexImage() downloads data for all layers.
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-11-16 18:41:14 +01:00
Henri Verbeet
220c078ed9
wined3d: Prefer bind flags over usage flags in wined3d_texture_prepare_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-01 09:16:59 +01:00
Henri Verbeet
6435bd743b
wined3d: Prefer bind flags over usage flags in wined3d_texture_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-01 09:16:57 +01:00