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

1473 Commits

Author SHA1 Message Date
Henri Verbeet b170952230 ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-05 13:52:49 +09:00
Henri Verbeet 36b38b8a20 wined3d: Introduce a debug function for struct wined3d_box. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-04 14:41:49 +09:00
Henri Verbeet 1ff9660323 wined3d: Pass a view to blit_shader.depth_fill(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-04 14:41:39 +09:00
Henri Verbeet ed0b346231 wined3d: Pass a view to blit_shader.color_fill(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-04 14:41:36 +09:00
Henri Verbeet 44f2589e7c ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-03 21:56:38 +09:00
Henri Verbeet 36187987ed ddraw: Use wined3d_resource_map() in surface_lock(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-03 21:56:32 +09:00
Henri Verbeet 9bdab23bf7 wined3d: Use wined3d_texture_get_dc() in device_load_logo(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-02 14:38:58 +09:00
Henri Verbeet 7e57924d32 ddraw: Use wined3d_texture_release_dc() in ddraw_surface7_ReleaseDC(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-02 14:38:55 +09:00
Henri Verbeet 83a147d98a ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-02 14:38:45 +09:00
Henri Verbeet 59116f833e ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad(). 
This is safe because D3D is always initialized in D3D device methods.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-01 17:53:38 +09:00
Henri Verbeet f7e9604c3e ddraw: Use wined3d_texture_blt() in copy_mipmap_chain(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-01 17:53:37 +09:00
Henri Verbeet 257ee8cc6e ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-02-01 17:53:36 +09:00
Riccardo Bortolato a96abff808 wined3d: Get rid of the surface refcounting functions. 
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-01-29 21:25:16 +09:00
Matteo Bruni 99bcae0229 wined3d: Fail texture creation when invalid multisample settings are specified. 
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-01-29 00:42:26 +09:00
Matteo Bruni b1429f931e wined3d: Add a real implementation of wined3d_check_device_multisample_type(). 
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-01-29 00:42:25 +09:00
Henri Verbeet 7afeec4bf2 wined3d: Require non-NULL rectangles in wined3d_surface_blt(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-28 13:43:58 +09:00
Matteo Bruni a25c47f59a wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. 
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-01-27 23:35:32 +09:00
Henri Verbeet ad11f38db9 wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-27 12:38:54 +09:00
Henri Verbeet dafaae7730 wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-27 12:38:46 +09:00
Stefan Dösinger 48575df7cb wined3d: Block validation checks the surface size too. 
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-01-19 00:10:42 +09:00
Stefan Dösinger 638f6c1ac8 wined3d: Prepare GL textures in surface_load_ds_location. 
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-01-19 00:10:36 +09:00
Henri Verbeet 4287054943 wined3d: Get rid of GL_APPLE_client_storage support. 
Once upon a time this extention helped reduce address space usage on MacOS,
although at the cost of obscure driver bugs. These days it just seems to make
things worse.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-05 15:45:26 +01:00
Stefan Dösinger 080dedaf6e wined3d: Restore WINEDDBLT_ALPHATEST support. 
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>
 2015-12-12 05:27:02 +01:00
Henri Verbeet 1ebb42ca53 ddraw: Mark surfaces as lost when the device window is deactivated. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-04 21:56:19 +09:00
Stefan Dösinger 369956a6fd wined3d: Discard depth stencils on unload. 
Doing so is equivalent of setting WINED3D_LOCATION_DISCARDED when
creating new depth stencil surfaces. It will only happen on the implicit
depth stencil.

Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-23 23:35:20 +09:00
Stefan Dösinger 61ad9284d0 wined3d: Support loading renderbuffers in surface_load_location. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-23 23:35:20 +09:00
Francois Gouget cb2f6fbfe5 wined3d: Make surface_prepare_rb() 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>
 2015-11-19 00:21:53 +09:00
Hugh McMaster 11669fa5e2 Assorted spelling and grammar fixes. 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-17 22:56:40 +09:00
Józef Kucia 3f2fa96b98 wined3d: Set slice pitch in wined3d_map_desc to surface size. 
This behavior mimics D3D11 runtime.

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>
 2015-11-04 14:41:37 +09:00
Józef Kucia 7b9d06b494 wined3d: Introduce wined3d_resource_unmap(). 
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>
 2015-11-04 14:41:37 +09:00
Józef Kucia 535b3fe029 wined3d: Introduce wined3d_resource_map(). 
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>
 2015-11-04 14:41:37 +09:00
Stefan Dösinger 1ca9dfc8ee wined3d: Prepare GL resources before calling context_apply_fbo_state. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-29 21:20:24 +09:00
Riccardo Bortolato 3b02ae89a8 d3d9: Replace wined3d_surface_get_render_target_data with wined3d_texture_blt in d3d9_device_GetRenderTargetData. 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-23 19:19:17 +09:00
Matteo Bruni b2e1b5968c wined3d: Allow FBO blits for depth formats with swizzle fixups. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-22 17:32:07 +09:00
Matteo Bruni 41bf97e58a wined3d: Set GL_DEPTH_TEXTURE_MODE_ARB to GL_INTENSITY. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-21 22:41:55 +09:00
Stefan Dösinger 973de3f59c wined3d: Pass a context to surface_load_location. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-16 19:56:42 +09:00
Stefan Dösinger 14f024048b wined3d: Pass a context to surface_load_fb_texture. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-16 19:56:39 +09:00
Stefan Dösinger 31e0755ea6 wined3d: Pass a context to surface_load_texture. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-16 19:56:36 +09:00
Stefan Dösinger c7eb6a7534 wined3d: Pass a context to surface_multisample_resolve. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-16 19:56:33 +09:00
Stefan Dösinger 8b149890ac wined3d: Pass a context to surface_blt_fbo. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-15 23:15:09 +09:00
Stefan Dösinger 84933d60a3 wined3d: Pass a context to surface_load_drawable. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-15 23:15:06 +09:00
Stefan Dösinger 7af0ede8fe wined3d: Pass a context to surface_blt_to_drawable. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-15 23:15:03 +09:00
Stefan Dösinger b28511f73b wined3d: Pass a context to read_from_framebuffer. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-15 23:14:51 +09:00
Stefan Dösinger a385c9ea3e wined3d: Pass a context to surface_load_sysmem. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-13 22:23:46 +09:00
Riccardo Bortolato 9c00f968d6 d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect. 
Pass wined3d_texture and sub_resource idx to device_parent_surface_created callback.
Store wined3d_texture and sub_resource in d3d8_surface.
Also updated d3d9, d3d11, ddraw callbacks accordingly.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-12 23:34:56 +09:00
Riccardo Bortolato 1d1487105d wined3d: Pass a wined3d_box to wined3d_surface_map.. 
Introduced a new surface_check_block_align function that accepts a
wined3d_box, eventually the old _rect version will be completely
replaced.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
 2015-10-07 21:28:51 +09:00
Andrey Gusev 3c8635c8d7 wined3d: TRACE fixes. 2015-10-01 00:00:46 +09:00
Riccardo Bortolato 825b141e5a wined3d: Remove wined3d_surface_get_flip_status stub. 2015-09-10 20:00:52 +09:00
Riccardo Bortolato e869ef5c0f wined3d: Remove wined3d_surface_get_blt_status stub. 2015-09-10 20:00:46 +09:00
Stefan Dösinger ebd6bf7f7a wined3d: Remove old surface flipping hacks. 
They're non-functional these days anyway.
 2015-09-08 21:59:16 +09:00
Henri Verbeet 2773b27bb1 wined3d: Use unsigned mask constants in shifts. 2015-08-26 23:53:22 +09:00
Henri Verbeet 9f530b579e wined3d: Get rid of some powf() calls. 2015-08-26 23:53:22 +09:00
Stefan Dösinger b471b217b2 wined3d: Handle multisample_quality if type == MULTISAMPLE_NON_MASKABLE. 2015-08-25 21:08:41 +09:00
Henri Verbeet b4b2a29dec wined3d: Use surface_get_rect() in wined3d_surface_update_overlay(). 2015-06-15 22:10:35 +09:00
Stefan Dösinger e8ec01ad51 wined3d: Use renderbuffers if the resource type is RB. 2015-06-09 22:09:57 +09:00
Nikolay Sivov 68fcf9d7cf wined3d: dst_surface can't be NULL at this point (Coverity). 2015-06-08 18:51:54 +09:00
Stefan Dösinger c8d1a70804 wined3d: Set the gl resource type in resource_init. 2015-06-08 18:51:24 +09:00
Stefan Dösinger ec25ca7832 wined3d: Read format flags from the surface container. 2015-06-08 18:51:21 +09:00
Marcus Meissner d8a0f77c2b wined3d: Remove superflous check (Coverity). 2015-05-06 18:14:44 +09:00
Stefan Dösinger 3c0ed9ce0a wined3d: Introduce resource-type specific format flags. 2015-04-24 19:08:35 +09:00
Stefan Dösinger 9076612e2d wined3d: Shadow format flags in the resource. 2015-04-22 23:24:41 +09:00
Henri Verbeet 8b6cddbe25 wined3d: Get rid of context_invalidate_active_texture(). 
Calling wined3d_texture_bind() + context_invalidate_active_texture() is
equivalent to just calling wined3d_texture_bind_and_dirtify().
 2015-04-16 20:44:43 +09:00
Stefan Dösinger 27209c69a9 wined3d: Call arbfp_blit_surface and ffp_blit_blit_surface through the blit interfaces. 2015-04-15 22:21:58 +09:00
Stefan Dösinger 6b455e74a0 wined3d: Move fixed function draw blits out of surface_blt_special. 2015-04-15 22:21:58 +09:00
Stefan Dösinger f4b6874491 wined3d: Match blitter and fragment processing color keying capabilities. 
This is necessary if e.g. the nvts or ffp fragment processing pipeline
is selected for debugging purposes on a GPU that otherwise supports the
ARB program blitter.
 2015-04-10 21:43:51 +09:00
Stefan Dösinger 2d56694445 wined3d: Implement color keying in arbfp_blit. 2015-04-10 21:43:12 +09:00
Stefan Dösinger 82db5954c4 wined3d: Set color keys through the command stream. 2015-04-10 21:42:41 +09:00
Stefan Dösinger fa0a9232e0 wined3d: Move surface_convert_color_to_float to utils.c. 2015-04-07 23:10:30 +09:00
Stefan Dösinger 844c4efb47 wined3d: Give tex_type and its values a better name. 2015-04-03 00:33:28 +09:00
Stefan Dösinger df829de88d ddraw: Handle DDBLT_ROP in ddraw. 2015-03-18 21:03:22 +09:00
Matteo Bruni 8ed9c2a11b wined3d: Add a couple checkGLcall() in surface_prepare_rb(). 2015-03-02 13:47:56 +09:00
Matteo Bruni 78ae4f66d7 wined3d: Set GL_UNPACK_ALIGNMENT to 1. 
Alignment should be taken care by the surface pitch and
GL_UNPACK_ROW_LENGTH alone just fine, as long as the pitch is a
multiple of the pixel size. Client APIs respect that,
internally we need to do the same and the changes to
surface_load_texture and wined3d_volume_upload_data are there
for this reason (e.g. WINED3DFMT_R16G16_SNORM is emulated with
GL_RGB16 when NV_texture_shader isn't supported).
 2015-02-20 22:53:09 +09:00
Matteo Bruni d56c168da1 wined3d: Set the surface pitch for user-memory surfaces. 2015-02-19 17:51:36 +09:00
Stefan Dösinger 52ab9e382e wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions. 
The idea is to make it clear that wined3d_texture_load is responsible
for checking the color key for changes. Once we can do color keying in
the shader we also have one place where we can disable the surface
conversion.
 2015-02-18 22:02:39 +09:00
Stefan Dösinger e53d22b0c0 wined3d: Manage color key changes in the texture. 
This fixes a regression with color keyed mipmaps that was introduced by
ee8a5b7dd1. surface_load for level n+1
would call texture_force_reload, thus removing level n from the GL
texture.
 2015-02-18 22:02:33 +09:00
Matteo Bruni ac3df5e1f1 wined3d: Use the proper pitch in read_from_framebuffer(). 
This function is only used in the non-default "backbuffer" ORM.
 2015-02-11 22:21:36 +09:00
Matteo Bruni b875a4a44a wined3d: Use GL_CLAMP_TO_EDGE instead of GL_CLAMP. 
GL_CLAMP was removed from core profile and probably GL_CLAMP_TO_EDGE was
intended to be used here anyway.
 2015-02-10 16:21:55 +09:00
Stefan Dösinger 3d49060fdf wined3d: Fix the color keyed P8 alpha ref value. 2015-02-04 23:14:59 +09:00
Matteo Bruni 6bb32e47ff wined3d: Use the core gl*CompressedTex* functions. 2015-01-20 16:08:54 +01:00
Henri Verbeet ca06f960ed wined3d: Use the same flags for wined3d_texture_set_color_key() and the "color_key_flags" field it sets. 
This fixes a regression introduced by commit a8ab569415.
 2015-01-19 14:31:51 +01:00
Henri Verbeet 5231113fc7 wined3d: Replace wined3d_texture_apply_state_changes() with wined3d_texture_apply_sampler_desc(). 2015-01-15 17:24:38 +01:00
Henri Verbeet 86e99abb12 wined3d: Store a struct wined3d_sampler_desc in struct gl_texture. 
Instead of a enum wined3d_texture_state array.
 2015-01-15 17:24:35 +01:00
Matteo Bruni 79a0dece8b wined3d: Use the core version of the gl*Buffer* functions. 2015-01-15 11:44:20 +01:00
Henri Verbeet ea534c9ab4 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). 2015-01-05 20:15:35 +01:00
Stefan Dösinger aad1997dff wined3d: Remove texture locations after downloading all subresources. 2014-10-23 18:48:25 +09:00
Henri Verbeet 1800712298 wined3d: Track texture coordinate normalization per-texture. 2014-10-09 17:36:21 +02:00
Henri Verbeet c5459881a3 wined3d: Track SFLAG_DYNLOCK per-texture. 2014-10-09 17:36:21 +02:00
Henri Verbeet d6a511e022 wined3d: Track system memory pinning per-texture. 2014-10-09 17:36:21 +02:00
Henri Verbeet 710694d9ca wined3d: Track format conversion per-texture. 2014-10-08 13:13:37 +02:00
Henri Verbeet ee8a5b7dd1 wined3d: Track texture allocation per-texture. 2014-10-08 13:13:37 +02:00
Henri Verbeet 0c0a2adc71 wined3d: Handle GL texture allocation in the texture code. 2014-10-08 13:13:37 +02:00
Henri Verbeet 77646173a0 wined3d: Move the color key conversion helpers to util.c. 2014-10-08 13:13:37 +02:00
Henri Verbeet bd1afdb3c3 wined3d: Get rid of surface_prepare_texture_internal(). 2014-10-07 20:22:07 +02:00
Henri Verbeet 6da1cff518 wined3d: Get rid of d3dfmt_convert_surface(). 2014-10-07 20:22:06 +02:00
Henri Verbeet 71b59afe03 wined3d: Return the destination format from d3dfmt_get_conv(). 2014-10-07 20:22:05 +02:00
Henri Verbeet fd342cce3e wined3d: Don't check for color-keying for WINED3D_CT_P8. 
We don't support p8 color keying either way.
 2014-10-06 17:35:17 +02:00
Henri Verbeet c5bf229287 wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv(). 2014-10-06 17:35:15 +02:00
Henri Verbeet dffcc36dd4 wined3d: Don't abuse conv_byte_count for color-key conversions. 2014-10-06 17:35:12 +02:00
Henri Verbeet b0ce89d810 wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv(). 
Using glGammaInternal or rtInternal should do the right thing in principle,
although in practice they should never get used either way.
 2014-10-06 17:35:10 +02:00
Henri Verbeet 7d42d9ea91 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8. 2014-10-03 09:22:52 +02:00
Henri Verbeet dabe5b4479 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8. 2014-10-03 09:22:49 +02:00
Henri Verbeet 548978dec4 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8. 2014-10-03 09:22:45 +02:00
Henri Verbeet dabb07aea6 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1. 2014-10-02 16:58:27 +02:00
Henri Verbeet e377ad45fa wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5. 2014-10-02 16:58:25 +02:00
Henri Verbeet e10a46c300 wined3d: Introduce a separate function for WINED3D_CT_P8. 2014-10-02 16:58:23 +02:00
Henri Verbeet 5802f72adf wined3d: Just store the wined3d format in color_key_info[]. 2014-10-02 16:58:21 +02:00
Henri Verbeet 2c7be38bb4 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8. 2014-10-02 16:58:19 +02:00
Henri Verbeet 7579a96ac1 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8. 2014-10-01 10:35:56 +02:00
Henri Verbeet 02b031e61a wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5. 2014-10-01 10:35:54 +02:00
Henri Verbeet 6f8cb77ea9 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8. 2014-10-01 10:35:52 +02:00
Henri Verbeet 632d2fca6e wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case. 2014-10-01 10:35:50 +02:00
Henri Verbeet c5d917777a wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface(). 
This is never used.
 2014-10-01 10:35:47 +02:00
Henri Verbeet 90e3312c8c wined3d: Use a more consistent naming for wined3d_conversion_type elements. 2014-09-30 17:35:56 +02:00
Henri Verbeet df21c2b346 wined3d: Pass a texture to d3dfmt_get_conv(). 2014-09-30 17:35:24 +02:00
Henri Verbeet 6323a26f6c wined3d: Get rid of the "use_texturing" parameter to d3dfmt_get_conv(). 2014-09-30 17:34:55 +02:00
Henri Verbeet 0932567faf wined3d: Use a lookup table in d3dfmt_get_conv(). 2014-09-30 17:34:20 +02:00
Henri Verbeet a8ab569415 wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special(). 2014-09-30 10:18:37 +02:00
Henri Verbeet 2d5c8aff3c wined3d: Get rid of SFLAG_DONOTFREE. 2014-09-29 10:37:37 +02:00
Henri Verbeet 97856bcfee wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc(). 2014-09-29 10:37:35 +02:00
Henri Verbeet 8aa1137509 wined3d: Use the texture resource in wined3d_surface_depth_fill(). 2014-09-19 10:49:29 +02:00
Henri Verbeet 4f2110b0ce wined3d: Never pass a surface to wined3d_resource_is_offscreen(). 2014-09-19 10:49:27 +02:00
Stefan Dösinger ee0ac3663b wined3d: Initialize the map binding in resource_init. 2014-08-26 14:46:55 +02:00
Henri Verbeet 07985a8c38 wined3d: Use rendertarget views for depth/stencil buffers instead of surfaces. 
I don't think the difference between d3d10 depth/stencil and rendertarget
views is large enough to justify a separate type. Unfortunately that does make
the name "wined3d_rendertarget_view" slightly awkward.
 2014-08-22 12:53:11 +02:00
Henri Verbeet 9f9731410b wined3d: Also update the container in wined3d_surface_update_desc(). 
This fixes a bug exposed by commit 415b803720.
In particular, wined3d_resource_update_draw_binding() uses the multisample
type to determine to appropriate draw binding, and since we never updated that
for the container, we could end up with an incorrect draw binding after a
device reset.
 2014-08-22 12:53:01 +02:00
Henri Verbeet b005ad6f90 wined3d: Use rendertarget views for color output instead of surfaces. 2014-08-21 12:24:42 +02:00
Henri Verbeet eb24c9578c wined3d: Keep a reference to the resource in rendertarget views. 2014-08-21 12:24:21 +02:00
Henri Verbeet d3387cf77b wined3d: Keep a reference to the backbuffer textures instead of the surfaces in the swapchain. 2014-08-20 13:29:53 +02:00
Henri Verbeet ec87407e7c wined3d: Keep a reference to the frontbuffer texture instead of the surface in the swapchain. 2014-08-20 13:29:52 +02:00
Henri Verbeet 415b803720 wined3d: Use the texture draw binding instead of the surface draw binding. 2014-08-20 13:29:50 +02:00
Henri Verbeet aa7016054a wined3d: Move the "swapchain" field from struct wined3d_surface to struct wined3d_texture. 2014-08-20 13:29:47 +02:00
Henri Verbeet 1ce3269ac1 wined3d: Replace surface_update_draw_binding() with wined3d_resource_update_draw_binding(). 2014-08-20 13:29:45 +02:00
Henri Verbeet f753ff90be wined3d: Replace surface_is_offscreen() with wined3d_resource_is_offscreen(). 
Introducing rendertarget views will (eventually) allow rendering to 3D
textures and buffers.
 2014-08-19 14:49:39 +02:00
Henri Verbeet 694cdcc41c wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource. 
Like "draw_binding".
 2014-08-19 14:49:36 +02:00
Henri Verbeet ed230a426a wined3d: Explicitly destroy the surface in texture2d_sub_resource_cleanup(). 
Like volumes. We can do this now because we no longer have standalone
surfaces.
 2014-08-19 14:49:32 +02:00
Henri Verbeet 5ef8e97414 wined3d: Move the "draw_binding" field from struct wined3d_surface to struct wined3d_resource. 2014-08-04 14:23:52 +02:00
Henri Verbeet d079066f5d wined3d: Get rid of the get_drawable_size() callback in struct wined3d_surface. 2014-08-04 14:23:49 +02:00
Stefan Dösinger 2abecc46c6 wined3d: Remove wined3d_surface_set/get_priority. 2014-07-16 16:09:51 +02:00
Stefan Dösinger 9d49b7a9be wined3d: Set palettes on the swapchain. 2014-06-30 22:04:53 +02:00
Stefan Dösinger 3909215773 wined3d: Remove d3dfmt_p8_init_palette. 2014-06-11 16:14:38 +02:00
Stefan Dösinger bdc396e4f5 wined3d: Fix indentation in d3dfmt_p8_init_palette. 2014-05-15 19:05:03 +02:00
Stefan Dösinger fd0189bbfa wined3d: Move get_dc palette updates to ddraw. 2014-05-15 19:05:02 +02:00
Stefan Dösinger 544816797a wined3d: Don't update the color table on palette changes. 2014-05-14 13:30:33 +02:00
Stefan Dösinger 7b049245f5 wined3d: Always provide P8 GL texture information. 2014-05-14 13:30:08 +02:00
Stefan Dösinger bfb5be0f4b wined3d: Remove WINED3D_CT_PALETTED_CK. 
There's no difference between WINED3D_CT_PALETTED_CK and
WINED3D_CT_PALETTED with the palette index in the alpha channel.
 2014-05-14 13:29:58 +02:00
Stefan Dösinger c1cca63e5d wined3d: Always store the palette index in the alpha component. 2014-05-14 13:29:52 +02:00
Stefan Dösinger fc25510fad wined3d: Remove wined3d_surface_get_palette. 2014-05-12 21:24:59 +02:00
Stefan Dösinger 46df06aae7 wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2. 2014-05-12 21:24:49 +02:00
Stefan Dösinger 1558391a11 wined3d: Store RGBQUADs in palettes. 2014-05-07 20:21:56 +02:00
Stefan Dösinger 19f45af19c wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set. 2014-05-07 20:21:55 +02:00
Stefan Dösinger 39212d2ffb wined3d: Remove broken gdi palette code. 2014-05-02 16:32:54 +02:00
Henri Verbeet 5cf9fe1c63 wined3d: Get rid of surface_set_texture_target(). 2014-04-23 15:00:46 +02:00
Henri Verbeet 81fb749ecf wined3d: Introduce a separate function to calculate the pitch for a given format and width. 2014-04-23 15:00:14 +02:00
Stefan Dösinger dfbff712f4 wined3d: surface_load_ds_location can handle WINED3D_LOCATION_DISCARDED. 2014-03-03 17:46:46 +01:00
Henri Verbeet b40eda767b wined3d: Also trace "mem" and "pitch" in wined3d_surface_update_desc(). 2014-03-03 17:02:25 +01:00
Stefan Dösinger 2728e7b887 wined3d: Reject height scaled repacked np2 textures. 2014-02-12 19:15:32 +01:00
Stefan Dösinger 6583379077 wined3d: Don't use NP2 repacking for RECT textures. 2014-02-12 19:15:31 +01:00
Stefan Dösinger d640018a3c wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem. 
All other map bindings are never freed. Setting SFLAG_DYNLOCK if
map_binding != sysmem might only keep a heap memory allocation around
(e.g. after device_reset) that is never used.
 2014-01-17 18:10:18 +01:00
Stefan Dösinger 5630cb5dc8 wined3d: Don't set SFLAG_DYNLOCK at surface creation. 
We no longer depend on SFLAG_DYNLOCK to create buffers and PIN_SYSMEM
makes sure the address remains constant.
 2014-01-17 18:10:13 +01:00
Stefan Dösinger b81e560531 wined3d: Migrate surfaces to the new location flags. 2014-01-17 18:10:10 +01:00
Stefan Dösinger beb64c9998 wined3d: Separate surface locations and flags. 2014-01-17 18:10:08 +01:00
Stefan Dösinger 00923cb50c wined3d: Remove surface_ops->map. 2014-01-17 18:10:05 +01:00
Stefan Dösinger f1ac04f2a6 wined3d: Add a missing break. 2014-01-17 16:22:51 +01:00
Stefan Dösinger 65bc678fcc wined3d: Prevent blits to surfaces that will be converted. 2014-01-16 21:04:19 +01:00
Stefan Dösinger 09dbba00d0 wined3d: Remove surface_init_sysmem. 2014-01-16 21:04:19 +01:00
Stefan Dösinger abb620ed2e wined3d: Sysmem can be freed when user memory is used. 2014-01-16 21:04:19 +01:00
Stefan Dösinger 2b8e900ac4 wined3d: Give buffers their own location. 2014-01-15 20:03:53 +01:00
Stefan Dösinger 321cd8e825 wined3d: Decide about PBO use at surface creation time. 2014-01-15 20:03:47 +01:00
Stefan Dösinger 7c052171d6 wined3d: Remove SFLAG_PBO. 2014-01-15 20:03:35 +01:00
Stefan Dösinger 035012d5aa wined3d: Load textures from dib without copying to sysmem first. 2014-01-15 20:03:33 +01:00
Stefan Dösinger 42927d0e9d wined3d: Add INDIB and INUSERMEM to resource_access_from_location. 2014-01-15 20:03:31 +01:00
Stefan Dösinger d0823eb4f0 wined3d: Re-enable mapping into the DIB. 2014-01-14 20:18:25 +01:00
Stefan Dösinger 9665884766 wined3d: Don't map the surface in getdc. 
This avoids bouncing the content between the map binding and DIB.
 2014-01-14 20:18:25 +01:00
Stefan Dösinger adf0ab2ad8 wined3d: Give the DIB section its own location. 2014-01-14 20:18:24 +01:00
Stefan Dösinger f6403b4ac0 wined3d: Do not use surface->resource.allocatedMemory. 2014-01-14 20:18:23 +01:00
Stefan Dösinger 353b3ba6d3 wined3d: Don't lock directly into the DIB. 2014-01-14 20:18:22 +01:00
Stefan Dösinger 4ca8f7104f wined3d: Move map binding loading to wined3d_surface_map. 2014-01-13 18:41:42 +01:00
Stefan Dösinger e2c0bc63cb wined3d: Start to split up surface_prepare_system_memory. 2014-01-13 18:41:15 +01:00
Stefan Dösinger 676a7f2140 wined3d: Make the callers of load_location responsible for allocating sysmem. 2014-01-13 18:41:09 +01:00
Stefan Dösinger 28bfc20589 wined3d: Use the map binding to optimize sysmem->sysmem blits. 2014-01-13 18:41:03 +01:00
Stefan Dösinger 965d00f4b6 wined3d: Give user memory its own location. 2014-01-10 17:59:16 +01:00
Stefan Dösinger badf3d8db7 wined3d: Load surfaces into map binding memory on unload. 
A surface can stay in DIB or user memory just fine. When buffers get
their own location an exception for them has to be added.
 2014-01-10 17:56:48 +01:00
Stefan Dösinger 18bf8b49b3 wined3d: Move location flag updating out of surface_init_sysmem. 2014-01-10 17:56:43 +01:00
Stefan Dösinger 1b561e815e wined3d: Use the map binding for RGB<->sRGB loads. 2014-01-10 17:56:39 +01:00
Stefan Dösinger 5c1df19b16 wined3d: Use the map binding to reload surfaces on color key changes. 2014-01-10 17:56:30 +01:00
Stefan Dösinger 5479ccea20 wined3d: Use the map binding to reload surfaces on palette changes. 2014-01-10 17:56:27 +01:00
Stefan Dösinger 1046551c34 wined3d: Add a map_binding field to surfaces. 
Buffers, heap memory, user memory and DIBs will have their own
locations. This field specifies which location is used when the surface
is mapped.
 2014-01-10 17:56:24 +01:00
Henri Verbeet 51cdeeacd4 wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen. 2014-01-10 12:06:09 +01:00
Frédéric Delanoy 91f2435469 Assorted spelling fixes. 2014-01-09 17:39:59 +01:00
Stefan Dösinger 441d8ffeb2 wined3d: Mark the system location up to date in the DIB recreation codepath. 2014-01-09 17:39:54 +01:00
Stefan Dösinger db6d3c500c wined3d: Remove SFLAG_USERPTR. 2014-01-09 17:39:53 +01:00
Henri Verbeet 4710c4b51a wined3d: Store color keys in textures instead of in surfaces. 2014-01-09 15:50:39 +01:00
Stefan Dösinger b91973daa7 wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc . 2014-01-08 20:02:22 +01:00
Stefan Dösinger 82666af87a wined3d: Simplify wined3d_surface_set_mem. 2014-01-08 19:58:56 +01:00
Stefan Dösinger 70eab9d025 wined3d: Support custom pitches in wined3d_surface_update_desc. 2014-01-08 17:35:08 +01:00
Stefan Dösinger fb75292875 wined3d: Don't store user memory in allocatedMemory. 2013-12-13 16:55:30 +01:00
Stefan Dösinger a1762ba8a4 wined3d: Don't check for render target usage in wined3d_surface_set_mem. 
Ddraw and d3d9 already take care of this.
 2013-12-13 16:55:28 +01:00
Henri Verbeet 4e7b62a46d wined3d: Get rid of unused palette flags. 2013-12-13 12:36:11 +01:00
Stefan Dösinger 78fda5cea0 wined3d: Rename surface_load_pbo to surface_create_pbo. 2013-12-11 18:17:02 +01:00
Stefan Dösinger 4de7249d23 wined3d: Call buffer_get_memory in surface_load_pbo. 2013-12-11 18:17:01 +01:00
Stefan Dösinger 800571c015 wined3d: Use surface_get_memory in surface_download_data. 2013-12-11 18:17:01 +01:00