[PATCH 7/7] wined3d: remove texture target deactivation from ffp_blit_unset
Roderick Colenbrander
thunderbird2k at gmail.com
Tue May 18 17:38:46 CDT 2010
---
dlls/wined3d/surface.c | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 643cf00..8b3a849 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4809,23 +4809,6 @@ static HRESULT ffp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface)
/* Context activation is done by the caller. */
static void ffp_blit_unset(IWineD3DDevice *iface)
{
- IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface;
- const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
-
- ENTER_GL();
- glDisable(GL_TEXTURE_2D);
- checkGLcall("glDisable(GL_TEXTURE_2D)");
- if (gl_info->supported[ARB_TEXTURE_CUBE_MAP])
- {
- glDisable(GL_TEXTURE_CUBE_MAP_ARB);
- checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)");
- }
- if (gl_info->supported[ARB_TEXTURE_RECTANGLE])
- {
- glDisable(GL_TEXTURE_RECTANGLE_ARB);
- checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)");
- }
- LEAVE_GL();
}
static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op,
--
1.6.3.3
More information about the wine-patches
mailing list