Commit Graph

7384 Commits

Author SHA1 Message Date
Henri Verbeet 1c91fd4b38 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-26 12:07:27 +09:00
Henri Verbeet f1985edffa wined3d: Use wined3d_texture_blt() in wined3d_device_copy_resource().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-26 12:07:25 +09:00
Henri Verbeet ee800283fa wined3d: Pass a texture instead of a surface to context_generate_rt_mask_no_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-26 12:07:22 +09:00
Henri Verbeet adb495ec37 wined3d: Replace context_generate_rt_mask_from_surface() with context_generate_rt_mask_from_resource().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-26 12:07:20 +09:00
Józef Kucia 4315caeff6 wined3d: Improve advertized driver version for Windows 10.
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>
2016-03-25 23:35:22 +09:00
Paul Gofman d05edd03c4 wined3d: Support D3DFMT_L8 format as render target.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 21:46:06 +09:00
Stefan Dösinger 7d65065ecb wined3d: Avoid storing color and rectangle pointers in struct wined3d_cs_clear.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:40 +09:00
Henri Verbeet 38f921a8a9 wined3d: Get resource info from the texture in surface_load_renderbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:35 +09:00
Henri Verbeet d71699141b wined3d: Get resource info from the texture in surface_load_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:32 +09:00
Henri Verbeet fad52d7859 wined3d: Get resource info from the texture in surface_load_drawable().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:30 +09:00
Henri Verbeet 484f5f1ec5 wined3d: Get resource info from the texture in surface_copy_simple_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:28 +09:00
Henri Verbeet 5bf5bc2784 wined3d: Get resource info from the texture in surface_load_ds_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 12:43:25 +09:00
Matteo Bruni 0ed39ad13d wined3d: Use ARB_texture_swizzle for color fixups when possible.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 22:09:37 +09:00
Matteo Bruni 5cb85f3b2f wined3d: Add ARB_texture_swizzle extension.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 22:09:32 +09:00
Matteo Bruni 565ef4f961 wined3d: Emulate luminance texture formats on core profile.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 22:09:28 +09:00
Stefan Dösinger 74c38385ba wined3d: Avoid storing a viewport pointer in struct wined3d_cs_set_viewport.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 11:51:06 +09:00
Henri Verbeet b46ef08c9c wined3d: Introduce wined3d_texture_get_gl_buffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 11:51:03 +09:00
Henri Verbeet 7bf2a34528 wined3d: Pass a texture instead of a surface to context_create().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 11:51:01 +09:00
Henri Verbeet 72e373d220 wined3d: Get the framebuffer height from the view in shader_glsl_load_constants().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 11:50:59 +09:00
Józef Kucia 510c8e3983 wined3d: Use dcl_sampler to determine if shadow sampler is needed.
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>
2016-03-23 23:35:52 +09:00
Józef Kucia d563cdb0db wined3d: Implement SM4 sample_c_lz instruction.
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>
2016-03-23 23:35:50 +09:00
Józef Kucia e06180a564 wined3d: Implement SM4 sample_c instruction.
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>
2016-03-23 23:35:48 +09:00
Stefan Dösinger 8d8b4d9c66 wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:54 +09:00
Henri Verbeet 9868969211 wined3d: Get resource info from the texture in surface_depth_blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:54 +09:00
Henri Verbeet 6d823825fa wined3d: Get resource info from the texture in surface_blt_special().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:54 +09:00
Henri Verbeet c526188bb3 wined3d: Get resource info from the texture in surface_blt_to_drawable().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:54 +09:00
Józef Kucia 53f4cc1a9e wined3d: Allow draw calls without color attachments.
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>
2016-03-22 23:51:32 +09:00
Józef Kucia 4affb95ebb wined3d: Introduce helper function for binding buffers.
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>
2016-03-22 23:51:32 +09:00
Józef Kucia 97c70c86be wined3d: Fix driver version check.
The previous check didn't catch older Windows versions for which
dwMinorVersion > 2.

Spotted 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>
2016-03-22 23:51:32 +09:00
Francois Gouget 272b8bc190 wined3d: Make wined3d_texture_force_reload() static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 23:51:31 +09:00
Stefan Dösinger 1422add1df wined3d: Avoid storing a transformation matrix pointer in struct wined3d_cs_set_transform.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:49 +09:00
Henri Verbeet 484c9ae45f wined3d: Merge surface_private_setup() into wined3d_surface_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:41 +09:00
Henri Verbeet 55b9724570 wined3d: Check for compressed and height scaled formats in texture_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:36 +09:00
Henri Verbeet ab53ef0651 wined3d: Validate (2D) texture dimensions in texture_init().
Instead of for each surface individually.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:32 +09:00
Henri Verbeet 2d00f77f30 wined3d: Get rid of wined3d_surface_ops.surface_private_setup().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:27 +09:00
Józef Kucia 446ee50b90 wined3d: Prevent possible integer overflow in buffer_invalidate_bo_range().
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>
2016-03-22 00:36:29 +09:00
Józef Kucia 33e786565c wined3d: Add support for buffers in wined3d_device_copy_sub_resource().
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>
2016-03-22 00:36:29 +09:00
Józef Kucia 94039385f9 wined3d: Implement copying of buffer resources.
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>
2016-03-22 00:36:28 +09:00
Józef Kucia 6a5a51be1b wined3d: Add extension detection for ARB_copy_buffer.
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>
2016-03-22 00:36:28 +09:00
Rob Walker e4c75a88fd wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
Signed-off-by: Rob Walker <bob.mt.wya@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:28 +09:00
Stefan Dösinger 11fe733fdc wined3d: Avoid storing a clip plane pointer in struct wined3d_cs_set_clip_plane.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Henri Verbeet 77a396a086 wined3d: Get resource info from the texture in fb_copy_to_texture_hwstretch().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Henri Verbeet 69f8b3182e wined3d: Get resource info from the texture in fb_copy_to_texture_direct().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Henri Verbeet 119c17e173 wined3d: Get resource info from the texture in surface_prepare_rb().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Henri Verbeet 576a74d166 wined3d: Get resource info from the texture in surface_load_fb_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:26 +09:00
Henri Verbeet 1e8befdbf0 wined3d: Get resource info from the texture in read_from_framebuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:26 +09:00
Stefan Dösinger cecc496ecf wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:21:01 +09:00
Henri Verbeet 687642fafa wined3d: Get rid of the WINED3DUSAGE_OVERLAY check in gdi_surface_private_setup().
Overlays shouldn't be any more broken for "GDI" surfaces than for regular
surfaces.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:57 +09:00
Henri Verbeet 7fb0ff9e89 wined3d: Explicitly check for WINED3DUSAGE_TEXTURE when validating surface dimensions in surface_private_setup().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:55 +09:00
Henri Verbeet a2e5881de1 wined3d: Handle NULL rectangles in wined3d_swapchain_present().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:52 +09:00
Henri Verbeet 240912c59b wined3d: Ignore the dirty region for swapchain presents more explicitly.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:49 +09:00
Henri Verbeet 198042e1d8 wined3d: Require a valid rectangle pointer if rect_count is non-zero in device_clear_render_targets().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:44 +09:00
Henri Verbeet cb9704a979 wined3d: Properly check if sRGB writes should be enabled in context_apply_clear_state().
In particular, while enabling sRGB writes is harmless for framebuffers that
are not sRGB capable, the default framebuffer may be sRGB capable regardless
of the associated wined3d format.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:40 +09:00
Józef Kucia 966a07149a wined3d: Use GLuint instead of GLenum to store ARB blitter 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>
2016-03-17 21:58:59 +09:00
Józef Kucia 4b926f91b4 wined3d: Recognize SM5 deriv_rty_fine opcode.
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>
2016-03-17 21:58:54 +09:00
Józef Kucia 7fccd3bd13 wined3d: Recognize SM5 deriv_rtx_fine opcode.
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>
2016-03-17 21:58:50 +09:00
Józef Kucia 9108fe7233 wined3d: Recognize SM5 deriv_rty_coarse opcode.
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>
2016-03-17 21:58:45 +09:00
Józef Kucia 07562768bb wined3d: Recognize SM5 deriv_rtx_coarse opcode.
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>
2016-03-17 21:58:41 +09:00
Józef Kucia f0de33ba14 wined3d: Recognize SM5 ld_structured opcode.
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>
2016-03-17 21:58:36 +09:00
Stefan Dösinger f08896aa73 wined3d: Get rid of state access in shader_generate_glsl_declarations().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:21 +09:00
Henri Verbeet ab1ae26520 wined3d: Get resource info from the texture in surface_load().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:19 +09:00
Henri Verbeet 2b40957a1a wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:17 +09:00
Henri Verbeet be662a6f74 wined3d: Get resource info from the texture in surface_upload_from_surface().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:14 +09:00
Henri Verbeet 55165bf6d0 wined3d: Get resource info from the texture in wined3d_surface_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:11 +09:00
Henri Verbeet aa1fe8cfb1 wined3d: Get resource info from the texture in surface_download_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:30:11 +09:00
Henri Verbeet d9ebc2e215 wined3d: Get resource info from the texture in wined3d_surface_depth_fill().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-17 11:29:55 +09:00
Matteo Bruni 64d16294bf wined3d: Enable SM5 shaders in the GLSL backend, when possible.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-16 21:59:43 +09:00
Stefan Dösinger a7f7532de3 wined3d: Get rid of texture_ops.texture_sub_resource_add_dirty_region().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-16 12:11:34 +09:00
Henri Verbeet 1b483f32ad wined3d: Use WGL_WINE_query_renderer to query GPU information.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-16 12:11:27 +09:00
Henri Verbeet 91f0b00103 wined3d: Allow swapchain sample counts to be overridden with a registry key.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-16 12:09:55 +09:00
Józef Kucia 3ae4be8696 wined3d: Implement stencil clear in wined3d_device_clear_rendertarget_view().
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>
2016-03-15 22:45:56 +09:00
Józef Kucia c21dbb5149 wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view().
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>
2016-03-15 22:45:53 +09:00
Józef Kucia c099f3a060 wined3d: Introduce debug_color().
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>
2016-03-15 22:45:42 +09:00
Miklós Máté e29aaca018 wined3d: Warn only once about unsupported wrap state.
Signed-off-by: Miklós Máté <mtmkls@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:49:33 +09:00
Stefan Dösinger 2efaddc74e wined3d: Merge wined3d_surface_update_desc() into wined3d_texture_update_desc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:54 +09:00
Stefan Dösinger bad4849257 wined3d: Introduce wined3d_texture_use_pbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:51 +09:00
Henri Verbeet ef8162751e wined3d: Get resource info from the texture in surface_convert_depth_to_float().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:49 +09:00
Henri Verbeet f04448500d wined3d: Get resource info from the texture in surface_blt_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:47 +09:00
Henri Verbeet 77aa34099c wined3d: Get resource info from the texture in surface_depth_blt_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:45 +09:00
Henri Verbeet fcbe8b7a79 wined3d: Get resource info from the texture in surface_private_setup().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:42 +09:00
Henri Verbeet fc868cb908 wined3d: Get resource info from the texture in surface_create_dib_section().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:40 +09:00
Henri Verbeet 724463d666 wined3d: Get resource info from the texture in wined3d_surface_cleanup().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 10:14:38 +09:00
Stefan Dösinger aeefbdffba wined3d: Merge wined3d_surface_map() and wined3d_volume_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:53 +09:00
Henri Verbeet f8c1c1778a wined3d: "render_targets" is never NULL in context_find_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:32 +09:00
Józef Kucia 565a571546 wined3d: Limit amount of video memory for older Windows versions.
This should affect only 32-bit applications when the emulated Windows
version is set to "Windows 2003" or older.

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>
2016-03-13 15:41:18 +09:00
Józef Kucia 48d183dbc2 wined3d: Advertise WINED3DFMT_BC{4, 5}_UNORM 3D textures as not supported.
GL_ARB_texture_compression_rgtc does not support 3D textures.

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>
2016-03-11 20:23:43 +09:00
Józef Kucia 4c355b1eb5 wined3d: Improve ERR() message in shader_glsl_get_sample_function().
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>
2016-03-11 20:23:22 +09:00
Józef Kucia e09aa6fc94 wined3d: Simplify shader_glsl_append_imm_ivec().
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>
2016-03-11 20:23:19 +09:00
Stefan Dösinger beb8986e48 wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:26:06 +09:00
Henri Verbeet a59f70d29c wined3d: Use ARB_map_buffer_range in wined3d_surface_map() when available.
Like in wined3d_volume_map().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:26:04 +09:00
Henri Verbeet a80a4c10d3 wined3d: Properly handle discarded surfaces in surface_load_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:26:02 +09:00
Henri Verbeet de8e151f6d wined3d: Don't call surface_load_ds_location() directly.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:26:00 +09:00
Henri Verbeet 06b5114342 wined3d: Introduce helpers functions to calculate texture level dimensions.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:25:58 +09:00
Henri Verbeet bc24fbf6d6 wined3d: Keep track of the download count in the texture.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:25:55 +09:00
Józef Kucia ab09deac3b wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend.
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>
2016-03-09 22:16:56 +09:00
Józef Kucia 36c67c8a44 wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend.
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>
2016-03-09 22:16:54 +09:00
Józef Kucia cd9b181275 wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
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>
2016-03-09 22:16:51 +09:00
Józef Kucia 31713e39b5 wined3d: Recognize aoffimmi shader instruction modifier.
The aoffimmi stands for address offset by immediate integer.

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>
2016-03-09 22:16:46 +09:00
Stefan Dösinger 8d1131b8ec wined3d: Call wined3d_volume_prepare_location() in wined3d_volume_load_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:59 +09:00
Henri Verbeet 84b9dd3837 wined3d: Introduce wined3d_volume_prepare_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:57 +09:00
Henri Verbeet c5d47bd6fe wined3d: Sanitise map flags in wined3d_surface_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:55 +09:00
Henri Verbeet edb3ea66a0 wined3d: Replace D3DCOLORTOGLFLOAT4 with an inline function.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:53 +09:00
Henri Verbeet 09aa6acc0b wined3d: Get rid of the D3DCOLOR_[RGBA] macros.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:50 +09:00
Henri Verbeet 357e7b759f wined3d: Use D3DCOLORTOGLFLOAT4 in drawStridedSlow().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:49 +09:00
Michael Stefaniuc b3790bf803 wined3d: Use SetRect() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:39:40 +09:00
Stefan Dösinger 0771244873 wined3d: Call wined3d_surface_prepare() in surface_load_sysmem().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:21 +09:00
Henri Verbeet 9f17f92207 wined3d: Pass textures and sub-resource indices to surface_cpu_blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:19 +09:00
Henri Verbeet fea913351d wined3d: Pass a texture and sub-resource index to surface_convert_format().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:17 +09:00
Henri Verbeet 60865da5a5 wined3d: Use the resource map/unmap functions in wined3d_device_set_cursor_properties().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:15 +09:00
Henri Verbeet ead77caae3 wined3d: Pass a texture and sub-resource index to wined3d_device_create_cursor_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:12 +09:00
Henri Verbeet 561373344c wined3d: Replace device_update_volume() with a function to update multiple levels of a 3D texture.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:11:10 +09:00
Stefan Dösinger ecba38d5bd wined3d: Merge surface_prepare_map_memory() into wined3d_surface_prepare().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:32 +09:00
Henri Verbeet 7107263b17 wined3d: Get resource info from the texture in wined3d_surface_blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:30 +09:00
Henri Verbeet 9083addc6a wined3d: Get resource info from the rendertarget view in draw_primitive().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:28 +09:00
Henri Verbeet 2d8a1034fa wined3d: Get resource info from the rendertarget view in device_clear_render_targets().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:26 +09:00
Henri Verbeet 1e78dd3197 wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:24 +09:00
Henri Verbeet 34968bb2d8 wined3d: Get resource info from the texture in context_setup_target().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-07 13:22:21 +09:00
Stefan Dösinger b23f21a9fb wined3d: Call wined3d_texture_set_dirty() in wined3d_volume_invalidate_location().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:09 +09:00
Henri Verbeet 4b34b5646c wined3d: Get resource info from the texture in context_apply_blit_state().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:09 +09:00
Henri Verbeet cea2ec9ab6 wined3d: Get resource info from the texture in context_generate_rt_mask_no_fbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:09 +09:00
Henri Verbeet 6b2567e42c wined3d: Get resource info from the texture in context_create().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:09 +09:00
Henri Verbeet 193ca794fc wined3d: Get resource info from the texture in context_restore().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:09 +09:00
Henri Verbeet 40ef70eb39 wined3d: Get resource info from the texture in context_find_fbo_entry().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:08 +09:00
Henri Verbeet b334f1d237 wined3d: Get resource info from the texture in arbfp_blit_surface().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:08 +09:00
Henri Verbeet 5d421caef6 wined3d: Get resource info from the texture in arbfp_blit_set().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:08 +09:00
Józef Kucia f508181718 wined3d: Add support for WINED3DFMT_R11G11B10_FLOAT format.
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>
2016-03-03 22:29:06 +09:00
Józef Kucia cb6237c018 wined3d: Add support for WINED3DFMT_BC5_UNORM format.
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>
2016-03-03 22:29:04 +09:00
Józef Kucia 24b951389e wined3d: Add support for WINED3DFMT_BC4_UNORM format.
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>
2016-03-03 22:29:04 +09:00
Michael Stefaniuc a29a3c8a0b wined3d: Use SetRectEmpty() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 22:29:02 +09:00
Stefan Dösinger 5141c082ca wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:48 +09:00
Stefan Dösinger 87143e60ed wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:48 +09:00
Stefan Dösinger 45fa5b6471 wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:48 +09:00
Henri Verbeet fbe2737537 wined3d: Store surface/volume buffer objects in the sub-resource structure.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:48 +09:00
Henri Verbeet 09c862b6a2 wined3d: Avoid volume_from_resource() in texture3d_prepare_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet c059191e0f wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet b309b831de wined3d: Avoid surface_from_resource() in texture2d_prepare_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet aad8f74cc8 wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet e3e5dcd2cd wined3d: Use a single allocation for texture sub-resource objects.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet 9f51e8f77e d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Matteo Bruni 8e696dee5f wined3d: Add a setting to check relative addressing indices when accessing uniforms.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 23:30:48 +09:00
Józef Kucia b77dd8813d wined3d: Fix SM4 pixel shader output registers mapping.
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>
2016-03-02 23:30:31 +09:00
Stefan Dösinger a7316e1927 wined3d: Get rid of wined3d_surface_ops.surface_unmap().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:21 +09:00
Henri Verbeet 29c27b9bab wined3d: Keep track of front buffer updates in the swapchain.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:19 +09:00
Stefan Dösinger 9dc8956102 wined3d: Get rid of the offscreenBuffer field in struct wined3d_device.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 12:06:46 +09:00
Stefan Dösinger d71f452c4d wined3d: Rotate through swapchain buffers.
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:12 +09:00
Sebastian Lackner 210069d9dc wined3d: Fix TRACE in wined3d_texture_update_desc function.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:11 +09:00
Sebastian Lackner 85f088f252 wined3d: Fix transposed lines in WARN message.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:11 +09:00
Henri Verbeet 0287d75ce7 wined3d: Introduce wined3d_texture_get_sub_resource_desc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:11 +09:00
Henri Verbeet 5c1976c43b wined3d: Introduce wined3d_texture_set_sub_resource_parent().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Stefan Dösinger 928cb58aa8 wined3d: Remove fbo_entry->d3d_depth_stencil.
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:32:47 +09:00