Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35194 Signed-off-by: Paul Gofman gofmanp@gmail.com --- dlls/ddraw/tests/ddraw7.c | 6 +-- dlls/wined3d/surface.c | 87 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1592d2e081..7f2c3e9751 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16621,11 +16621,11 @@ static void test_surface_format_conversion_alpha(void) {FMT_R5G5B5X1, r5g5b5x1_data, FMT_R5G5B5A1, r5g5b5x1_data, TRUE}, {FMT_R5G5B5A1, r5g5b5a1_data, FMT_R5G6B5, r5g6b5_data}, {FMT_RGBA, rgba_data, FMT_DXT1, dxt1_data}, - {FMT_RGBX, rgbx_data, FMT_DXT1, dxt1_data, TRUE}, + {FMT_RGBX, rgbx_data, FMT_DXT1, dxt1_data}, {FMT_RGBA, rgba_data, FMT_DXT2, dxt2_data}, - {FMT_RGBX, rgbx_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_RGBX, rgbx_data, FMT_DXT2, dxt2_data}, {FMT_RGBA, rgba_data, FMT_DXT3, dxt2_data}, - {FMT_RGBX, rgbx_data, FMT_DXT3, dxt2_data, TRUE}, + {FMT_RGBX, rgbx_data, FMT_DXT3, dxt2_data}, {FMT_DXT1, dxt1_data, FMT_DXT2, dxt2_data}, {FMT_DXT1, dxt1_data, FMT_RGBA, rgba_data}, {FMT_DXT1, dxt1_data, FMT_RGBX, rgba_data}, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c8d9eaf1c..a1dcc1d4f3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -603,6 +603,83 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; }
+static const struct d3dfmt_alpha_fixup +{ + enum wined3d_format_id format_id; + unsigned int alpha_mask; + unsigned int byte_count; +} +formats_src_alpha_fixup[] = +{ + {WINED3DFMT_B8G8R8X8_UNORM, 0xff000000, 4}, + {WINED3DFMT_B5G5R5X1_UNORM, 0x00008000, 2}, + {WINED3DFMT_B4G4R4X4_UNORM, 0x0000f000, 2}, +}; + +static void wined3d_fixup_alpha(struct wined3d_context *context, const struct wined3d_format *src_format, + const struct wined3d_format *dst_format, struct wined3d_bo_address *src_data, + unsigned int row_pitch, unsigned int width, unsigned int height, + struct wined3d_bo_address *conv_data) +{ + const struct d3dfmt_alpha_fixup *alpha_fixup = NULL; + unsigned int i, y; + BYTE *src_addr; + + memset(conv_data, 0, sizeof(*conv_data)); + + if (!(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !dst_format->alpha_size) + return; + + for (i = 0; i < ARRAY_SIZE(formats_src_alpha_fixup); ++i) + if (formats_src_alpha_fixup[i].format_id == src_format->id) + { + alpha_fixup = &formats_src_alpha_fixup[i]; + break; + } + + if (!alpha_fixup) + return; + + if (!(conv_data->addr = heap_alloc(height * row_pitch))) + { + ERR("Failed to allocate memory.\n"); + return; + } + + src_addr = wined3d_context_map_bo_address(context, src_data, height * row_pitch, 0, WINED3D_MAP_READ); + + for (y = 0; y < height; ++y) + { + switch(alpha_fixup->byte_count) + { + case 2: + { + unsigned short *dst = (unsigned short *)(conv_data->addr + y * row_pitch); + unsigned short *src = (unsigned short *)(src_addr + y * row_pitch); + + for (i = 0; i < width; ++i) + dst[i] = src[i] | alpha_fixup->alpha_mask; + + break; + } + case 4: + { + unsigned int *dst = (unsigned int *)(conv_data->addr + y * row_pitch); + unsigned int *src = (unsigned int *)(src_addr + y * row_pitch); + + for (i = 0; i < width; ++i) + dst[i] = src[i] | alpha_fixup->alpha_mask; + + break; + } + default: + ERR("Unsupported byte count %u.\n", alpha_fixup->byte_count); + } + } + wined3d_context_unmap_bo_address(context, src_data, 0, 0, NULL); +} + static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, unsigned int sub_resource_idx, const struct wined3d_format *dst_format) { @@ -685,14 +762,22 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr else { struct wined3d_box src_box = {0, 0, desc.width, desc.height, 0, 1}; + struct wined3d_bo_address conv_data;
TRACE("Using upload conversion.\n");
wined3d_texture_prepare_location(dst_texture, 0, context, WINED3D_LOCATION_TEXTURE_RGB); - dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&src_data), + + wined3d_fixup_alpha(context, src_format, dst_format, &src_data, src_row_pitch, + desc.width, desc.height, &conv_data); + + dst_texture->texture_ops->texture_upload_data(context, + wined3d_const_bo_address(conv_data.addr ? &conv_data : &src_data), src_format, &src_box, src_row_pitch, src_slice_pitch, dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB, 0, 0, 0);
+ heap_free(conv_data.addr); + wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); }