Henri Verbeet : wined3d: Remove a texture dimension check in state_alpha().
Alexandre Julliard
julliard at winehq.org
Fri Mar 9 12:34:19 CST 2012
Module: wine
Branch: master
Commit: 06aab27197d5f8c135d2b16793c72de7b32977b4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=06aab27197d5f8c135d2b16793c72de7b32977b4
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Mar 8 20:27:15 2012 +0100
wined3d: Remove a texture dimension check in state_alpha().
I don't think there's any reason color-keying shouldn't work on e.g. cube
textures, although it probably isn't very common either.
---
dlls/wined3d/state.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 264d16d..5e6c537 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -528,16 +528,10 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st
*/
if (state->textures[0])
{
- struct wined3d_texture *texture = state->textures[0];
- GLenum texture_dimensions = texture->target;
+ struct wined3d_surface *surface = surface_from_resource(state->textures[0]->sub_resources[0]);
- if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB)
- {
- struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]);
-
- if (surf->CKeyFlags & WINEDDSD_CKSRCBLT)
- enable_ckey = TRUE;
- }
+ if (surface->CKeyFlags & WINEDDSD_CKSRCBLT)
+ enable_ckey = TRUE;
}
if (enable_ckey || context->last_was_ckey)
More information about the wine-cvs
mailing list