Commit Graph

9394 Commits

Author SHA1 Message Date
Henri Verbeet 916bd0e4c2 wined3d: Use wined3d_texture_get_level_box() in texture2d_load_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-20 12:20:43 +02:00
Henri Verbeet 6cd822c38a wined3d: Pass a wined3d_context_gl structure to context_set_pixel_format().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-20 12:20:40 +02:00
Henri Verbeet da91e15bda wined3d: Pass a wined3d_context_gl structure to wined3d_context_gl_restore_pixel_format().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-20 12:20:38 +02:00
Henri Verbeet 74ed5d722f wined3d: Pass a wined3d_context_gl structure to context_get_offscreen_gl_buffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-20 12:20:36 +02:00
Henri Verbeet f2506fc778 wined3d: Move the FBO fields 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-20 12:20:33 +02:00
Henri Verbeet 099b05ce6f wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 20:40:39 +02:00
Henri Verbeet 376c842526 wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 20:40:36 +02:00
Henri Verbeet 66aad5e95f wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 20:40:34 +02:00
Henri Verbeet 2d20e498f1 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 20:40:30 +02:00
Henri Verbeet f9224e7284 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 20:40:25 +02:00
Matteo Bruni 6f38a7443c wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Matteo Bruni 0f209a9301 wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Matteo Bruni cf0b9d4238 wined3d: Add ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE to core_extensions[].
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Paul Gofman 57bb929e8a wined3d: Factor out compute_normal_matrix() 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-05-16 20:54:23 +02:00
Paul Gofman 0d79d3625e wined3d: Move validate_material_colour_source() to wined3d_private.h.
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-05-16 20:54:23 +02:00
Henri Verbeet db20107265 wined3d: Use context_acquire() in wined3d_swapchain_cs_init().
Instead of calling context_create() directly.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Henri Verbeet 0fdce94258 wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Henri Verbeet d93689334f wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Henri Verbeet 66156781ee wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Henri Verbeet 9729f15acc wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 20:54:23 +02:00
Henri Verbeet 97fb02876a wined3d: Pass a wined3d_context_gl structure to context_bind_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 19:26:31 +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 9cb572cb70 wined3d: Pass a wined3d_context_gl structure to context_set_draw_buffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 19:26:25 +02:00
Henri Verbeet 49889f72d7 wined3d: Pass a wined3d_context_gl structure to context_check_fbo_status().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 19:26:22 +02:00
Henri Verbeet 907b2a3333 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state_blit().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 19:26:20 +02:00
Matteo Bruni 8958eb68d7 wined3d: Avoid some redundant glVertexAttrib4f() calls.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 20:13:59 +02:00
Matteo Bruni 33d3821943 wined3d: Pass a wined3d_context_gl structure to context_update_stream_sources().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 20:13:59 +02:00
Matteo Bruni 24f906f497 wined3d: Pass a wined3d_context_gl structure to context_load_numbered_arrays().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 20:13:59 +02:00
Henri Verbeet dfe7e91060 wined3d: Pass a wined3d_context_gl structure to context_apply_clear_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 20:13:59 +02:00
Henri Verbeet 776b84e6a5 wined3d: Move the pipeline statistics query fields 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-14 20:13:59 +02:00
Henri Verbeet cc5e38e1bf wined3d: Move the stream-output statistics query fields 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-14 20:13:59 +02:00
Henri Verbeet f942b20a97 wined3d: Move the timestamp query fields 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-14 20:13:59 +02:00
Henri Verbeet bc6667b0d0 wined3d: Move the fence fields 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-14 20:13:59 +02:00
Matteo Bruni 3724e9c4ab wined3d: Avoid a GCC 8 warning.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 20:13:59 +02:00
Henri Verbeet ce1c0ff1e9 wined3d: Move the occlusion query fields 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:12 +02:00
Henri Verbeet de16768de7 wined3d: Move the "blit_vbo" 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-05-13 12:45:10 +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 045f9b51cb wined3d: Pass a wined3d_context_gl structure to draw_primitive_immediate_mode().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-13 12:45:05 +02:00
Henri Verbeet 48b0c20955 wined3d: Pass a wined3d_context_gl structure to context_update_tex_unit_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-13 12:45:03 +02:00
Henri Verbeet 248b11ccd1 wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +02:00
Henri Verbeet 167a0f5738 wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +02:00
Henri Verbeet 1d0f83711d wined3d: Pass a wined3d_context_gl structure to context_map_psamplers().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +02:00
Henri Verbeet e6ad0cd7e3 wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +02:00
Henri Verbeet be7f65dfdc wined3d: Pass a wined3d_context_gl structure to context_map_stage().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +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 d29f0545b2 wined3d: Pass a wined3d_context_gl structure to context_apply_ffp_blit_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-09 10:01:48 -05:00
Henri Verbeet 54945f04de wined3d: Pass a wined3d_context_gl structure to context_apply_blit_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-09 10:01:44 -05:00
Henri Verbeet 81f5f21ab5 wined3d: Pass a wined3d_context_gl structure to context_bind_shader_resources().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-09 10:01:39 -05:00
Henri Verbeet a1d3939254 wined3d: Pass a wined3d_context_gl structure to context_get_tex_unit_mapping().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-09 10:01:34 -05:00
Paul Gofman a9e199e5ad wined3d: Apply stencil mask to stencil reference value.
This is consistent with the docs and confirmed by the test.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28196
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-05-09 10:01:22 -05:00