Józef Kucia
b62aa91758
wined3d: Pass fully initialized shader objects to CS.
...
It shouldn't matter right now, but it might be an issue when we start to
precompile other shader types than compute 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-03-26 21:04:11 +02:00
Henri Verbeet
1b26c27861
wined3d: Simplify wined3d_device_update_sub_resource() a little.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-26 11:35:45 +02:00
Henri Verbeet
6ea4445cc2
wined3d: Handle 3D textures in wined3d_device_copy_sub_resource_region().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-26 11:35:41 +02:00
Henri Verbeet
9240316552
wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-26 11:35:39 +02:00
Józef Kucia
82ffc5b78d
wined3d: Avoid superfluous wglSwapIntervalEXT() calls.
...
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-23 16:23:21 +01:00
Henri Verbeet
1251fe6921
wined3d: Get rid of ARB_vertex_blend support.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-23 14:02:57 +01:00
Henri Verbeet
4aaf9ebe82
wined3d: Get rid of the dst_arg enum.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-23 14:02:53 +01:00
Henri Verbeet
06a4f978ac
wined3d: Use upper-case enum elements in the projection_types enum.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-23 14:02:46 +01:00
Henri Verbeet
9cdc8876b0
wined3d: Use upper-case enum elements in the vertexprocessing_mode enum.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-23 14:02:41 +01:00
Józef Kucia
81459fb8a2
wined3d: Remove swap interval from swapchain description.
...
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-22 18:14:55 +01:00
Józef Kucia
6aeb444e4c
wined3d: Implement updating swap interval through wined3d_swapchain_present().
...
Based on a patch by Michael Müller.
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-22 18:14:52 +01:00
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