Henri Verbeet : wined3d: Get rid of the mostly unused SRGB_BOTH enum value.
Alexandre Julliard
julliard at winehq.org
Thu May 19 13:32:09 CDT 2011
Module: wine
Branch: master
Commit: 6d6402afefd774d79c4aa56236e2e2d20465526d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6402afefd774d79c4aa56236e2e2d20465526d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed May 18 22:30:16 2011 +0200
wined3d: Get rid of the mostly unused SRGB_BOTH enum value.
---
dlls/wined3d/context.c | 10 ++--------
dlls/wined3d/texture.c | 3 ---
dlls/wined3d/wined3d_private.h | 1 -
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 0b7f10f..20bb6d6 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2341,14 +2341,8 @@ static void context_setup_target(struct wined3d_device *device,
{
/* Read the back buffer of the old drawable into the destination texture. */
if (context->current_rt->texture_name_srgb)
- {
- surface_internal_preload(context->current_rt, SRGB_BOTH);
- }
- else
- {
- surface_internal_preload(context->current_rt, SRGB_RGB);
- }
-
+ surface_internal_preload(context->current_rt, SRGB_SRGB);
+ surface_internal_preload(context->current_rt, SRGB_RGB);
surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE);
}
}
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index f3f38d7..22b0907 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -683,9 +683,6 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB
srgb_mode = FALSE;
break;
- case SRGB_BOTH:
- texture2d_preload(texture, SRGB_RGB);
- /* Fallthrough */
case SRGB_SRGB:
srgb_mode = TRUE;
break;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0539339..b31239b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1876,7 +1876,6 @@ enum WINED3DSRGB
SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */
SRGB_RGB = 1, /* Loads the rgb texture */
SRGB_SRGB = 2, /* Loads the srgb texture */
- SRGB_BOTH = 3, /* Loads both textures */
};
struct gl_texture
More information about the wine-cvs
mailing list