Henri Verbeet
bed677e343
wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:30:11 +02:00
Conor McCarthy
3fc96a5d35
wined3d: Track windows styles per-swapchain.
...
Instead of per-device.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:30:09 +02:00
Henri Verbeet
0521cc0b8b
wined3d: Filter messages per-window instead of per-device.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:30:07 +02:00
Henri Verbeet
5f96c5e264
wined3d: Setup/restore fullscreen window state inside wined3d.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:30:05 +02:00
Kristján Gerhardsson
f49b27ce22
wined3d: Add GPU information for various Mac GPUs.
...
Signed-off-by: Kristjan Gerhardsson <kristjang@ccpgames.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:29:40 +02:00
Henri Verbeet
e8d86d43a8
wined3d: Pass a wined3d_context structure to wined3d_vertex_pipe_ops.vp_enable().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:29:35 +02:00
Henri Verbeet
d53643ca1d
wined3d: Pass a wined3d_context_gl structure to arbfp_free_ffpshader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:29:33 +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
96a0a54c52
wined3d: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:29:29 +02:00
Henri Verbeet
57d158622f
wined3d: Acquire a context for the front buffer in swapchain_gl_present().
...
Since context_acquire() doesn't take the resource location into account, it
may consider the back-buffer to be offscreen, and return an already active
context for a different swapchain. This fixes a regression introduced by
commit 64d41b3dec
.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-31 08:29:27 +02:00
Henri Verbeet
40a83b2ff3
wined3d: Handle context acquisition failure in wined3d_device_create_primary_opengl_context_cs().
...
Now that we no longer always call context_acquire() from
swapchain_init(), context acquisition can fail here instead.
This fixes a regression introduced by commit
64d41b3dec
.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47468
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-06 21:47:58 +02:00
Paul Gofman
a9eca729bc
wined3d: Fixup 2D sampler when sampling 3D texture for PS models 2 and 3.
...
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-07-05 20:39:32 +02:00
Paul Gofman
34eeb0a877
wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3.
...
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-07-05 20:39:30 +02:00
Paul Gofman
9607a427de
wined3d: Do not modify shader register maps in backends.
...
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-07-05 20:39:27 +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
7b13749fc8
wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end().
...
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
3c82bb74eb
wined3d: Pass a wined3d_context_gl structure to wined3d_so_statistics_query_end().
...
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
5f69c15645
wined3d: Pass a wined3d_context_gl structure to wined3d_query_buffer_queue_result().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-05 17:43:53 +02:00
Henri Verbeet
ca35a55637
wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-05 17:43:53 +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
Henri Verbeet
d7fd641482
wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-04 21:14:54 +02:00
Henri Verbeet
2e49b85f97
wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-04 21:14:54 +02:00
Henri Verbeet
14f1cc73e7
wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-04 21:14:54 +02:00
Henri Verbeet
48d710dce9
wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-04 21:14:54 +02:00
Henri Verbeet
4ed190e8ac
wined3d: Also try to create a depth/stencil buffer for WINED3D_NO3D devices in swapchain_init().
...
If requested. It will fail as it should, but the client library should never
request it. I.e., the additional check is redundant.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 15:24:52 +02:00
Henri Verbeet
3d8c15dc85
wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 15:24:52 +02:00
Henri Verbeet
7d8ad2e8d8
wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 15:24:42 +02:00
Henri Verbeet
dbb0139e3e
wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 15:24:39 +02:00
Henri Verbeet
d86f6a4ab7
wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 15:24:36 +02:00
Henri Verbeet
1ba7247a4f
wined3d: Unhook swapchains in swapchain_cleanup().
...
So that the hook is properly removed on failure in wined3d_swapchain_create().
This is a somewhat theoretical though, since in practice
WINED3D_SWAPCHAIN_HOOK and WINED3D_SWAPCHAIN_IMPLICIT are never used together.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 08:00:03 +02:00
Henri Verbeet
3a2a176a7b
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_ffp_fragment_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 08:00:01 +02:00
Henri Verbeet
9d7ca718e0
wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 07:59:59 +02:00
Henri Verbeet
32dbfda4d5
wined3d: Pass a wined3d_context_gl structure to find_glsl_domain_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 07:59:57 +02:00
Henri Verbeet
62d6520fa6
wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 07:59:55 +02:00
Henri Verbeet
e867d986d5
wined3d: Pass a wined3d_context_gl structure to find_glsl_vshader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-01 14:40:42 +02:00
Henri Verbeet
6bf34c8366
wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-01 14:40:40 +02:00
Henri Verbeet
3d765ae072
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_compute_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-01 14:40:37 +02:00
Henri Verbeet
9eb34e4f74
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-01 14:40:35 +02:00
Henri Verbeet
08033be01b
wined3d: Use Windows 7 as fallback driver version in wined3d_driver_info_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-28 08:11:26 +02:00
Henri Verbeet
03a06f4ef2
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-28 08:11:24 +02:00
Henri Verbeet
eaf48206c1
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-28 08:11:22 +02:00
Henri Verbeet
c85df2edc6
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-28 08:11:20 +02:00
Henri Verbeet
c65d522f91
wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-28 08:11:15 +02:00
Henri Verbeet
6d417f7890
wined3d: Explicitly handle Windows 2 & 3 in wined3d_driver_info_init().
...
By returning Windows 9x driver versions.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-27 19:37:05 +02:00
Henri Verbeet
62179b511f
wined3d: Pass a wined3d_context_gl structure to shader_generate_glsl_declarations().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-27 19:37:03 +02:00
Henri Verbeet
7710f67354
wined3d: Pass a wined3d_context_gl structure to shader_glsl_clip_plane_uniform().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-27 19:37:01 +02:00
Henri Verbeet
e9dc1dfc2f
wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_fog_uniform().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-27 19:36:59 +02:00
Henri Verbeet
45c3c20dbf
wined3d: Pass a wined3d_context_gl structure to shader_glsl_pointsize_uniform().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-27 19:36:57 +02:00
Henri Verbeet
0bcb2de66a
wined3d: Handle Windows 8.1 in wined3d_driver_info_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-26 23:08:56 +02:00
Henri Verbeet
68c665576b
wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-26 23:08:56 +02:00