diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-06-14 01:23:20 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-06-14 01:45:11 +0200 |
| commit | 63e38bd0f6a1958f174a98e4b06be3fb152048b4 (patch) | |
| tree | ef9ed3f89f7f10104fdff9bf782c4806155ff947 /src/gallium/auxiliary/target-helpers | |
| parent | 9346d895e7ff6c1f01b46513694542026ffba5cc (diff) | |
| download | external_mesa3d-63e38bd0f6a1958f174a98e4b06be3fb152048b4.zip external_mesa3d-63e38bd0f6a1958f174a98e4b06be3fb152048b4.tar.gz external_mesa3d-63e38bd0f6a1958f174a98e4b06be3fb152048b4.tar.bz2 | |
target-helpers: remove copy-pasted function inline_noop_helper
Diffstat (limited to 'src/gallium/auxiliary/target-helpers')
| -rw-r--r-- | src/gallium/auxiliary/target-helpers/inline_debug_helper.h | 8 | ||||
| -rw-r--r-- | src/gallium/auxiliary/target-helpers/inline_noop_helper.h | 51 |
2 files changed, 8 insertions, 51 deletions
diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h index 0433da6..c6630c4 100644 --- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h @@ -22,6 +22,10 @@ #include "galahad/glhd_public.h" #endif +#ifdef GALLIUM_NOOP +#include "noop/noop_public.h" +#endif + static INLINE struct pipe_screen * debug_screen_wrap(struct pipe_screen *screen) { @@ -38,6 +42,10 @@ debug_screen_wrap(struct pipe_screen *screen) screen = galahad_screen_create(screen); #endif +#if defined(GALLIUM_NOOP) + screen = noop_screen_create(screen); +#endif + return screen; } diff --git a/src/gallium/auxiliary/target-helpers/inline_noop_helper.h b/src/gallium/auxiliary/target-helpers/inline_noop_helper.h deleted file mode 100644 index 77c7cfd..0000000 --- a/src/gallium/auxiliary/target-helpers/inline_noop_helper.h +++ /dev/null @@ -1,51 +0,0 @@ - -#ifndef INLINE_DEBUG_HELPER_H -#define INLINE_DEBUG_HELPER_H - -#include "pipe/p_compiler.h" -#include "util/u_debug.h" - - -/* Helper function to wrap a screen with - * one or more debug driver: rbug, trace. - */ - -#ifdef GALLIUM_TRACE -#include "trace/tr_public.h" -#endif - -#ifdef GALLIUM_RBUG -#include "rbug/rbug_public.h" -#endif - -#ifdef GALLIUM_GALAHAD -#include "galahad/glhd_public.h" -#endif - -#ifdef GALLIUM_NOOP -#include "noop/noop_public.h" -#endif - -static INLINE struct pipe_screen * -debug_screen_wrap(struct pipe_screen *screen) -{ -#if defined(GALLIUM_RBUG) - screen = rbug_screen_create(screen); -#endif - -#if defined(GALLIUM_TRACE) - screen = trace_screen_create(screen); -#endif - -#if defined(GALLIUM_GALAHAD) - screen = galahad_screen_create(screen); -#endif - -#if defined(GALLIUM_NOOP) - screen = noop_screen_create(screen); -#endif - - return screen; -} - -#endif |