Skip to content

W
wine-winehq
Commit 47372928 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix recursive ENTER_GL in UpdateSurface.

parent e848aed2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/wined3d/device.c
View file @ 47372928
...@@ -5880,11 +5880,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ...@@ -5880,11 +5880,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD);
ENTER_GL();
if (GL_SUPPORT(ARB_MULTITEXTURE)) { if (GL_SUPPORT(ARB_MULTITEXTURE)) {
ENTER_GL();
GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB));
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
LEAVE_GL();
} }
/* Make sure the surface is loaded and up to date */ /* Make sure the surface is loaded and up to date */
...@@ -5924,6 +5924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ...@@ -5924,6 +5924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n");
} }
ENTER_GL();
/* TODO: Cube and volume support */ /* TODO: Cube and volume support */
if(rowoffset != 0){ if(rowoffset != 0){
/* not a whole row so we have to do it a line at a time */ /* not a whole row so we have to do it a line at a time */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment