Commit Graph

374 Commits

Author SHA1 Message Date
Henri Verbeet 521e3a44cf ddraw: Only allow DDSCAPS_MIPMAP on textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-06 18:08:39 +01:00
Henri Verbeet e53567f72a ddraw: Use the largest dimension to determine the mipmap count for version 7 surfaces.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-06 18:08:38 +01:00
Henri Verbeet 9c96a525e7 wined3d: Get rid of unused error codes.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:45:30 +01:00
Henri Verbeet 8f91d3ccd8 ddraw: Simplify the root surface test in ddraw_surface7_GetPriority().
This fixes commit 97f0345f71. I assume it was
applied by mistake, since it's also missing the correct sign-off.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:44:57 +01:00
Riccardo Bortolato cb03e216e5 ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
Enabled some previously failing tests in ddraw/tests/ddraw7.c.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
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-03 20:03:23 +01:00
Riccardo Bortolato 97f0345f71 ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority().
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 09:24:06 +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
Henri Verbeet 83f10e2251 ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip() when not in exclusive mode.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-04 21:56:19 +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
Riccardo Bortolato f7bf61ea4c ddraw: Remove unused mipmap_level from ddraw_surface.
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-11-04 14:41:37 +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
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 40c5303b62 ddraw: Return the right error if range color keys are used. 2015-08-24 20:42:40 +09:00
Michael Müller 2f17d5b136 ddraw: Make some functions hotpachable. 2015-06-12 21:23:12 +09:00
Henri Verbeet 4a416f8d37 ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind). 2015-04-30 16:17:49 +09:00
Stefan Dösinger 02be2e38a8 ddraw: Update the palette before presents to the NULL window. 2015-03-23 22:59:14 +09:00
Stefan Dösinger df829de88d ddraw: Handle DDBLT_ROP in ddraw. 2015-03-18 21:03:22 +09:00
Stefan Dösinger 948202c47f ddraw: Add validation and tests for DDBLT_ROP. 2015-03-17 23:34:28 +09:00
Stefan Dösinger a84980168c ddraw: Add DDBLT_DEPTHFILL validation. 2015-03-17 23:33:56 +09:00
Stefan Dösinger 6cb795b4b6 ddraw: Add DDBLT_COLORFILL validation. 2015-03-17 23:33:44 +09:00
Sebastian Lackner 68528519fc ddraw: Remove unused code for ChangeUniquenessValue. 2015-03-03 17:12:41 +09:00
Amine Khaldi 21bfc8c440 include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses. 2015-03-02 23:00:32 +09:00
Henri Verbeet ea534c9ab4 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). 2015-01-05 20:15:35 +01:00
Henri Verbeet af9ccb490a ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create(). 2014-12-10 19:32:08 +01: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 5000eba6d0 ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init(). 2014-09-29 10:37:25 +02:00
Henri Verbeet e28800c6a4 ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create(). 2014-09-29 10:37:22 +02:00
Henri Verbeet b005ad6f90 wined3d: Use rendertarget views for color output instead of surfaces. 2014-08-21 12:24:42 +02:00
Stefan Dösinger 9bb5b00dd5 ddraw: Do not set lpSurface in GetSurfaceDesc.
This reverts a5c484cbf3. The test included
in a5c484cb is wrong and contains a typo that leads to incorrect
assumptions. The Dungeon Keeper 2 crash that was the reason for patch
a5c484cb is fixed properly by the previous patch.
2014-08-19 14:50:17 +02:00
Stefan Dösinger 61ee3323ad ddraw: Clear application-passed lpSurface pointers. 2014-08-19 14:50:12 +02:00
Stefan Dösinger 341db6d8d3 wined3d: Remove wined3d_texture_set/get_priority. 2014-07-16 16:10:05 +02:00
Stefan Dösinger 2abecc46c6 wined3d: Remove wined3d_surface_set/get_priority. 2014-07-16 16:09:51 +02:00
Stefan Dösinger 5b9f91c18d ddraw: Add validation to SetPriority / GetPriority. 2014-07-16 16:09:22 +02:00
Stefan Dösinger 403d7c1dee ddraw: Refuse SetPalette and GetPalette on lost surfaces.
The SetPalette check is outside of ddraw_surface_set_palette to make
sure the palettes are properly freed when a lost P8 surface is destroyed.
2014-07-07 15:49:06 +02:00
Henri Verbeet 8ebc82cd8d ddraw: Check for a lost surface in ddraw_surface7_Flip(). 2014-07-01 12:51:46 +02:00
Stefan Dösinger 9d49b7a9be wined3d: Set palettes on the swapchain. 2014-06-30 22:04:53 +02:00
Henri Verbeet b0f1feb4f0 ddraw: Properly support creating compressed user memory surfaces. 2014-06-12 18:05:20 +02:00
Henri Verbeet e2d9cb69ba ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces. 2014-06-12 18:05:20 +02:00
Henri Verbeet 92ea79a198 ddraw: Clear DDSD_PITCH on compressed surfaces. 2014-06-12 18:05:19 +02:00
Henri Verbeet 64a5dc11bf ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces. 2014-06-12 18:05:18 +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 fc25510fad wined3d: Remove wined3d_surface_get_palette. 2014-05-12 21:24:59 +02:00
Stefan Dösinger a227188573 ddraw: Alpha palettes can only be attached to textures. 2014-05-07 20:21:57 +02:00
Francois Gouget 4e950d9cbc ddraw: Remove WINAPI on static functions where not needed. 2014-05-02 17:15:22 +02:00
Stefan Dösinger 590582e6bc ddraw: Only ddraw7 disallows SetPalette on sublevels. 2014-04-25 20:04:38 +02:00
Henri Verbeet ac70dd2c97 ddraw: Validate the pitch for user memory surfaces against the unaligned minimum pitch.
User memory surfaces have a different minimum alignment from regular surfaces.
This fixes a regression introduced by commit
9c138d772c.
2014-04-23 15:00:35 +02:00
Stefan Dösinger ee57e19b40 ddraw: SetPrivateData(..., data = NULL, ...) is not valid. 2014-04-08 19:23:24 +02:00
Stefan Dösinger 7d793715f3 ddraw: Use the new private store api. 2014-03-17 20:23:58 +01:00
Henri Verbeet 76ab86ee7f ddraw: Disallow user memory surfaces before version 4. 2014-03-05 11:49:41 +01:00