Henri Verbeet : wined3d: Just use glGammaInternal/ rtInternal from the destination format in d3dfmt_get_conv().
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 6 15:19:11 CDT 2014
Module: wine
Branch: master
Commit: b0ce89d81015fe23ecc4584e1e2dea17960e5c33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce89d81015fe23ecc4584e1e2dea17960e5c33
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Oct 6 08:24:18 2014 +0200
wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv().
Using glGammaInternal or rtInternal should do the right thing in principle,
although in practice they should never get used either way.
---
dlls/wined3d/surface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index a8e0f51..41dc2ac 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1649,8 +1649,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp
{
dst_format = wined3d_get_format(gl_info, dst_format_id);
format->glInternal = dst_format->glInternal;
- format->glGammaInternal = format->glInternal;
- format->rtInternal = format->glInternal;
+ format->glGammaInternal = dst_format->glGammaInternal;
+ format->rtInternal = dst_format->rtInternal;
format->glFormat = dst_format->glFormat;
format->glType = dst_format->glType;
format->conv_byte_count = dst_format->byte_count;
More information about the wine-cvs
mailing list