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

wined3d: Get rid of some asserts.

This commit is contained in:
Henri Verbeet 2009-06-22 10:16:00 +02:00 committed by Alexandre Julliard
parent 7598ab2c84
commit 404f4f7321
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/directx.c
View File

@ -23,7 +23,6 @@
*/ */
#include "config.h" #include "config.h"
#include <assert.h>
#include "wined3d_private.h" #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DEFAULT_DEBUG_CHANNEL(d3d);
@ -242,7 +241,6 @@ static void WineD3D_ReleaseFakeGLContext(void) {
wined3d_fake_gl_context_hwnd = NULL; wined3d_fake_gl_context_hwnd = NULL;
wined3d_fake_gl_context_available = FALSE; wined3d_fake_gl_context_available = FALSE;
} }
assert(wined3d_fake_gl_context_ref >= 0);
LeaveCriticalSection(&wined3d_fake_gl_context_cs); LeaveCriticalSection(&wined3d_fake_gl_context_cs);
} }
@ -254,7 +252,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) {
TRACE("getting context...\n"); TRACE("getting context...\n");
if(wined3d_fake_gl_context_ref > 0) goto ret; if(wined3d_fake_gl_context_ref > 0) goto ret;
assert(0 == wined3d_fake_gl_context_ref);
wined3d_fake_gl_context_foreign = TRUE; wined3d_fake_gl_context_foreign = TRUE;

5
dlls/wined3d/palette.c
View File

@ -22,7 +22,6 @@
#include "winerror.h" #include "winerror.h"
#include "wine/debug.h" #include "wine/debug.h"
#include <assert.h>
#include <string.h> #include <string.h>
#include "wined3d_private.h" #include "wined3d_private.h"
@ -78,7 +77,9 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) {
case WINEDDPCAPS_2BIT: return 4; case WINEDDPCAPS_2BIT: return 4;
case WINEDDPCAPS_4BIT: return 16; case WINEDDPCAPS_4BIT: return 16;
case WINEDDPCAPS_8BIT: return 256; case WINEDDPCAPS_8BIT: return 256;
default: assert(0); return 256; default:
FIXME("Unhandled size bits %#x.\n", dwFlags & SIZE_BITS);
return 256;
} }
} }

5
dlls/wined3d/surface_base.c
View File

@ -30,8 +30,6 @@
#include "wine/port.h" #include "wine/port.h"
#include "wined3d_private.h" #include "wined3d_private.h"
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
/* See also float_16_to_32() in wined3d_private.h */ /* See also float_16_to_32() in wined3d_private.h */
@ -1117,8 +1115,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D
dstwidth = xdst.right - xdst.left; dstwidth = xdst.right - xdst.left;
width = (xdst.right - xdst.left) * bpp; width = (xdst.right - xdst.left) * bpp;
assert(width <= dlock.Pitch);
if (DestRect && Src != This) if (DestRect && Src != This)
dbuf = dlock.pBits; dbuf = dlock.pBits;
else else
@ -1619,7 +1615,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst
slock.Pitch = dlock.Pitch; slock.Pitch = dlock.Pitch;
/* Since slock was originally copied from this surface's description, we can just reuse it */ /* Since slock was originally copied from this surface's description, we can just reuse it */
assert(This->resource.allocatedMemory != NULL);
sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp;
dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp;
sEntry = Src->resource.format_desc; sEntry = Src->resource.format_desc;

1
dlls/wined3d/surface_gdi.c
View File

@ -29,7 +29,6 @@
#include "wine/port.h" #include "wine/port.h"
#include "wined3d_private.h" #include "wined3d_private.h"
#include <assert.h>
#include <stdio.h> #include <stdio.h>
/* Use the d3d_surface debug channel to have one channel for all surfaces */ /* Use the d3d_surface debug channel to have one channel for all surfaces */