From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/surface.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1b6a4c0ad19..1d571d89f65 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2801,7 +2801,7 @@ HRESULT d3dx_load_pixels_from_pixels(struct d3dx_pixels *dst_pixels, 0, src_pixels->size.depth, &uncompressed_pixels);
hr = d3dx_load_pixels_from_pixels(dst_pixels, dst_desc, &uncompressed_pixels, uncompressed_desc, - filter_flags, color_key); + filter_flags, 0); } free(uncompressed_mem); goto exit; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 082abca5dc5..9cd989680fa 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -2177,7 +2177,6 @@ static void test_color_key(IDirect3DDevice9 *device) /* Color key is ignored for compressed formats. */ { D3DFMT_DXT5, NULL, { 0, 0, 4, 4 }, dxt5_4_4, dxt5_4_4_expected, 0xffff0000, - .todo = TRUE }, }; D3DLOCKED_RECT lock_rect;