Skip to content

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

wined3d: Protect gl calls in Volume_LoadTexture with ENTER_GL/LEAVE_GL.

parent 47372928
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
dlls/wined3d/volume.c
View file @ 3e3141da
...@@ -328,6 +328,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int ...@@ -328,6 +328,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int
glDesc->glFormat, glDesc->glFormat,
glDesc->glType, glDesc->glType,
This->resource.allocatedMemory); This->resource.allocatedMemory);
ENTER_GL();
GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D,
gl_level, gl_level,
glDesc->glInternal, glDesc->glInternal,
...@@ -339,6 +341,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int ...@@ -339,6 +341,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int
glDesc->glType, glDesc->glType,
This->resource.allocatedMemory)); This->resource.allocatedMemory));
checkGLcall("glTexImage3D"); checkGLcall("glTexImage3D");
LEAVE_GL();
/* When adding code releasing This->resource.allocatedMemory to save data keep in mind that /* When adding code releasing This->resource.allocatedMemory to save data keep in mind that
* GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by default if supported(GL_APPLE_client_storage). * GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by default if supported(GL_APPLE_client_storage).
......
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