ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
113,521 Commits 3 Branches 0 Tags
Commit Graph

1473 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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