system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 18:27:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Don't check for color-keying for WINED3D_CT_P8.

Browse source 
We don't support p8 color keying either way.
This commit is contained in:
Henri Verbeet 2014-10-06 08:24:21 +02:00 committed by Alexandre Julliard
parent c5bf229287
commit fd342cce3e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/wined3d/surface.c
View file

@ -1588,7 +1588,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi
static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck,
struct wined3d_format *format, enum wined3d_conversion_type *conversion_type)
{
BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT);
const struct wined3d_device *device = texture->resource.device;
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
const struct wined3d_format *dst_format;
@ -1614,7 +1613,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp
*conversion_type = WINED3D_CT_NONE;
dst_format_id = format->id;
if (colorkey_active)
if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT))
{
for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i)
{
@ -1632,8 +1631,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp
/* FIXME: This should check if the blitter backend can do P8 conversion,
* instead of checking for ARB_fragment_program. */
if (texture->resource.format->id == WINED3DFMT_P8_UINT
&& (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain
&& texture == texture->swapchain->front_buffer) || colorkey_active))
&& !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain
&& texture == texture->swapchain->front_buffer))
{
*conversion_type = WINED3D_CT_P8;
dst_format_id = WINED3DFMT_B8G8R8A8_UNORM;