Henri Verbeet : wined3d: Use the requested sRGB mode in texture3d_preload() .
Alexandre Julliard
julliard at winehq.org
Thu May 19 13:32:09 CDT 2011
Module: wine
Branch: master
Commit: 0143fa73821cfddadbafe16f68a76a0a907fec7d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0143fa73821cfddadbafe16f68a76a0a907fec7d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed May 18 22:30:17 2011 +0200
wined3d: Use the requested sRGB mode in texture3d_preload().
---
dlls/wined3d/texture.c | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 22b0907..34801b8 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -664,6 +664,21 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture,
return hr;
}
+static BOOL texture_srgb_mode(struct wined3d_texture *texture, enum WINED3DSRGB srgb)
+{
+ switch (srgb)
+ {
+ case SRGB_RGB:
+ return FALSE;
+
+ case SRGB_SRGB:
+ return TRUE;
+
+ default:
+ return texture->flags & WINED3D_TEXTURE_IS_SRGB;
+ }
+}
+
/* Do not call while under the GL lock. */
static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb)
{
@@ -677,21 +692,7 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB
TRACE("texture %p, srgb %#x.\n", texture, srgb);
- switch (srgb)
- {
- case SRGB_RGB:
- srgb_mode = FALSE;
- break;
-
- case SRGB_SRGB:
- srgb_mode = TRUE;
- break;
-
- default:
- srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB;
- break;
- }
-
+ srgb_mode = texture_srgb_mode(texture, srgb);
gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode);
if (!device->isInDraw)
@@ -1095,7 +1096,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB
else if (texture->bind_count > 0)
{
BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB;
- BOOL sampler_srgb = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE];
+ BOOL sampler_srgb = texture_srgb_mode(texture, srgb);
srgb_was_toggled = !texture_srgb != !sampler_srgb;
if (srgb_was_toggled)
More information about the wine-cvs
mailing list