Commit Graph

7393 Commits

Author SHA1 Message Date
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
Stefan Dösinger d04ca90bca wined3d: Check multisampling compatibility before finding the FBO key.
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:42 +09:00
Stefan Dösinger 5dac6e49d8 wined3d: Simplify FBO cleanup on resource destruction.
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:33 +09:00
Stefan Dösinger bcd9291615 wined3d: Better integrate the fixed up DS in the new FBO cache handling.
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:25 +09:00
Stefan Dösinger b76fcbe0da wined3d: Keep track of FBOs through the GL names.
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:15 +09:00
Stefan Dösinger f11f6f681e wined3d: Retrieve FBO attachments from GL in context_check_fbo_status.
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:08 +09:00
Paul Gofman 749d5a577b wined3d: Bind default sampler object when setting sampler state with no texture.
When sampler state was applied and no stage texture was present in
state, no glBindSampler was issued for the stage after dummy texture was
bound, and previously bound sampler was still active. This could result
in undefined behaviour, especially if previously bound sampler was a
shadow sample (this caused warnings from Nvidia driver).

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-02-24 10:31:57 +09:00
Henri Verbeet 0ec540276a wined3d: Pass a format instead of a surface to wined3d_format_convert_from_float().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-20 12:08:06 +09:00
Stefan Dösinger cdefb5ccb7 wined3d: Track SFLAG_NONPOW2 per-texture.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-19 15:10:21 +09:00
Stefan Dösinger 58719f60d5 wined3d: Introduce wined3d_texture_check_block_align().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-18 21:05:49 +09:00
Matteo Bruni 14d3dbbb7b wined3d: Add shader limits for SM5.
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-02-18 01:17:26 +09:00
Henri Verbeet 691086eac1 wined3d: Introduce wined3d_texture_get_sub_resource_parent().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-17 13:05:57 +09:00
Stefan Dösinger 4f909e980f wined3d: Store texture sub-resources as structures containing resource pointers.
The idea being that the resource pointer will eventually go away.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-17 13:05:50 +09:00
Henri Verbeet 273e4ae737 wined3d: Allocate the sub_resources array as part of the texture.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-17 13:05:48 +09:00
Ken Thomases 52a99f2ead wined3d: Change calls of GetDC() to GetDCEx() with DCX_CACHE so the HDC is not shared with other threads.
Windows created by the app may use the CS_CLASSDC or CS_OWNDC class styles.  In
that case, GetDC() would return the same HDC to all callers.  It's not safe,
though, for multiple threads to use the same HDC without synchronization.  The
app may be using that HDC from multiple threads and using some synchronization
scheme to make that safe, but wined3d is not able to cooperate in such a scheme.

Using GetDCEx() with DCX_CACHE ensures that wined3d gets an independent HDC.

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 23:26:31 +09:00
Stefan Dösinger 1bb4b7ece7 wined3d: Remove the DIB extra line hack.
Our surface pitch alignment should take care of any writes past unaligned
widths.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet c62fe153c6 wined3d: Use wined3d_texture_blt() in resolve_depth_buffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet 9d7221b51d wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields.
It's a happy coincidence that none of the surface pointers are actually used.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet 0b6b5176cc wined3d: Get rid of unused/unimplemented WINEDDBLT_* flags.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet 47635a60a0 ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet 05b84945d5 wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet e5719e9899 wined3d: Use a wined3d_string_buffer to dump the intermediate shader code.
Instead of abusing TRACE. There's probably still some room for improvement.
There may also be value in dumping things in a format that's compatible with
D3D shader assembly, but I don't think it's a priority.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-13 13:21:53 +09:00
Henri Verbeet 649d2dfb3b wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-13 13:21:49 +09:00
Matteo Bruni 24d937b618 wined3d: Mark a couple of unimplemented relative addressing cases with FIXMEs.
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-02-12 23:07:29 +09:00
Matteo Bruni 1061969eb6 wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM.
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-02-12 23:07:29 +09:00
Henri Verbeet 553149a049 wined3d: Ignore wined3d_sampler_desc.srgb_decode if WINED3D_SRGB_READ_WRITE_CONTROL is not set.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet 3b5eca269d wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet 6e5fa92299 ddraw: Use wined3d_texture_get_pitch() in ddraw_surface_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet f8c858c375 wined3d: Use wined3d_texture_get_pitch() in surface_load_texture().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet d393619092 wined3d: Use wined3d_texture_get_pitch() in read_from_framebuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Józef Kucia 1098a673e6 wined3d: Move more formats to typed_formats table.
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-02-11 22:22:10 +09:00
Józef Kucia 0e9327b9f2 wined3d: Copy channel info for typed formats from typeless formats.
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-02-11 22:22:07 +09:00
Józef Kucia ab9f7d4ee6 wined3d: Use format id as index in formats table whenever possible.
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-02-11 22:22:02 +09:00
Józef Kucia a5389a4315 wined3d: Rename getFmtIdx() to get_format_idx().
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-02-11 22:22:00 +09:00
Józef Kucia 8a5aabce9a wined3d: Introduce table with typed format channels.
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-02-11 22:21:57 +09:00
Henri Verbeet 4155c22e25 wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-11 12:13:57 +09:00
Henri Verbeet bb385366a1 wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-11 12:13:54 +09:00
Henri Verbeet ef040d71db wined3d: Use wined3d_texture_get_pitch() in surface_download_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-11 12:13:51 +09:00
Henri Verbeet fdecf9e452 wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-11 12:13:49 +09:00
Henri Verbeet 7f69a34574 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-11 12:13:46 +09:00
Józef Kucia 9c98d63277 wined3d: Add remaining sRGB formats.
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-02-11 01:26:47 +09:00
Józef Kucia a8585c2d8d wined3d: Fix comment in init_format_texture_info().
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-02-11 01:26:47 +09:00
Henri Verbeet 0706019a07 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:31 +09:00
Henri Verbeet a945266d25 wined3d: Use wined3d_texture_get_pitch() in texture3d_sub_resource_upload_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:28 +09:00
Stefan Dösinger 65c04ce040 wined3d: Introduce wined3d_texture_get_pitch().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:25 +09:00
Henri Verbeet a95524b8f3 wined3d: Use wined3d_format_calculate_pitch() in surface_download_data().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:20 +09:00
Henri Verbeet a0beaa4006 wined3d: Handle slice pitch and alignment as well in wined3d_format_calculate_pitch().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:19 +09:00
Józef Kucia b8387e6909 wined3d: Extend support for typeless formats.
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-02-09 22:10:04 +09:00
Józef Kucia 30da671cf0 wined3d: Add support for WINED3DFMT_R32G32B32A32_SINT 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-02-09 22:10:00 +09:00
Józef Kucia ea6070b93f wined3d: Add support for WINED3DFMT_R32G32B32A32_UINT 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-02-09 22:09:58 +09:00
Józef Kucia ec45c894bc wined3d: Add support for WINED3DFMT_R16_UINT 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-02-09 22:09:55 +09:00
Riccardo Bortolato b278bb8f56 wined3d: Get rid of wined3d_device_get_surface_from_dc().
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:39 +09:00
Henri Verbeet 195d16c826 wined3d: Store custom pitches in the texture instead of the surface.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:33 +09:00
Henri Verbeet 77088e3faa wined3d: Store the "user_memory" pointer in the texture instead of the surface.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:30 +09:00
Henri Verbeet 85ba92c33a wined3d: Get rid of wined3d_device_update_surface().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:27 +09:00
Henri Verbeet f0053d06c4 wined3d: Get rid of wined3d_surface_update_overlay_z_order().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:21 +09:00
Henri Verbeet 02008a6f2e wined3d: Introduce wined3d_texture_update_overlay().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:14 +09:00
Charles Davis 1b27aac1e2 wined3d: Fix transposed lines.
Signed-off-by: Charles Davis <cdavis5x@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 00:37:26 +09:00
Józef Kucia b7dcf112e9 wined3d: Allow to query if surface format supports gamma correction.
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-02-09 00:37:26 +09:00
Józef Kucia e6b7ad8e45 d3d11: Enable sRGB decode.
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-02-09 00:37:25 +09:00
Józef Kucia 1769ea38e6 wined3d: Add support for separate sRGB formats.
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-02-09 00:37:25 +09:00
Józef Kucia 6fa62b2667 wined3d: Move internal format queries to separate 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-02-09 00:37:25 +09:00
Henri Verbeet ea85a1ca59 wined3d: Introduce wined3d_texture_set_overlay_position().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:53 +09:00
Henri Verbeet 6e30b042e1 wined3d: Introduce wined3d_texture_get_overlay_position().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:40 +09:00
Matteo Bruni f088e46dbe d3d11: Implement d3d11_device_CheckMultisampleQualityLevels().
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-02-05 20:35:00 +09:00
Henri Verbeet 48d755f61d wined3d: Make the "icb" field in struct wined3d_shader_instruction const.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:56 +09:00
Henri Verbeet fabd40013c wined3d: Make the "icb" field in struct wined3d_shader_reg_maps const.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:54 +09:00
Henri Verbeet 24b95aaff4 wined3d: Make the "texture" parameter to wined3d_texture_get_sub_resource() const.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:51 +09:00
Henri Verbeet b170952230 ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:49 +09:00
Henri Verbeet 36b38b8a20 wined3d: Introduce a debug function for struct wined3d_box.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:49 +09:00
Henri Verbeet 46317e0cb1 wined3d: Merge cubetexture_init() into texture_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:47 +09:00
Henri Verbeet 6037179f6b ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:44 +09:00
Henri Verbeet 1ff9660323 wined3d: Pass a view to blit_shader.depth_fill().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:39 +09:00
Henri Verbeet ed0b346231 wined3d: Pass a view to blit_shader.color_fill().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:36 +09:00
Józef Kucia 9fff169498 wined3d: Implement SM4 sample_d 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-02-03 21:57:07 +09:00
Józef Kucia e116295dd7 wined3d: Implement SM4 sample_b 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-02-03 21:57:05 +09:00
Józef Kucia a8f13e0aad wined3d: Merge shader_glsl_sample() and shader_glsl_sample_lod().
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-02-03 21:57:02 +09:00
Józef Kucia 233dff7ca3 wined3d: Recognize SM4 sample_c 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-02-03 21:57:00 +09:00
Henri Verbeet 1ac6cfcac4 wined3d: Use wined3d_rendertarget_view_create() in wined3d_device_reset().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:46 +09:00
Henri Verbeet f1898abd9c wined3d: Use wined3d_rendertarget_view_create() in wined3d_device_init_3d().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:44 +09:00
Henri Verbeet 8f1cf93b21 wined3d: Simplify wined3d_rendertarget_view_create_from_sub_resource().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:41 +09:00
Henri Verbeet 44f2589e7c ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:38 +09:00
Henri Verbeet 36187987ed ddraw: Use wined3d_resource_map() in surface_lock().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:32 +09:00
Józef Kucia e379a17a0a wined3d: Recognize SM4 dcl_globalFlags 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-02-02 21:47:57 +09:00
Józef Kucia 3e64e1a564 wined3d: Recognize SM4 dcl_input_siv 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-02-02 21:47:57 +09:00
Józef Kucia f71bd60bcd wined3d: Recognize SM4 dcl_output_siv 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-02-02 21:47:57 +09:00
Józef Kucia d08f7276ad wined3d: Recognize SM4 dcl_input_sgv 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-02-02 21:47:57 +09:00
Józef Kucia 2001412546 wined3d: Recognize SM4 dcl_input_ps_siv 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-02-02 21:47:56 +09:00
Józef Kucia e02f6ebf91 wined3d: Recognize SM4 dcl_input_ps_sgv 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-02-02 21:47:56 +09:00
Józef Kucia 0de89fd1bf wined3d: Recognize SM4 dcl_input 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-02-02 21:47:56 +09:00
Józef Kucia 3013125240 wined3d: Recognize SM4 dcl_input_ps 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-02-02 21:47:56 +09:00
Henri Verbeet 9bdab23bf7 wined3d: Use wined3d_texture_get_dc() in device_load_logo().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:58 +09:00