From 1f2976a302336eda5cb0782946d0444cbded8d84 Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Mon, 5 Apr 2010 20:05:17 +0200 Subject: [PATCH] wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/utils.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a863372c709..6ced08284ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - /* TODO: this check is evil and should die (it basically checks which blitter backend is used) */ - else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup)) - { - *format = GL_ALPHA; - *type = GL_UNSIGNED_BYTE; - *target_bpp = 1; - } - break; case WINED3DFMT_B2G3R3_UNORM: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 65f4761b09e..45d476097d6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_FLOAT}, /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, - GL_RGBA, GL_UNSIGNED_BYTE, + GL_ALPHA, GL_UNSIGNED_BYTE, 0, ARB_FRAGMENT_PROGRAM}, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0,