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

wined3d: Create a separate function for deleting GL textures.

Browse Source
This commit is contained in:
Stefan Dösinger 2009-09-19 15:06:35 +02:00 committed by Alexandre Julliard
parent 529e6737d3
commit ba6fac697a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/wined3d/basetexture.c
View File

@ -70,25 +70,30 @@ void basetexture_cleanup(IWineD3DBaseTexture *iface)
resource_cleanup((IWineD3DResource *)iface); resource_cleanup((IWineD3DResource *)iface);
} }
/* A GL context is provided by the caller */
static void gltexture_delete(struct gl_texture *tex)
{
ENTER_GL();
glDeleteTextures(1, &tex->name);
LEAVE_GL();
tex->name = 0;
}
void basetexture_unload(IWineD3DBaseTexture *iface) void basetexture_unload(IWineD3DBaseTexture *iface)
{ {
IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice;
if(This->baseTexture.texture_rgb.name) { if(This->baseTexture.texture_rgb.name ||
This->baseTexture.texture_srgb.name) {
ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD);
ENTER_GL();
glDeleteTextures(1, &This->baseTexture.texture_rgb.name);
This->baseTexture.texture_rgb.name = 0;
LEAVE_GL();
} }
if(This->baseTexture.texture_rgb.name) {
gltexture_delete(&This->baseTexture.texture_rgb);
}
if(This->baseTexture.texture_srgb.name) { if(This->baseTexture.texture_srgb.name) {
ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); gltexture_delete(&This->baseTexture.texture_srgb);
ENTER_GL();
glDeleteTextures(1, &This->baseTexture.texture_srgb.name);
This->baseTexture.texture_srgb.name = 0;
LEAVE_GL();
} }
This->baseTexture.texture_rgb.dirty = TRUE; This->baseTexture.texture_rgb.dirty = TRUE;
This->baseTexture.texture_srgb.dirty = TRUE; This->baseTexture.texture_srgb.dirty = TRUE;