Henri Verbeet : wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv ().
Alexandre Julliard
julliard at winehq.org
Wed Jun 10 10:16:58 CDT 2009
Module: wine
Branch: master
Commit: 5ac8a7b054e75912c9ca1e99d3de242e11ebfe51
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8a7b054e75912c9ca1e99d3de242e11ebfe51
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jun 10 09:44:04 2009 +0200
wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv().
---
dlls/wined3d/surface.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 81c93e2..11e467b 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1691,7 +1691,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
if (colorkey_active) {
*convert = CONVERT_CK_565;
*format = GL_RGBA;
- *internal = GL_RGBA;
+ *internal = GL_RGB5_A1;
*type = GL_UNSIGNED_SHORT_5_5_5_1;
}
break;
@@ -1700,7 +1700,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
if (colorkey_active) {
*convert = CONVERT_CK_5551;
*format = GL_BGRA;
- *internal = GL_RGBA;
+ *internal = GL_RGB5_A1;
*type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
}
break;
@@ -1709,7 +1709,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
if (colorkey_active) {
*convert = CONVERT_CK_RGB24;
*format = GL_RGBA;
- *internal = GL_RGBA;
+ *internal = GL_RGBA8;
*type = GL_UNSIGNED_INT_8_8_8_8;
*target_bpp = 4;
}
@@ -1719,7 +1719,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
if (colorkey_active) {
*convert = CONVERT_RGB32_888;
*format = GL_RGBA;
- *internal = GL_RGBA;
+ *internal = GL_RGBA8;
*type = GL_UNSIGNED_INT_8_8_8_8;
}
break;
More information about the wine-cvs
mailing list