Henri Verbeet : wined3d: Add missing GL locking to ffp_blit_set() and ffp_blit_unset().
Alexandre Julliard
julliard at winehq.org
Fri May 15 07:47:01 CDT 2009
Module: wine
Branch: master
Commit: 177d883d95068023975019e96348bfde2349d640
URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d883d95068023975019e96348bfde2349d640
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu May 14 19:40:55 2009 +0200
wined3d: Add missing GL locking to ffp_blit_set() and ffp_blit_unset().
---
dlls/wined3d/surface.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f4463e3..a33bd6d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4853,13 +4853,16 @@ static void ffp_blit_free(IWineD3DDevice *iface) { }
static HRESULT ffp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc,
GLenum textype, UINT width, UINT height)
{
+ ENTER_GL();
glEnable(textype);
checkGLcall("glEnable(textype)");
+ LEAVE_GL();
return WINED3D_OK;
}
static void ffp_blit_unset(IWineD3DDevice *iface) {
IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface;
+ ENTER_GL();
glDisable(GL_TEXTURE_2D);
checkGLcall("glDisable(GL_TEXTURE_2D)");
if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) {
@@ -4870,6 +4873,7 @@ static void ffp_blit_unset(IWineD3DDevice *iface) {
glDisable(GL_TEXTURE_RECTANGLE_ARB);
checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)");
}
+ LEAVE_GL();
}
static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup)
More information about the wine-cvs
mailing list