wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
25a8773d · Matteo Bruni · Alexandre Julliard · cc7c6928 · 25a8773d · 25a8773d
Commit 25a8773d authored Sep 21, 2017 by Matteo Bruni Committed by Alexandre Julliard Sep 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

device.c dlls/d3d9/tests/device.c +0 -1

directx.c dlls/wined3d/directx.c +3 -1

No files found.
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -6963,7 +6963,6 @@ static void test_mipmap_gen(void)
                D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i]));
        hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
                D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]);
-        todo_wine_if (!renderable && hr == D3D_OK)
        ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN,
                "Got unexpected hr %#x for %srenderable format %#x.\n",
                hr, renderable ? "" : "non", formats[i]);

--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5364,7 +5364,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
        return WINED3DERR_NOTAVAILABLE;
    }

-    if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP])
+    if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && (!gl_info->supported[SGIS_GENERATE_MIPMAP]
+            || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))
+            != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)))
    {
        TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n");
        return WINED3DOK_NOAUTOGEN;