[PATCH 1/5] wined3d: Move the color key conversion helpers to util.c.
Henri Verbeet
hverbeet at codeweavers.com
Wed Oct 8 01:47:18 CDT 2014
---
dlls/wined3d/surface.c | 215 +---------------------------------------
dlls/wined3d/utils.c | 201 +++++++++++++++++++++++++++++++++++++
dlls/wined3d/wined3d_private.h | 9 ++
3 files changed, 214 insertions(+), 211 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ff7759f..4f5a8f5 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -36,13 +36,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d);
#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */
-struct wined3d_color_key_conversion
-{
- enum wined3d_format_id dst_format;
- void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width,
- unsigned int height, const struct wined3d_palette *palette, const struct wined3d_color_key *color_key);
-};
-
static const DWORD surface_simple_locations =
WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY
| WINED3D_LOCATION_DIB | WINED3D_LOCATION_BUFFER;
@@ -1592,206 +1585,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi
}
}
-static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color)
-{
- /* FIXME: Is this really how color keys are supposed to work? I think it
- * makes more sense to compare the individual channels. */
- return color >= color_key->color_space_low_value
- && color <= color_key->color_space_high_value;
-}
-
-static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const BYTE *src_row;
- unsigned int x, y;
- DWORD *dst_row;
-
- if (!palette)
- {
- /* FIXME: This should probably use the system palette. */
- FIXME("P8 surface loaded without a palette.\n");
-
- for (y = 0; y < height; ++y)
- {
- memset(&dst[dst_pitch * y], 0, width * 4);
- }
-
- return;
- }
-
- for (y = 0; y < height; ++y)
- {
- src_row = &src[src_pitch * y];
- dst_row = (DWORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- BYTE src_color = src_row[x];
- dst_row[x] = 0xff000000
- | (palette->colors[src_color].rgbRed << 16)
- | (palette->colors[src_color].rgbGreen << 8)
- | palette->colors[src_color].rgbBlue;
- }
- }
-}
-
-static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const WORD *src_row;
- unsigned int x, y;
- WORD *dst_row;
-
- for (y = 0; y < height; ++y)
- {
- src_row = (WORD *)&src[src_pitch * y];
- dst_row = (WORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- WORD src_color = src_row[x];
- if (!color_in_range(color_key, src_color))
- dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f);
- else
- dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f);
- }
- }
-}
-
-static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const WORD *src_row;
- unsigned int x, y;
- WORD *dst_row;
-
- for (y = 0; y < height; ++y)
- {
- src_row = (WORD *)&src[src_pitch * y];
- dst_row = (WORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- WORD src_color = src_row[x];
- if (color_in_range(color_key, src_color))
- dst_row[x] = src_color & ~0x8000;
- else
- dst_row[x] = src_color | 0x8000;
- }
- }
-}
-
-static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const BYTE *src_row;
- unsigned int x, y;
- DWORD *dst_row;
-
- for (y = 0; y < height; ++y)
- {
- src_row = &src[src_pitch * y];
- dst_row = (DWORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- DWORD src_color = (src_row[x * 3 + 2] << 16) | (src_row[x * 3 + 1] << 8) | src_row[x * 3];
- if (!color_in_range(color_key, src_color))
- dst_row[x] = src_color | 0xff000000;
- }
- }
-}
-
-static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const DWORD *src_row;
- unsigned int x, y;
- DWORD *dst_row;
-
- for (y = 0; y < height; ++y)
- {
- src_row = (DWORD *)&src[src_pitch * y];
- dst_row = (DWORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- DWORD src_color = src_row[x];
- if (color_in_range(color_key, src_color))
- dst_row[x] = src_color & ~0xff000000;
- else
- dst_row[x] = src_color | 0xff000000;
- }
- }
-}
-
-static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
- BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
- const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
-{
- const DWORD *src_row;
- unsigned int x, y;
- DWORD *dst_row;
-
- for (y = 0; y < height; ++y)
- {
- src_row = (DWORD *)&src[src_pitch * y];
- dst_row = (DWORD *)&dst[dst_pitch * y];
- for (x = 0; x < width; ++x)
- {
- DWORD src_color = src_row[x];
- if (color_in_range(color_key, src_color))
- src_color &= ~0xff000000;
- dst_row[x] = src_color;
- }
- }
-}
-
-static const struct wined3d_color_key_conversion * d3dfmt_get_conv(const struct wined3d_texture *texture,
- BOOL need_alpha_ck)
-{
- unsigned int i;
-
- static const struct
- {
- enum wined3d_format_id src_format;
- struct wined3d_color_key_conversion conversion;
- }
- color_key_info[] =
- {
- {WINED3DFMT_B5G6R5_UNORM, {WINED3DFMT_B5G5R5A1_UNORM, convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key }},
- {WINED3DFMT_B5G5R5X1_UNORM, {WINED3DFMT_B5G5R5A1_UNORM, convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key }},
- {WINED3DFMT_B8G8R8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key }},
- {WINED3DFMT_B8G8R8X8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key }},
- {WINED3DFMT_B8G8R8A8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key }},
- };
- static const struct wined3d_color_key_conversion convert_p8 =
- {
- WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm
- };
-
- if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT))
- {
- for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i)
- {
- if (color_key_info[i].src_format == texture->resource.format->id)
- return &color_key_info[i].conversion;
- }
-
- FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(texture->resource.format->id));
- }
-
- /* 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
- && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM]
- && texture->swapchain && texture == texture->swapchain->front_buffer))
- return &convert_p8;
-
- return NULL;
-}
-
static BOOL surface_check_block_align(struct wined3d_surface *surface, const RECT *rect)
{
UINT width_mask, height_mask;
@@ -1894,7 +1687,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
}
/* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */
- if (dst_format->convert || d3dfmt_get_conv(dst_surface->container, FALSE))
+ if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_surface->container, FALSE))
return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT);
context = context_acquire(dst_surface->resource.device, NULL);
@@ -3233,7 +3026,7 @@ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_con
{
converted = TRUE;
}
- else if ((conversion = d3dfmt_get_conv(texture, TRUE)))
+ else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
{
converted = TRUE;
format = wined3d_get_format(context->gl_info, conversion->dst_format);
@@ -4518,7 +4311,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
src_pitch = wined3d_surface_get_pitch(surface);
format = *texture->resource.format;
- if ((conversion = d3dfmt_get_conv(texture, TRUE)))
+ if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
format = *wined3d_get_format(gl_info, conversion->dst_format);
/* Don't use PBOs for converted surfaces. During PBO conversion we look at
@@ -5619,7 +5412,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
* surfaces, since otherwise we'd have to convert the data back when
* locking them. */
if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert
- || d3dfmt_get_conv(dst_surface->container, TRUE))
+ || wined3d_format_get_color_key_conversion(dst_surface->container, TRUE))
{
WARN_(d3d_perf)("Converted surface, using CPU blit.\n");
goto cpu;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 5db5e94..e969fa7 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -612,6 +612,207 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_p
}
}
+static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color)
+{
+ /* FIXME: Is this really how color keys are supposed to work? I think it
+ * makes more sense to compare the individual channels. */
+ return color >= color_key->color_space_low_value
+ && color <= color_key->color_space_high_value;
+}
+
+static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const BYTE *src_row;
+ unsigned int x, y;
+ DWORD *dst_row;
+
+ if (!palette)
+ {
+ /* FIXME: This should probably use the system palette. */
+ FIXME("P8 surface loaded without a palette.\n");
+
+ for (y = 0; y < height; ++y)
+ {
+ memset(&dst[dst_pitch * y], 0, width * 4);
+ }
+
+ return;
+ }
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = &src[src_pitch * y];
+ dst_row = (DWORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ BYTE src_color = src_row[x];
+ dst_row[x] = 0xff000000
+ | (palette->colors[src_color].rgbRed << 16)
+ | (palette->colors[src_color].rgbGreen << 8)
+ | palette->colors[src_color].rgbBlue;
+ }
+ }
+}
+
+static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const WORD *src_row;
+ unsigned int x, y;
+ WORD *dst_row;
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = (WORD *)&src[src_pitch * y];
+ dst_row = (WORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ WORD src_color = src_row[x];
+ if (!color_in_range(color_key, src_color))
+ dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f);
+ else
+ dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f);
+ }
+ }
+}
+
+static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const WORD *src_row;
+ unsigned int x, y;
+ WORD *dst_row;
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = (WORD *)&src[src_pitch * y];
+ dst_row = (WORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ WORD src_color = src_row[x];
+ if (color_in_range(color_key, src_color))
+ dst_row[x] = src_color & ~0x8000;
+ else
+ dst_row[x] = src_color | 0x8000;
+ }
+ }
+}
+
+static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const BYTE *src_row;
+ unsigned int x, y;
+ DWORD *dst_row;
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = &src[src_pitch * y];
+ dst_row = (DWORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ DWORD src_color = (src_row[x * 3 + 2] << 16) | (src_row[x * 3 + 1] << 8) | src_row[x * 3];
+ if (!color_in_range(color_key, src_color))
+ dst_row[x] = src_color | 0xff000000;
+ }
+ }
+}
+
+static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const DWORD *src_row;
+ unsigned int x, y;
+ DWORD *dst_row;
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = (DWORD *)&src[src_pitch * y];
+ dst_row = (DWORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ DWORD src_color = src_row[x];
+ if (color_in_range(color_key, src_color))
+ dst_row[x] = src_color & ~0xff000000;
+ else
+ dst_row[x] = src_color | 0xff000000;
+ }
+ }
+}
+
+static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch,
+ BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height,
+ const struct wined3d_palette *palette, const struct wined3d_color_key *color_key)
+{
+ const DWORD *src_row;
+ unsigned int x, y;
+ DWORD *dst_row;
+
+ for (y = 0; y < height; ++y)
+ {
+ src_row = (DWORD *)&src[src_pitch * y];
+ dst_row = (DWORD *)&dst[dst_pitch * y];
+ for (x = 0; x < width; ++x)
+ {
+ DWORD src_color = src_row[x];
+ if (color_in_range(color_key, src_color))
+ src_color &= ~0xff000000;
+ dst_row[x] = src_color;
+ }
+ }
+}
+
+const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion(
+ const struct wined3d_texture *texture, BOOL need_alpha_ck)
+{
+ const struct wined3d_format *format = texture->resource.format;
+ unsigned int i;
+
+ static const struct
+ {
+ enum wined3d_format_id src_format;
+ struct wined3d_color_key_conversion conversion;
+ }
+ color_key_info[] =
+ {
+ {WINED3DFMT_B5G6R5_UNORM, {WINED3DFMT_B5G5R5A1_UNORM, convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key }},
+ {WINED3DFMT_B5G5R5X1_UNORM, {WINED3DFMT_B5G5R5A1_UNORM, convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key }},
+ {WINED3DFMT_B8G8R8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key }},
+ {WINED3DFMT_B8G8R8X8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key }},
+ {WINED3DFMT_B8G8R8A8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key }},
+ };
+ static const struct wined3d_color_key_conversion convert_p8 =
+ {
+ WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm
+ };
+
+ if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT))
+ {
+ for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i)
+ {
+ if (color_key_info[i].src_format == format->id)
+ return &color_key_info[i].conversion;
+ }
+
+ FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(format->id));
+ }
+
+ /* FIXME: This should check if the blitter backend can do P8 conversion,
+ * instead of checking for ARB_fragment_program. */
+ if (format->id == WINED3DFMT_P8_UINT
+ && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM]
+ && texture->swapchain && texture == texture->swapchain->front_buffer))
+ return &convert_p8;
+
+ return NULL;
+}
+
/* The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set:
*
* These are never supported on native.
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a00dd8e..92e6cee 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3036,6 +3036,13 @@ struct wined3d_rational
UINT denominator;
};
+struct wined3d_color_key_conversion
+{
+ enum wined3d_format_id dst_format;
+ void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width,
+ unsigned int height, const struct wined3d_palette *palette, const struct wined3d_color_key *color_key);
+};
+
struct wined3d_format
{
enum wined3d_format_id id;
@@ -3083,6 +3090,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format,
UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN;
DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface,
const struct wined3d_color *color) DECLSPEC_HIDDEN;
+const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion(
+ const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN;
static inline BOOL use_vs(const struct wined3d_state *state)
{
--
1.7.10.4
More information about the wine-patches
mailing list