[PATCH 4/7] wined3d: remove texture target activation from arbfp_blit_set
Roderick Colenbrander
thunderbird2k at gmail.com
Tue May 18 17:38:43 CDT 2010
The callers already take care for this either through draw_textured_quad or by hand.
---
dlls/wined3d/arb_program_shader.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index f62ff56..c7029ba 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6850,10 +6850,6 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
TRACE("Fixup:\n");
dump_color_fixup_desc(surface->resource.format_desc->color_fixup);
/* Don't bother setting up a shader for unconverted formats */
- ENTER_GL();
- glEnable(textype);
- checkGLcall("glEnable(textype)");
- LEAVE_GL();
return WINED3D_OK;
}
@@ -6882,10 +6878,6 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
default:
FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup);
- ENTER_GL();
- glEnable(textype);
- checkGLcall("glEnable(textype)");
- LEAVE_GL();
return E_NOTIMPL;
}
--
1.6.3.3
More information about the wine-patches
mailing list