Merge branch 'gallium-s3tc'

[mesa.git] / src / gallium / auxiliary / util / u_debug.c

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 0af69d8c8f04f4a56b20eca95e822133ca87c156..96a2222f9b680ae9c3d10cbad11ac57bcaaf9949 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -169,18 +169,18 @@ void debug_print_blob( const char *name,
 #endif
 
 
-void _debug_break(void) 
+#ifndef debug_break
+void debug_break(void) 
 {
-#if defined(PIPE_ARCH_X86) && defined(PIPE_CC_GCC)
-   __asm("int3");
-#elif defined(PIPE_ARCH_X86) && defined(PIPE_CC_MSVC)
-   _asm {int 3};
+#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+   DebugBreak();
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
    EngDebugBreak();
 #else
    abort();
 #endif
 }
+#endif
 
 
 #ifdef PIPE_SUBSYSTEM_WINDOWS_DISPLAY
@@ -720,8 +720,8 @@ debug_dump_surface_bmp(const char *filename,
                        struct pipe_surface *surface)
 {
    struct pipe_transfer *transfer;
-   struct pipe_texture *texture;
-   struct pipe_screen *screen;
+   struct pipe_texture *texture = surface->texture;
+   struct pipe_screen *screen = texture->screen;
 
    transfer = screen->get_tex_transfer(screen, texture, surface->face,
                                        surface->level, surface->zslice,