system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
110831 commits 3 branches 785 tags 324 MiB
Commit graph

7179 commits

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