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

wined3d: Get rid of the mostly unused SRGB_BOTH enum value.

parent aba42d1f
...@@ -2341,14 +2341,8 @@ static void context_setup_target(struct wined3d_device *device, ...@@ -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. */ /* Read the back buffer of the old drawable into the destination texture. */
if (context->current_rt->texture_name_srgb) if (context->current_rt->texture_name_srgb)
{ surface_internal_preload(context->current_rt, SRGB_SRGB);
surface_internal_preload(context->current_rt, SRGB_BOTH); surface_internal_preload(context->current_rt, SRGB_RGB);
}
else
{
surface_internal_preload(context->current_rt, SRGB_RGB);
}
surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE); surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE);
} }
} }
......
...@@ -683,9 +683,6 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB ...@@ -683,9 +683,6 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB
srgb_mode = FALSE; srgb_mode = FALSE;
break; break;
case SRGB_BOTH:
texture2d_preload(texture, SRGB_RGB);
/* Fallthrough */
case SRGB_SRGB: case SRGB_SRGB:
srgb_mode = TRUE; srgb_mode = TRUE;
break; break;
......
...@@ -1876,7 +1876,6 @@ enum WINED3DSRGB ...@@ -1876,7 +1876,6 @@ enum WINED3DSRGB
SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */ SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */
SRGB_RGB = 1, /* Loads the rgb texture */ SRGB_RGB = 1, /* Loads the rgb texture */
SRGB_SRGB = 2, /* Loads the srgb texture */ SRGB_SRGB = 2, /* Loads the srgb texture */
SRGB_BOTH = 3, /* Loads both textures */
}; };
struct gl_texture struct gl_texture
......
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