Skip to content

W
wine-cw
Commit a562af5a authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE.

parent db68ffcb
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 0 deletions
dlls/ddraw/tests/ddraw4.c
View file @ a562af5a
...@@ -3813,10 +3813,16 @@ static void test_texturemanage(void) ...@@ -3813,10 +3813,16 @@ static void test_texturemanage(void)
{ {
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK,
DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE},
{DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK,
DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0},
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
...@@ -3824,10 +3830,16 @@ static void test_texturemanage(void) ...@@ -3824,10 +3830,16 @@ static void test_texturemanage(void)
{0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, 0, DD_OK, {DDSCAPS_VIDEOMEMORY, 0, DD_OK,
DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0},
{DDSCAPS_SYSTEMMEMORY, 0, DD_OK, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK,
...@@ -4589,10 +4601,20 @@ static void test_surface_lock(void) ...@@ -4589,10 +4601,20 @@ static void test_surface_lock(void)
}, },
{ {
DDSCAPS_TEXTURE, DDSCAPS_TEXTURE,
DDSCAPS2_D3DTEXTUREMANAGE,
"managed texture"
},
{
DDSCAPS_TEXTURE,
DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE,
"opaque managed texture" "opaque managed texture"
}, },
{ {
DDSCAPS_TEXTURE,
DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE,
"opaque managed texture"
},
{
DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE,
0, 0,
"render target" "render target"
......
dlls/ddraw/tests/ddraw7.c
View file @ a562af5a
...@@ -3626,10 +3626,16 @@ static void test_texturemanage(void) ...@@ -3626,10 +3626,16 @@ static void test_texturemanage(void)
{ {
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK,
DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE},
{DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK,
DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE},
{DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0},
{DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
...@@ -3637,10 +3643,16 @@ static void test_texturemanage(void) ...@@ -3637,10 +3643,16 @@ static void test_texturemanage(void)
{0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U}, ~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
~0U, ~0U},
{DDSCAPS_VIDEOMEMORY, 0, DD_OK, {DDSCAPS_VIDEOMEMORY, 0, DD_OK,
DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0},
{DDSCAPS_SYSTEMMEMORY, 0, DD_OK, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK,
...@@ -4414,10 +4426,20 @@ static void test_surface_lock(void) ...@@ -4414,10 +4426,20 @@ static void test_surface_lock(void)
}, },
{ {
DDSCAPS_TEXTURE, DDSCAPS_TEXTURE,
DDSCAPS2_D3DTEXTUREMANAGE,
"managed texture"
},
{
DDSCAPS_TEXTURE,
DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE,
"opaque managed texture" "opaque managed texture"
}, },
{ {
DDSCAPS_TEXTURE,
DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE,
"opaque managed texture"
},
{
DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE,
0, 0,
"render target" "render target"
...@@ -4449,9 +4471,19 @@ static void test_surface_lock(void) ...@@ -4449,9 +4471,19 @@ static void test_surface_lock(void)
}, },
{ {
DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES,
"managed cube"
},
{
DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE,
"opaque managed cube" "opaque managed cube"
}, },
{
DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE,
"opaque managed cube"
},
}; };
if (!(ddraw = create_ddraw())) if (!(ddraw = create_ddraw()))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment