Commit 6f8cb77e authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.

parent 632d2fca
...@@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp ...@@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp
&& texture == texture->swapchain->front_buffer)) || colorkey_active) && texture == texture->swapchain->front_buffer)) || colorkey_active)
{ {
*conversion_type = WINED3D_CT_P8; *conversion_type = WINED3D_CT_P8;
format->glInternal = GL_RGBA; format->glInternal = GL_RGBA8;
format->glFormat = GL_RGBA; format->glFormat = GL_BGRA;
format->glType = GL_UNSIGNED_BYTE; format->glType = GL_UNSIGNED_INT_8_8_8_8_REV;
format->conv_byte_count = 4; format->conv_byte_count = 4;
} }
} }
...@@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI ...@@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
BYTE color = *source++; BYTE color = *source++;
*dest++ = palette->colors[color].rgbRed;
*dest++ = palette->colors[color].rgbGreen;
*dest++ = palette->colors[color].rgbBlue; *dest++ = palette->colors[color].rgbBlue;
*dest++ = palette->colors[color].rgbGreen;
*dest++ = palette->colors[color].rgbRed;
*dest++ = 0; *dest++ = 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