Skip to content

W
wine-cw
Commit fd2739b0 authored by H. Verbeet's avatar H. Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Don't call glCompressedTexImage2DARB without allocatedMemory.

Don't call glCompressedTexImage2DARB if we haven't got allocatedMemory (yet). Fix a small typo.
parent 414d1dde
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
dlls/wined3d/surface.c
View file @ fd2739b0
......@@ -1029,7 +1029,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
This->resource.format == WINED3DFMT_DXT3 ||
This->resource.format == WINED3DFMT_DXT4 ||
This->resource.format == WINED3DFMT_DXT5) {
if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) {
if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) {
FIXME("Using DXT1/3/5 without advertized support\n");
} else if (This->resource.allocatedMemory) {
TRACE("Calling glCompressedTexImage2D %x i=%d, intfmt=%x, w=%d, h=%d,0=%d, sz=%d, Mem=%p\n",
This->glDescription.target,
This->glDescription.level,
......@@ -1050,7 +1052,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
0,
This->resource.size,
This->resource.allocatedMemory);
checkGLcall("glCommpressedTexTexImage2D");
checkGLcall("glCommpressedTexImage2D");
LEAVE_GL();
......@@ -1058,9 +1060,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory);
This->resource.allocatedMemory = NULL;
}
} else {
FIXME("Using DXT1/3/5 without advertized support\n");
}
} else {
......
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