Henri Verbeet
9c8c391146
wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:44 +09:00
Henri Verbeet
73ba87658c
wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:39 +09:00
Henri Verbeet
076697e31a
wined3d: Rename MAX_CONST_B to WINED3D_MAX_CONSTS_B.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:34 +09:00
Stefan Dösinger
aa475ce23f
wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:17 +09:00
Stefan Dösinger
3a72716556
wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:16 +09:00
Henri Verbeet
abad305c1a
wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode().
...
Emitting the position / attribute 0 provokes the actual vertex emission, so
needs to happen last. This fixes a regression introduced by commit
f3c155cc56
.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:16 +09:00
Henri Verbeet
f69cf783df
wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:16 +09:00
Henri Verbeet
596f707797
wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:15 +09:00
Henri Verbeet
3ae7ab9583
wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:15 +09:00
Henri Verbeet
ba840a4c05
wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:14 +09:00
Henri Verbeet
e71a360fcd
wined3d: Store pixel shader integer constants as wined3d_ivec4 structures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:13 +09:00
Henri Verbeet
43c31e68be
wined3d: Store vertex shader integer constants as wined3d_ivec4 structures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:13 +09:00
Henri Verbeet
4f1acfebf5
wined3d: Rename MAX_CONST_I to WINED3D_MAX_CONSTS_I.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:12 +09:00
Henri Verbeet
25b907697a
wined3d: Only allow 224 pixel shader vec4's.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:12 +09:00
Henri Verbeet
aa5ccba868
wined3d: Only allow 256 vertex shader vec4's.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:11 +09:00
Michael Stefaniuc
f22be3afb1
wined3d: Initialize a RECT to avoid compiler warnings.
...
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-05-17 21:02:27 +09:00
Francois Gouget
08736f5048
wined3d: Make wined3d_texture_set_dirty() 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-05-17 21:01:51 +09:00
Józef Kucia
b922dcc6f1
wined3d: Implement SM4 round_ne 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-05-17 21:01:44 +09:00
Andrey Gusev
05132fa735
wined3d: Fix a typo in FIXME() messages.
...
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-14 14:39:55 +09:00
Michael Stefaniuc
128e6b5975
wined3d: Use IsRectEmpty() 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-05-14 12:12:22 +09:00
Andrey Gusev
ecb5a74b36
wined3d: Fix a typo in checkGLcall.
...
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-14 12:12:05 +09:00
Stefan Dösinger
fdd9a4cb92
wined3d: Use wined3d_texture_prepare_location() in surface_load_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:57 +09:00
Stefan Dösinger
bf8feb8b51
wined3d: Use wined3d_texture_prepare_location() in surface_load_sysmem().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:54 +09:00
Henri Verbeet
1fe83c0d7e
wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:52 +09:00
Henri Verbeet
574e294181
wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:46 +09:00
Henri Verbeet
67ec18ba2c
wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:40 +09:00
Henri Verbeet
d3a3260763
wined3d: Pass wined3d_vec4 structures to wined3d_device_set_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:35 +09:00
Henri Verbeet
e6b647d121
wined3d: Store pixel shader floating point constants as wined3d_vec4 structures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:29 +09:00
Henri Verbeet
b073e5c7b6
wined3d: Store vertex shader floating point constants as wined3d_vec4 structures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:26 +09:00
Sebastian Lackner
ad887d6049
wined3d: Fix a typo in TRACE message.
...
Spotted by Sergey Isakov.
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-04-26 21:35:59 +09:00
Józef Kucia
64da6b0526
wined3d: Implement creating 2D array 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-04-26 21:35:36 +09:00
Józef Kucia
64014ae3ed
wined3d: Add "layer_count" parameter to wined3d_texture_create().
...
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-04-26 21:35:31 +09:00
Stefan Dösinger
02a664c093
wined3d: Use wined3d_texture_prepare_location() in surface_load_ds_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:17 +09:00
Henri Verbeet
6d2f710d66
wined3d: Pas a wined3d_vec4 structure to shader_arb_load_constants_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:15 +09:00
Henri Verbeet
f33c79d387
wined3d: Pass a wined3d_vec4 structure to shader_glsl_load_constants_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:13 +09:00
Henri Verbeet
d7596b08ea
wined3d: Pass a wined3d_vec4 structure to walk_constant_heap().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:11 +09:00
Henri Verbeet
cf3d5a2046
wined3d: Pass a wined3d_vec4 structure to walk_constant_heap_clamped().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:07 +09:00
Henri Verbeet
468b1d9d9b
wined3d: Pass a wined3d_vec4 structure to apply_clamped_constant().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:48:05 +09:00
Henri Verbeet
364701db60
wined3d: Clear the renderbuffer IDs on unload.
...
This got lost in commit feb86895b4
.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 14:47:58 +09:00
Stefan Dösinger
c22c9b401a
wined3d: Use wined3d_texture_prepare_location() in surface_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-25 18:48:17 +09:00
Stefan Dösinger
b6b7e2379e
wined3d: Use wined3d_texture_prepare_location() in surface_depth_blt_fbo().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-25 18:48:17 +09:00
Józef Kucia
0f1729c5f4
wined3d: Handle 2D array textures in context_dump_fbo_attachment().
...
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-04-22 21:19:46 +09:00
Józef Kucia
b5dad41e36
wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage().
...
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-04-22 21:19:44 +09:00
Józef Kucia
4e38c3988e
wined3d: Add few missing enum values to debug_fbostatus().
...
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-04-22 21:19:42 +09:00
Józef Kucia
807c4514d0
wined3d: Accept multiple instruction modifiers in SM4+ 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-04-22 21:19:40 +09:00
Józef Kucia
cb66c6390d
wined3d: Print correct resource type in FIXME() message.
...
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-04-22 21:19:38 +09:00
Alistair Leslie-Hughes
1bb1824e7e
wined3d: Add detection for NVIDIA GTX TITAN Series.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 21:19:29 +09:00
Caron Wills
f52accf86d
wined3d: Add Nvidia GeForce GTX 880M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 21:04:35 +09:00
Stefan Dösinger
aa11dfa8fd
wined3d: Use wined3d_texture_prepare_location() in draw_primitive().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 12:22:47 +09:00
Henri Verbeet
82044bc919
wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt().
...
Note that we return immediately. The textures aren't mapped yet here, so we
shouldn't try to unmap them.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 12:22:37 +09:00
Henri Verbeet
aaca15f172
wined3d: Pass a texture and sub-resource index to wined3d_volume_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 12:22:35 +09:00
Henri Verbeet
17768e567b
wined3d: No longer make sub-resources full resources.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 12:22:33 +09:00
Henri Verbeet
19bb2b1b7e
wined3d: Try harder to print something reasonable in wined3d_debug_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-22 12:22:28 +09:00
Caron Wills
7c18fe17c7
wined3d: Add Nvidia GeForce GTX 870M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 19:03:04 +09:00
Stefan Dösinger
a010a0edd8
wined3d: Use wined3d_texture_prepare_location() in device_clear_render_targets().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 15:34:43 +09:00
Henri Verbeet
81b2ed4f0a
wined3d: Store sub-resource parents in struct wined3d_texture_sub_resource().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 15:34:43 +09:00
Henri Verbeet
58a1796d83
wined3d: Don't enumerate sub-resources in wined3d_device_reset().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 15:34:43 +09:00
Henri Verbeet
3b96ac290d
wined3d: Allocate system memory for complete textures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 14:09:39 +09:00
Henri Verbeet
e6780a5e05
wined3d: Evict system memory for complete textures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 14:09:39 +09:00
Henri Verbeet
2066e1a962
wined3d: Implement surface_modify_ds_location() on top of the regular resource location management.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 14:09:39 +09:00
Henri Verbeet
a077c1f669
wined3d: Avoid wined3d_resource_get_desc() on a surface in surface_convert_format().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 14:09:39 +09:00
Józef Kucia
879d4bffeb
wined3d: Add support for rendering to 2D array 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-04-20 21:50:42 +09:00
Caron Wills
e44e6b2244
wined3d: Add Nvidia GeForce GTX 850M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 21:50:27 +09:00
Kim Malmo
5f4c496480
wined3d: Add Nvidia 9700M GT.
...
Signed-off-by: Kim Malmo <berencamlost@msn.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:51 +09:00
Stefan Dösinger
0dc88185bc
wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:49 +09:00
Henri Verbeet
62a766f75c
wined3d: Use the texture dimensions in swapchain_blit().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:38 +09:00
Henri Verbeet
70f1d0efdc
wined3d: Use the texture dimension helpers in texture2d_prepare_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:36 +09:00
Henri Verbeet
a4fa702488
wined3d: Use the texture dimension helpers in surface_load_ds_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:34 +09:00
Henri Verbeet
2633f9bde3
wined3d: Use the texture dimension helpers in surface_depth_blt().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:32 +09:00
Henri Verbeet
58f309b491
wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:29 +09:00
Henri Verbeet
7be5ccb21e
wined3d: Use the texture dimension helpers in surface_set_compatible_renderbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-20 14:02:27 +09:00
Józef Kucia
cffe58c75d
wined3d: Merge codepaths in surface_download_data().
...
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-04-19 21:25:55 +09:00
Józef Kucia
7eac961454
wined3d: Create dummy 2D array 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-04-19 21:25:53 +09:00
Józef Kucia
8d8e374e96
wined3d: Add EXT_texture_array extension.
...
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-04-19 21:25:51 +09:00
Caron Wills
43da2217a2
wined3d: Add Nvidia GeForce 845M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 21:25:46 +09:00
Stefan Dösinger
1462f66d5d
wined3d: Merge wined3d_surface_prepare() and wined3d_volume_prepare_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:17 +09:00
Henri Verbeet
f519aca8b3
wined3d: Reject sub-resource types in wined3d_check_device_format().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:14 +09:00
Henri Verbeet
e5a7d5465b
wined3d: Properly check for 3D/volume textures in wined3d_device_update_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:09 +09:00
Henri Verbeet
9cdcc3e120
wined3d: Merge surface_unload() and volume_unload().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:07 +09:00
Henri Verbeet
16ff4e7cf6
wined3d: Track the map binding per-texture.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:05 +09:00
Henri Verbeet
feb86895b4
wined3d: Store renderbuffer IDs in struct wined3d_texture.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:02 +09:00
Stefan Dösinger
d3f8efe546
wined3d: Get rid of WINED3D_BUFFER_FLUSH.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:27 +09:00
Henri Verbeet
fe0342e646
wined3d: Use the texture dimension helpers in surface_download_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:25 +09:00
Henri Verbeet
2f386e7e49
wined3d: Use the texture dimension helpers in draw_textured_quad().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:23 +09:00
Henri Verbeet
38d35c29ce
wined3d: Use the texture dimension helpers in surface_get_drawable_size().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:21 +09:00
Henri Verbeet
cb127e7145
wined3d: Use the texture dimension helpers in device_clear_render_targets().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:19 +09:00
Henri Verbeet
e7031197a1
wined3d: Use the texture dimension helpers in context_find_fbo_entry().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:16 +09:00
Caron Wills
f8d6eee32a
wined3d: Add Nvidia GeForce 840M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:04:50 +09:00
Caron Wills
e184b81ce2
wined3d: Add Nvidia GeForce 830M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 21:57:08 +09:00
Stefan Dösinger
aad6fb4a42
wined3d: Explicitly pass a wined3d_state structure to context_apply_draw_state().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:44 +09:00
Henri Verbeet
5eedb704f1
wined3d: Check texture usage/pool in volumetexture_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:40 +09:00
Henri Verbeet
ecee205f6c
wined3d: Check texture usage/pool/flags in texture_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:37 +09:00
Henri Verbeet
4896cda6c5
wined3d: Track SFLAG_DISCARD per-texture.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:32 +09:00
Henri Verbeet
82a7f1ebf2
wined3d: Implement texture DC creation on top of D3DKMTCreateDCFromMemory().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:25 +09:00
Henri Verbeet
b08c430c51
wined3d: Introduce a helper function to map a wined3d_bo_address.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:18 +09:00
Józef Kucia
d276a28585
wined3d: Add shader limits for SM 4.1.
...
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-04-15 01:14:24 +09:00
Stefan Dösinger
a3401dfaf2
wined3d: Explicitly pass a wined3d_state structure to draw_primitive().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:47 +09:00
Henri Verbeet
c9d82ffa43
wined3d: Use the texture dimension helpers in arbfp_blit_set().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:46 +09:00
Henri Verbeet
1e0603eb58
wined3d: Store the power-of-two dimensions in the texture.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:43 +09:00
Henri Verbeet
fca93ef017
wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:41 +09:00
Henri Verbeet
64767de277
wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:39 +09:00
Henri Verbeet
d7e051902d
wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-14 13:13:37 +09:00
Henri Verbeet
9e763ab92b
wined3d: Be more strict with wined3d_texture_get_dc() calls from d3d9.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:06 +09:00
Henri Verbeet
c3d74913b7
wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:06 +09:00
Henri Verbeet
0be7f5deb1
wined3d: Use the texture dimension helpers in wined3d_texture_update_overlay().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:36 +09:00
Henri Verbeet
044b330ae1
wined3d: Use the texture dimension helpers in texture3d_prepare_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:34 +09:00
Henri Verbeet
3a06ade1c4
wined3d: Use the texture dimension helpers in wined3d_surface_blt().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:32 +09:00
Henri Verbeet
8c30612d99
wined3d: Use the texture dimension helpers in surface_load_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:29 +09:00
Henri Verbeet
c4f7bdcfdd
wined3d: Use the texture dimension helpers in surface_load_renderbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:27 +09:00
Francois Gouget
1c201a96c5
wined3d: Fix a typo in an error message.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-11 23:52:45 +09:00
Stefan Dösinger
e55754bf74
wined3d: Discard default pool surfaces on unload.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-11 11:36:15 +09:00
Henri Verbeet
2a2554ee59
wined3d: Store sub-resource map counts in the sub-resource structure.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-11 11:36:04 +09:00
Henri Verbeet
bcb1ee8244
wined3d: Don't evict mapped resources in wined3d_device_evict_managed_resources().
...
We would skip evicting the specific mapped sub-resource, but then go on
to evict the texture itself.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-11 11:35:59 +09:00
Stefan Dösinger
b284f13836
wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:37 +09:00
Henri Verbeet
11db4d4a1d
wined3d: Use the texture dimension helpers in surface_load_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:35 +09:00
Henri Verbeet
7c9ff85452
wined3d: Use the texture dimension helpers in surface_load_ds_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:33 +09:00
Henri Verbeet
8c3b0aead5
wined3d: Use the texture dimension helpers in surface_blt_special().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:30 +09:00
Henri Verbeet
35fdf09643
wined3d: Use the texture dimension helpers in surface_translate_drawable_coords().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:28 +09:00
Henri Verbeet
81dae1c636
wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-08 12:29:24 +09:00
Stefan Dösinger
7d23c8a4d8
wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:39 +09:00
Henri Verbeet
d85706381c
wined3d: Merge drawStridedFast() and drawStridedInstanced().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:36 +09:00
Henri Verbeet
f3c155cc56
wined3d: Merge drawStridedSlow() and drawStridedSlowVs().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:34 +09:00
Henri Verbeet
eeac4013cd
wined3d: Use struct wined3d_ffp_attrib_ops for generic attributes as well.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:31 +09:00
Henri Verbeet
e686b5a62f
wined3d: Explicitly pass a wined3d_state structure to context_apply_clear_state().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:29 +09:00
Henri Verbeet
668fd0b194
wined3d: Recognise Intel Ivybridge on MacOS.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:26 +09:00
Caron Wills
9ecc547c6a
wined3d: Add Nvidia GeForce 820M.
...
Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-07 12:57:20 +09:00
Henri Verbeet
e510212626
wined3d: Use the texture dimension helpers in fb_copy_to_texture_direct().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-06 12:50:18 +09:00
Henri Verbeet
f05febcb14
wined3d: Use the texture dimension helpers in surface_load_fb_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-06 12:50:16 +09:00
Henri Verbeet
d5dd78a4ba
wined3d: Use the texture dimension helpers in read_from_framebuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-06 12:50:14 +09:00
Henri Verbeet
4ef9f113c9
wined3d: Use the texture dimension helpers in surface_upload_from_surface().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-06 12:50:12 +09:00
Henri Verbeet
7d3f493d55
wined3d: Use the texture dimension helpers in surface_download_data().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-06 12:50:09 +09:00
Henri Verbeet
639dd9b9e3
wined3d: Return a wined3d_texture_sub_resource structure from wined3d_texture_get_sub_resource().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-05 12:52:33 +09:00
Henri Verbeet
4f3648705e
wined3d: Avoid surface_from_resource() in surface_load_ds_location().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-05 12:52:29 +09:00
Henri Verbeet
e6e89dbc65
wined3d: Avoid surface_from_resource() in swapchain_gdi_present().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-05 12:52:24 +09:00
Henri Verbeet
6b8fb1c22e
wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-05 12:52:19 +09:00
Henri Verbeet
425e84dac5
wined3d: Try harder to create a converted surface in surface_convert_format().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-05 12:52:15 +09:00
Józef Kucia
e8e27b1a25
wined3d: Implement SM4 ult 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-04-05 00:06:44 +09:00
Józef Kucia
992f3add3a
wined3d: Recognize SM5 hs_join_phase 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-04-05 00:06:43 +09:00
Józef Kucia
231f9188bf
wined3d: Recognize SM5 hs_control_point_phase 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-04-05 00:06:43 +09:00
Józef Kucia
90ce5e24f7
wined3d: Recognize SM5 vpc register.
...
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-04-05 00:06:43 +09:00
Józef Kucia
63d0392491
wined3d: Recognize SM5 vOutputControlPointID register.
...
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-04-05 00:06:43 +09:00
Józef Kucia
a6c0139e9d
wined3d: Recognize SM5 vicp register.
...
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-04-05 00:06:43 +09:00
Józef Kucia
ddc7ea39ad
wined3d: Recognize SM5 vDomainLocation register.
...
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-04-05 00:06:43 +09:00
Józef Kucia
a5b810b0b3
wined3d: Print "state_id" for undefined states.
...
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-04-05 00:06:42 +09:00
Józef Kucia
ab3aaee6fd
wined3d: Print FIXME() for unknown SM4+ register types.
...
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-04-05 00:06:42 +09:00
Alistair Leslie-Hughes
20478d9182
wined3d: Add detection for NVIDIA GTX TITAN.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-04 13:13:09 +09:00
Jarkko Korpi
ea4f91c7ea
wined3d: Add detection for NVIDIA GeForce 425M.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-04 13:13:05 +09:00
Stefan Dösinger
7f9798de91
wined3d: Remove the dead wined3d_volume_invalidate_location declaration.
...
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-04-04 13:13:01 +09:00
Henri Verbeet
29421729ef
wined3d: Use the texture dimension helpers in surface_is_full_rect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-04 13:12:55 +09:00
Henri Verbeet
d496fbc1e4
wined3d: Use the texture dimension helpers in surface_create_dib_section().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-04 13:12:53 +09:00