Commit 1f2976a3 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override.

parent a5a4be4f
...@@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ ...@@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
*convert = CONVERT_PALETTED; *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; break;
case WINED3DFMT_B2G3R3_UNORM: case WINED3DFMT_B2G3R3_UNORM:
......
...@@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ...@@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
ARB_TEXTURE_FLOAT}, ARB_TEXTURE_FLOAT},
/* Palettized formats */ /* Palettized formats */
{WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0,
GL_RGBA, GL_UNSIGNED_BYTE, GL_ALPHA, GL_UNSIGNED_BYTE,
0, 0,
ARB_FRAGMENT_PROGRAM}, ARB_FRAGMENT_PROGRAM},
{WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment