ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add missing GL locking to ffp_blit_set() and ffp_blit_unset().

This commit is contained in:
Henri Verbeet 2009-05-14 19:40:55 +02:00 committed by Alexandre Julliard
parent 5bc449553b
commit 177d883d95
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/surface.c
View File

@ -4853,13 +4853,16 @@ static void ffp_blit_free(IWineD3DDevice *iface) { }
static HRESULT ffp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, static HRESULT ffp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc,
GLenum textype, UINT width, UINT height) GLenum textype, UINT width, UINT height)
{ {
ENTER_GL();
glEnable(textype); glEnable(textype);
checkGLcall("glEnable(textype)"); checkGLcall("glEnable(textype)");
LEAVE_GL();
return WINED3D_OK; return WINED3D_OK;
} }
static void ffp_blit_unset(IWineD3DDevice *iface) { static void ffp_blit_unset(IWineD3DDevice *iface) {
IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface;
ENTER_GL();
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
checkGLcall("glDisable(GL_TEXTURE_2D)"); checkGLcall("glDisable(GL_TEXTURE_2D)");
if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) {
@ -4870,6 +4873,7 @@ static void ffp_blit_unset(IWineD3DDevice *iface) {
glDisable(GL_TEXTURE_RECTANGLE_ARB); glDisable(GL_TEXTURE_RECTANGLE_ARB);
checkGLcall("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) static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup)