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

1681 Commits

Author SHA1 Message Date
Józef Kucia 5fc64a3057 wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported(). 
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>
 2019-02-12 23:02:28 +01:00
Józef Kucia e37b9c74f0 wined3d: Avoid potential out-of-bounds memory access in surface_cpu_blt_colour_fill(). 
Draw rects are derived from the current viewport. It is possible to produce a
clear operation with a draw rect which lies completely outside of one of render
targets in D3D9.

It seems that we never use the CPU blitter for D3D9 render target clears, so it
might not be a problem in practice.

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>
 2019-01-17 16:14:05 +01:00
Józef Kucia 8a2583c7d9 wined3d: Limit surface_cpu_blt_colour_fill() to dimensions of render target 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>
 2019-01-10 12:33:09 -06:00
Józef Kucia 0530f33cc1 wined3d: Split clears for different size resources in ffp_blitter_clear(). 
We cannot reliably clear attachments of different sizes using a single glClear()
command. The OpenGL spec says:

  "If the attachment sizes are not all identical, the results of rendering are
  defined only within the largest area that can fit in all of the attachments.
  This area is defined as the intersection of rectangles having a lower left of
  (0, 0) and an upper right of (width, height) for each attachment. Contents of
  attachments outside this area are undefined after execution of a rendering
  command (as defined in section 2.4)."

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067
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>
 2019-01-10 12:33:03 -06:00
Józef Kucia cd3c3e56b1 wined3d: Use accurate rt_count in ffp_blitter_clear(). 
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>
 2019-01-10 12:32:58 -06:00
Henri Verbeet 926c554d94 wined3d: Get rid of the redundant WINED3D_TEXTURE_CREATE_MAPPABLE flag in surface_convert_format(). 
We already set WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-23 20:17:44 +01:00
Paul Gofman 4aecfe2e05 wined3d: Don't pull _ACCESS_GPU textures to system memory in texture2d_blt(). 
The change introduced by commit 54a9e84952 had
side effect of ultimately selecting detsination texture location as
dst_texture->resource.map_binding, which is not the case in the default texture2d_blt()
code path.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46068
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-20 16:26:09 +01:00
Henri Verbeet 21f44e8fa6 wined3d: Prefer bind flags over usage flags in texture2d_load_sysmem(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-02 15:18:02 +01:00
Henri Verbeet eed05ad890 wined3d: Prefer bind flags over usage flags in texture2d_load_drawable(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-02 15:18:02 +01:00
Henri Verbeet 49af0e73f7 wined3d: Prefer bind flags over usage flags in texture2d_load_texture(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-02 15:18:02 +01:00
Henri Verbeet 43e7568666 wined3d: Prefer bind flags over usage flags in texture2d_load_renderbuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-02 15:18:02 +01:00
Henri Verbeet 58b681e920 wined3d: Prefer bind flags over usage flags in ffp_blitter_clear(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-02 15:18:02 +01:00
Henri Verbeet ae0f03bac5 wined3d: Prefer bind flags over usage flags in ffp_blit_supported(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-01 09:17:02 +01:00
Henri Verbeet 12d7bd5607 wined3d: Prefer bind flags over usage flags in fbo_blitter_supported(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-01 09:17:01 +01:00
Henri Verbeet 7d83ebeed2 wined3d: Pass bind flags to wined3d_get_format(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-31 16:17:36 +01:00
Henri Verbeet 7cba915710 wined3d: Pass correct bind flags to texture creation functions. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-31 16:17:36 +01:00
Henri Verbeet 961a94ac04 wined3d: Move the "target" field from struct wined3d_texture to struct wined3d_texture_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-30 10:53:59 +01:00
Henri Verbeet 5f9740762a wined3d: Move the OpenGL textures from struct wined3d_texture to struct wined3d_texture_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-30 10:53:55 +01:00
Henri Verbeet c130a028fc wined3d: Don't bother trying to blit from discarded textures. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-29 10:11:32 +01:00
Andrew Wesie 54a9e84952 wined3d: Add fast-path for texture download blit. 
Signed-off-by: Andrew Wesie <awesie@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-04 09:10:20 -05:00
Andrew Wesie 843ccd2d5b wined3d: Unify the texture download functions. 
Signed-off-by: Andrew Wesie <awesie@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-03 16:25:33 -05:00
Henri Verbeet 1606dd39e2 wined3d: Move the OpenGL texture format to struct wined3d_format_gl. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-24 10:24:31 +02:00
Andrew Wesie c3af72019e wined3d: Use raw blit for supported depth-stencil blits. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45747
Signed-off-by: Andrew Wesie <awesie@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-03 19:43:48 +02:00
Józef Kucia 9320424105 wined3d: Pass wined3d_adapter to wined3d_get_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>
 2018-08-23 20:12:29 +02:00
Józef Kucia bdc0a99012 wined3d: Add fall through comment in texture2d_blt_fbo() (Coverity). 
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>
 2018-08-16 12:45:11 +02:00
Józef Kucia ec04b2e382 wined3d: Reduce nesting in texture2d_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>
 2018-06-20 16:02:38 +02:00
Matteo Bruni 38ed82edab wined3d: Use staging resources to blit from CPU resources in the fixed-function blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-30 10:40:14 +02:00
Józef Kucia 16517e4eea wined3d: Implement copying for 1D textures. 
1D textures are handled by raw and CPU blitter.

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>
 2018-04-27 16:33:28 +02:00
Matteo Bruni 29d506939e wined3d: Use staging resources to blit from CPU resources in the GLSL blitter. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-16 21:38:15 +02:00
Matteo Bruni 9100fce2ba wined3d: Move draw_textured_quad() to context.c. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-12 14:13:58 +02:00
Henri Verbeet 7155c451a5 wined3d: Invalidate the texture's U/V address modes in draw_textured_quad(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-12 14:13:54 +02:00
Henri Verbeet e2a0a939ba wined3d: Select the correct texture level in draw_textured_quad(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-12 14:13:52 +02:00
Henri Verbeet d06740bde7 wined3d: Get rid of the "tex_type" field from struct blt_info. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-10 12:22:20 +02:00
Henri Verbeet acb18ea3b6 wined3d: Get rid of the "binding" field from struct blt_info. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-04-10 12:22:18 +02:00
Henri Verbeet 267a154be7 wined3d: Add some traces to fbo_blitter_blit(). 
For easier debugging.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-30 16:52:05 +02:00
Henri Verbeet f93691dca2 wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm(). 
Perhaps this made sense when we still pretended to support P8 textures, but
currently this should never get used, and certainly not in the colour-keying
path.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-30 16:52:05 +02:00
Józef Kucia 81459fb8a2 wined3d: Remove swap interval from swapchain description. 
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>
 2018-03-22 18:14:55 +01:00
Józef Kucia 6aeb444e4c wined3d: Implement updating swap interval through wined3d_swapchain_present(). 
Based on a patch by Michael Müller.

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>
 2018-03-22 18:14:52 +01:00
Henri Verbeet 70f017ac4d wined3d: Get rid of the "StrictDrawOrdering" setting. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-22 11:41:50 +01:00
Henri Verbeet af47c9406b wined3d: Handle upload conversion in texture2d_upload_data(). 
For consistency with texture3d_upload_data().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-21 10:40:12 +01:00
Henri Verbeet faf4559a76 wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture(). 
We don't use PBOs for those in the first place.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-21 10:40:10 +01:00
Henri Verbeet a9cf391bed wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-20 12:59:02 +01:00
Henri Verbeet d4b0249c48 wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-19 12:09:39 +01:00
Henri Verbeet 89cd64bcb7 wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data(). 
For consistency with wined3d_texture_upload_data().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-19 12:09:37 +01:00
Henri Verbeet f4f20e48cf wined3d: Pass a texture to context_surface_update(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-14 15:27:59 +01:00
Matteo Bruni c0e49b0e2c wined3d: Do not apply fixed-function state in context_apply_blit_state(). 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-13 20:35:26 +01:00
Henri Verbeet 991b1b77c8 wined3d: Pass a texture and sub-resource index to wined3d_surface_blt(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-13 13:28:27 +01:00
Henri Verbeet 70a68144c1 wined3d: Pass a texture and sub-resource index to wined3d_blitter_ops.blitter_blit(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-13 13:28:23 +01:00
Matteo Bruni 23b4b3cd4c wined3d: Pass a wined3d_context structure to texture2d_depth_blt_fbo(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-12 17:58:07 +01:00
Henri Verbeet 9a00e032b7 wined3d: Pass a texture and sub-resource index to context_apply_fbo_state_blit(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-03-12 17:58:02 +01:00