Commit Graph

9670 Commits

Author SHA1 Message Date
Gijs Vermeulen b77ac26377 wined3d: Add default case in wined3d_calculate_fog_factor.
Signed-off-by: Gijs Vermeulen <gijsvrm@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-18 20:05:01 +02:00
Zebediah Figura 3c24654dea wined3d: Introduce wined3d_stateblock_set_blend_factor().
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>
2019-10-18 20:04:52 +02:00
Zebediah Figura d66b8592fa wined3d: Introduce wined3d_stateblock_set_render_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>
2019-10-18 20:04:49 +02: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
Zebediah Figura e374d4c72a wined3d: Introduce wined3d_stateblock_set_ps_consts_b().
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>
2019-10-03 22:58:07 +02:00
Zebediah Figura 638459bd5b wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
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>
2019-10-03 22:58:06 +02:00
Zebediah Figura a84a8522d9 wined3d: Introduce wined3d_stateblock_set_ps_consts_f().
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>
2019-10-02 17:38:26 +02:00
Zebediah Figura 25c460fb26 wined3d: Introduce wined3d_stateblock_set_pixel_shader().
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>
2019-10-02 17:38:17 +02:00
Nikolay Sivov 97ef647837 wined3d: Fail UAV creation for resources without corresponding bind flag.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-01 17:09:39 +02:00
Zebediah Figura d7eecf7f20 wined3d: Introduce wined3d_stateblock_set_vertex_declaration().
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>
2019-10-01 17:09:25 +02:00
Zebediah Figura 3a3742f785 wined3d: Introduce wined3d_stateblock_set_vertex_shader().
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>
2019-10-01 17:09:19 +02:00
Rémi Bernon 08141ee9bd wined3d: Add GPU information for Intel UHD Graphics 620.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.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
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
Zebediah Figura 0ffde4ca81 wined3d: Introduce wined3d_stateblock_set_vs_consts_b().
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>
2019-09-30 22:24:27 +02:00
Zebediah Figura 83416bc25b wined3d: Introduce wined3d_stateblock_set_vs_consts_i().
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>
2019-09-30 22:24:27 +02:00
Nikolay Sivov 76d3f0431a wined3d: Fail SRV creation for resources without corresponding bind flag.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-26 21:00:14 +02:00
Zebediah Figura c1eafc9931 wined3d: Introduce wined3d_stateblock_set_vs_consts_f().
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>
2019-09-26 21:00:14 +02:00
Zebediah Figura 40dad5a0ec d3d9: Track the primary stateblock state locally.
In preparation for moving the primary stateblock to the client D3D device.

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>
2019-09-26 21:00:13 +02:00
Zebediah Figura 7360e7d488 wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock().
And hold it locally in d3d[789].

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>
2019-09-26 21:00:13 +02:00
Paul Gofman df509be8c6 wined3d: Allow loading buffers mapped through system memory.
Fixes rendering dirt on the wind shield and GL_INVALID_OPERATION
errors in "Need For Speed Shift 2".

The test succeeds on Windows with retail Direct3D 9, but fails
with debug Direct3D 9 if selected in DirectX SDK control panel:
error code is returned from _DrawIndexedPrimitive() and the
triangle is not rendered.

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-25 21:11:32 +02:00
Henri Verbeet 810ae882f0 wined3d: Handle typeless formats in surface_cpu_blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-24 17:32:13 +02:00
Henri Verbeet 422fa49668 wined3d: Make the adapter responsible for copying between buffer objects.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-24 17:32:11 +02:00
Henri Verbeet f2c668e779 wined3d: Make the adapter responsible for clearing UAVs.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-24 17:32:08 +02:00
Henri Verbeet c01433690d wined3d: Merge wined3d_buffer_gl_unmap() and buffer_resource_sub_resource_unmap().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-24 17:32:05 +02:00
Henri Verbeet e0dcdaedb2 wined3d: Merge wined3d_buffer_gl_map() and buffer_resource_sub_resource_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-24 17:32:02 +02:00
Zebediah Figura 96547e622b wined3d: Reset the CS state before cleaning up the device state.
Otherwise the CS might later try to unbind a resource that has already been
freed.

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>
2019-09-23 19:44:18 +02:00
Zebediah Figura 90a03e7926 wined3d: Fully clean up the device state in wined3d_device_uninit_3d().
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>
2019-09-23 19:44:18 +02:00
Henri Verbeet 47701b7231 wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map().
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 179c8cc86f wined3d: Move the "buffer_object" field from struct wined3d_buffer_gl to struct wined3d_buffer.
We'll want to use this for Vulkan buffers as well.

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 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 8b780d2d8c wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map().
For consistency with the ARB_map_buffer_range path.

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 f8e557a74c wined3d: Initialise the multi-sample draw location for the Vulkan adapter.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 16:23:47 +02:00
Henri Verbeet c84b48b770 wined3d: Retrieve the supported sample counts for Vulkan formats.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 16:23:44 +02:00
Henri Verbeet 59ef897514 wined3d: Explicitly initialise sRGB format info.
For the GL adapter this already happens implicitly in
init_format_texture_info().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 16:23:40 +02:00
Henri Verbeet 74dc66ca57 wined3d: More accurately determine whether a separate sRGB texture is required.
Read control is irrelevant without WINED3D_BIND_SHADER_RESOURCE, write control
is irrelevant without WINED3D_BIND_RENDER_TARGET.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 16:23:36 +02:00
Henri Verbeet d00477e5ea wined3d: Add GPU information for AMD VEGA12.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 16:23:32 +02:00
Alex Henrie 6c40c2dab2 wined3d: Avoid dead assignment (scan-build).
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-20 15:31:23 +02:00
Zhiyi Zhang 124f48d311 wined3d: Truncate stencil reference values to the stencil component size.
As opposed to OpenGL, which clamps them. This fixes a regression introduced by
commit a9e199e5ad.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-28 23:56:17 +02:00
Henri Verbeet 7260e8bd4a wined3d: Initialise d3d_info after quirks are applied.
In particular, quirk_broken_viewport_subpixel_bits() disables
ARB_CLIP_CONTROL, which affects "d3d_info->clip_control". This fixes a
regression introduced by commit e795ddb3d8.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47636
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-28 23:55:46 +02:00
Henri Verbeet 591adce8c1 wined3d: Create the default samplers in adapter_vk_init_3d().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:13:19 +02:00
Henri Verbeet 7ac8b0f9a7 wined3d: Add support for sRGB formats to wined3d_format_convert_from_float().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:13:13 +02:00
Henri Verbeet 000eab8727 wined3d: Store the sRGB constants as wined3d_vec4 structures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:13:02 +02:00
Henri Verbeet f193979a18 wined3d: Introduce wined3d_colour_srgb_from_linear().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:12:57 +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