Commit Graph

913 Commits

Author SHA1 Message Date
Paul Gofman 645eb62f70 wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx().
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-18 22:12:38 +01:00
Paul Gofman ecad635124 wined3d: Factor out wined3d_context_gl_create_wgl() 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-11-18 22:12:36 +01:00
Paul Gofman 600f39d4ad d3d11: Mind DSV flags when checking for conflicting SRV.
Fixes a regression introduced by commit 3f698b950f.

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-31 17:39:13 +01:00
Paul Gofman a5551040f2 wined3d: Issue texture barrier before using a texture attached to FBO.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45978
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-27 19:12:41 +01: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 5356292ee9 wined3d: Introduce a separate structure for OpenGL sampler information.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-15 20:16:58 +02:00
Henri Verbeet 9bbe8ec590 wined3d: Get rid of a redundant NULL check in wined3d_context_gl_acquire() (Coverity).
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-13 11:02:52 +02:00
Henri Verbeet b27f961eeb wined3d: Move the context array from struct wined3d_swapchain to struct wined3d_swapchain_gl.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-13 11:02:50 +02:00
Henri Verbeet 17ce100766 wined3d: Move the backup window from struct wined3d_swapchain to struct wined3d_swapchain_gl.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-13 11:02:47 +02:00
Henri Verbeet f654f983fa wined3d: Introduce a structure for Vulkan context information.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-08 09:02:00 +02:00
Henri Verbeet 2ddb6b66a7 wined3d: Get rid of the "dirtyArray" field from struct wined3d_context.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-07 19:56:22 +02:00
Henri Verbeet 6a66af88de wined3d: Move the "level" 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:18 +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 1c41aac4a4 wined3d: Get rid of the float16 fallback in context_update_stream_info().
This is never used, since we reject creation of vertex declarations that
contain any elements with unsupported formats.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-05 18:45:03 +02:00
Henri Verbeet 337dc8a272 wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-05 18:45:01 +02:00
Henri Verbeet 157440e3d3 wined3d: Return a wined3d_context_gl structure from context_get_current().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-05 18:44:58 +02:00
Henri Verbeet 360e1a46d8 wined3d: Pass a wined3d_context_gl structure to context_set_current().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-05 18:44:55 +02:00
Henri Verbeet aaf57e761a wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-02 08:58:55 +02:00
Henri Verbeet 64d41b3dec wined3d: Try harder to reuse the current context.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-04 21:14:54 +02:00
Zebediah Figura 0922237c83 wined3d: Use a backup device context for swapchains created on the desktop window.
This patch was written by "naur".

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18490
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-06-21 22:51:55 +02:00
Henri Verbeet f89a303bcb wined3d: Pass a wined3d_context_gl structure to context_draw_textured_quad().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-20 08:47:29 +02:00
Henri Verbeet a668fa8949 wined3d: Pass a wined3d_context_gl structure to context_draw_shaded_quad().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-20 08:47:27 +02:00
Henri Verbeet 292a15886a wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_arrays().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-20 08:47:20 +02:00
Henri Verbeet 7dd4bb2ab6 wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_array().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-19 10:26:14 +02:00
Henri Verbeet f585a301c7 wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-19 10:26:12 +02:00
Henri Verbeet 26203c8a58 wined3d: Pass a wined3d_context_gl structure to context_unload_vertex_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-19 10:26:09 +02:00
Henri Verbeet 6001575f9d wined3d: Pass a wined3d_context_gl structure to draw_indirect().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-19 10:26:05 +02:00
Henri Verbeet 578e7cd566 wined3d: Pass a wined3d_context_gl structure to draw_primitive_arrays().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-18 08:57:13 +02:00
Henri Verbeet 3dce7bcffd wined3d: Pass a wined3d_context_gl structure to context_setup_target().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-18 08:57:11 +02:00
Henri Verbeet 50d8290b25 wined3d: Pass a wined3d_context_gl structure to context_pause_transform_feedback().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-18 08:57:09 +02:00
Henri Verbeet 9c746674e0 wined3d: Pass a wined3d_context_gl structure to context_bind_unordered_access_views().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-18 08:57:07 +02:00
Henri Verbeet cf48248b09 wined3d: Pass a wined3d_context_gl structure to context_apply_blit_projection().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-17 20:47:44 +02:00
Henri Verbeet adc4a9a345 wined3d: Pass a wined3d_context_gl structure to context_set_render_offscreen().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-17 20:47:41 +02:00
Henri Verbeet fdc2812d04 wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-17 20:47:39 +02:00
Henri Verbeet 3c448b5dac wined3d: Pass a wined3d_context_gl structure to context_create_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-17 20:47:37 +02:00
Henri Verbeet c600fd86e1 wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-14 18:19:18 +02:00
Henri Verbeet b5ecad008b wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-14 18:19:15 +02:00
Henri Verbeet 6c1bd3a067 wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-14 18:19:13 +02:00
Henri Verbeet 5a143e5a29 wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-14 18:19:11 +02:00
Henri Verbeet f7c80fae51 wined3d: Pass a wined3d_context_gl structure to context_attach_gl_texture_fbo().
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 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 45c3b125c7 wined3d: Pass a wined3d_context_gl structure to context_unload_tex_coords().
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 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 6ffc6cd5d2 wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback().
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 258f0d209d wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances().
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 7bdbf00b0f wined3d: Pass a wined3d_context_gl structure to context_copy_bo_address().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-10 12:16:54 +02:00
Henri Verbeet 813e08fc1d wined3d: Pass a wined3d_context_gl structure to context_bind_dummy_textures().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-10 12:16:51 +02:00
Henri Verbeet 3faa9e92a5 wined3d: Pass a wined3d_context_gl structure to context_bind_bo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-10 12:16:48 +02:00