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.

wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions.
52ab9e38 · Stefan Dösinger · Alexandre Julliard · e53d22b0 · 52ab9e38 · 52ab9e38
Commit 52ab9e38 authored Feb 17, 2015 by Stefan Dösinger Committed by Alexandre Julliard Feb 18, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

surface.c dlls/wined3d/surface.c +1 -1

utils.c dlls/wined3d/utils.c +1 -1

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4217,7 +4217,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
        if (texture->swapchain && texture->swapchain->palette)
            palette = texture->swapchain->palette;
        conversion->convert(data.addr, src_pitch, mem, dst_pitch,
-                width, height, palette, &texture->src_blt_color_key);
+                width, height, palette, &texture->gl_color_key);
        src_pitch = dst_pitch;
        data.addr = mem;
    }

--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -795,7 +795,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers
        WINED3DFMT_B8G8R8A8_UNORM,  convert_p8_uint_b8g8r8a8_unorm
    };

-    if (need_alpha_ck && (texture->color_key_flags & WINED3D_CKEY_SRC_BLT))
+    if (need_alpha_ck && (texture->flags & WINED3D_TEXTURE_COLOR_KEY))
    {
        for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i)
        {