ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
117,251 Commits 3 Branches 0 Tags 575 MiB
Commit Graph

262 Commits

Author SHA1 Message Date
Józef Kucia 36b9bc946b wined3d: Introduce helper function to reserve memory for arrays. 
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>
 2017-02-28 20:40:02 +01:00
Józef Kucia d867c6aa1e wined3d: Pass structure byte stride to wined3d_buffer_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>
 2017-02-23 20:13:07 +01:00
Henri Verbeet 4aea36184d wined3d: Validate WINED3D_LOCATION_BUFFER on WINED3D_MAP_DISCARD buffer maps. 
Usually when doing a WINED3D_MAP_DISCARD map on a buffer with a buffer object
WINED3D_LOCATION_BUFFER will already be current. However, if the previous map
on that buffer loaded WINED3D_LOCATION_SYSMEM, that's not necessarily true.
This also brings the code further in line with the corresponding code for
textures.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-02-23 08:55:47 +01:00
Sebastian Lackner d3c11f507f wined3d: Remove duplicate assignment of NULL to map_ptr in wined3d_buffer_map. 
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>
 2017-02-17 20:54:05 +01:00
Henri Verbeet 9e2498f25e wined3d: Send sampler GL initialisation through the command stream. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-02-16 08:30:56 +01:00
Henri Verbeet 2641c5c28f wined3d: Pass a texture and sub-resource index to context_acquire(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-02-15 16:16:20 +01:00
Józef Kucia 2249527922 wined3d: Use more suitable bind target for SRV/UAV 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>
 2017-02-08 17:00:09 +01:00
Henri Verbeet 6fd212818d wined3d: Do not preload the buffer in wined3d_buffer_unmap(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-31 19:48:44 +01:00
Henri Verbeet 413ccc82db wined3d: Load WINED3D_LOCATION_BUFFER if needed in wined3d_buffer_map(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-31 19:48:44 +01:00
Henri Verbeet e2dbbec1af wined3d: Implement wined3d_buffer_upload_data() on top of wined3d_buffer_upload_ranges(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-31 19:48:44 +01:00
Henri Verbeet 160ad4570e wined3d: Support WINED3D_LOCATION_BUFFER in wined3d_buffer_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-31 19:48:44 +01:00
Henri Verbeet 15d53761a5 wined3d: Do not pin system memory in wined3d_buffer_load_location(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-31 19:48:44 +01:00
Henri Verbeet ca6014b19a wined3d: Return success in wined3d_buffer_load_location() when the location is already current. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-30 21:38:52 +01:00
Henri Verbeet afb2aa2512 wined3d: Try to avoid stalling on dynamic buffer maps. 
Particularly for applications that use dynamic buffers without
WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-30 21:38:52 +01:00
Henri Verbeet efdb898bef wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map. 
Mostly to avoid making things worse for applications that map dynamic buffers
without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-30 21:38:52 +01:00
Henri Verbeet a5f7aff3bb wined3d: Do not upload data in buffer_create_buffer_object(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-30 21:38:52 +01:00
Henri Verbeet 451e137c1b wined3d: Do not evict the system memory copy in buffer_create_buffer_object(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-30 21:38:52 +01:00
Henri Verbeet b924ccb699 wined3d: Check buffer->map_ptr to determine if the buffer object is mapped. 
Instead of trying to replicate the wined3d_buffer_map() logic in
wined3d_buffer_unmap().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-27 16:31:45 +01:00
Henri Verbeet 7a18b2473f wined3d: Introduce wined3d_buffer_evict_sysmem(). 
For consistency with the texture code.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-27 16:31:45 +01:00
Henri Verbeet 6a70c55615 wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM. 
For consistency with the texture code.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-27 16:31:45 +01:00
Henri Verbeet a11e301566 wined3d: Introduce wined3d_buffer_upload_ranges(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-27 16:31:45 +01:00
Henri Verbeet 602a23a60a wined3d: Just use glBufferSubData() in buffer_direct_upload(). 
It might seem like a good idea to try to use glMapBufferRange() in
buffer_direct_upload(), but it really isn't. The interesting cases for
glMapBufferRange() are GL_MAP_INVALIDATE_BUFFER_BIT or
GL_MAP_UNSYNCHRONIZED_BIT, but the only way for those to be set here
would be for the buffer to be mapped with WINED3D_MAP_DISCARD or
WINED3D_MAP_NOOVERWRITE before the buffer object was created. In that
case the GPU is obviously not using the buffer object, so
glMapBufferRange() doesn't help. On the other hand, if the buffer is
currently in use by the application and neither WINED3D_MAP_DISCARD nor
WINED3D_MAP_NOOVERWRITE is set, glMapBufferRange() would need to wait
for the GPU to finish using the buffer object, while glBufferSubData()
may decide not to.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2017-01-27 16:31:44 +01:00
Józef Kucia 8187817830 wined3d: Add initial support for shader buffer views. 
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>
 2017-01-26 16:57:48 +01:00
Francois Gouget 551705d65f wined3d: Make some functions 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>
 2017-01-09 20:49:10 +01:00
Józef Kucia a02fd72965 wined3d: Use depth/stencil formats for typeless resources only when WINED3DUSAGE_DEPTHSTENCIL is set. 
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-12-12 19:40:33 +01:00
Józef Kucia e2733ed7fb wined3d: Return location from wined3d_buffer_get_memory(). 
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-11-07 16:59:46 +01:00
Józef Kucia 085ae6ed08 wined3d: Use unsynchronized buffer updates only if there has been at least one buffer map. 
Fixes bc019fcbbd. We cannot use
unsynchronized updates when the application haven't called map at all.

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-11-07 16:59:46 +01:00
Józef Kucia c259854a0a wined3d: Avoid unsynchronized buffer update when reloading whole buffer. 
Fixes bc019fcbbd. Previously, we had the
NOSYNC flag instead of the SYNC flag. When the NOSYNC flag was set the
buffer was mapped with GL_MAP_UNSYNCHRONIZED_BIT. Now, when the SYNC
flag is not set the buffer is mapped with GL_MAP_UNSYNCHRONIZED_BIT.

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-11-07 16:59:46 +01:00
Józef Kucia 20b989ef86 wined3d: Mark buffers as used in wined3d_buffer_copy(). 
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-11-03 17:14:05 +01:00
Józef Kucia aa11efc4af wined3d: Get rid of WINED3DFMT_VERTEXDATA. 
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-11-03 17:14:01 +01:00
Józef Kucia 07cfeac3dd wined3d: Use wined3d_vec4 in fixup_transformed_pos(). 
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-11-02 15:23:05 +01:00
Józef Kucia de19ba7c23 wined3d: Invalidate STATE_CONSTANT_BUFFER(*) device state in buffer_destroy_buffer_object() when 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-11-02 15:23:03 +01:00
Józef Kucia 01b8bea329 wined3d: Fix style issues in delete_gl_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-11-02 15:23:01 +01:00
Józef Kucia 20eb55fdef wined3d: Pass context to delete_gl_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-11-02 15:22:59 +01:00
Józef Kucia cc35b6c8b3 wined3d: Invalidate device state based on buffer bind flags when buffer is deleted. 
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-11-02 15:22:57 +01:00
Józef Kucia e3c692151f wined3d: Compute "buffer_type_hint" from buffer bind flags. 
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-11-02 15:22:55 +01:00
Józef Kucia 9fef0c4910 wined3d: Invalidate INDEXBUFFER device state when bound index buffer is unloaded. 
Fixes a regression introduced by commit
e3a8cd20ce.

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-10-31 15:40:54 +01:00
Józef Kucia 61fef3bd1e wined3d: Use buffer_bind() in buffer_conversion_upload(). 
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-10-24 14:02:15 +02:00
Józef Kucia 6454242009 wined3d: Introduce buffer_conversion_upload() helper 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-10-24 14:02:07 +02:00
Józef Kucia 4a23e91462 wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location(). 
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-10-24 14:02:05 +02:00
Józef Kucia 6ced2a8293 wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy(). 
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-10-21 13:37:59 +02:00
Józef Kucia 2e15ae85a1 wined3d: Introduce wined3d_buffer_get_memory(). 
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-10-21 13:37:58 +02:00
Józef Kucia 4e7ef680e3 wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_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-10-21 13:37:58 +02:00
Józef Kucia 8db3b5512e wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem(). 
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-10-21 13:37:58 +02:00
Józef Kucia 3c847a20c1 wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers. 
We now have API that allows invalidating locations for 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-10-21 13:37:58 +02:00
Józef Kucia 645d3cac14 wined3d: Introduce wined3d_buffer_load_location(). 
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-10-21 13:37:58 +02:00
Józef Kucia 171e272f85 wined3d: Introduce wined3d_buffer_prepapre_location(). 
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-10-21 13:37:55 +02:00
Józef Kucia 2a385e420a wined3d: Explicitly track locations for 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-10-19 08:09:50 -07:00
Józef Kucia fc866d88f3 wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem(). 
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-10-19 08:09:48 -07:00
Józef Kucia 5f86ef7b1e wined3d: Rename buffer_internal_preload() to wined3d_buffer_load(). 
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-10-19 08:09:46 -07:00