diff options
| author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
| commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
| tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/gallium/targets/dri-r600 | |
| parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
| parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/gallium/targets/dri-r600')
| -rw-r--r-- | src/gallium/targets/dri-r600/Makefile | 5 | ||||
| -rw-r--r-- | src/gallium/targets/dri-r600/target.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile index 661283de6a8..c8fae2d8585 100644 --- a/src/gallium/targets/dri-r600/Makefile +++ b/src/gallium/targets/dri-r600/Makefile @@ -9,7 +9,8 @@ PIPE_DRIVERS = \ $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a + $(TOP)/src/gallium/drivers/rbug/librbug.a \ + $(TOP)/src/gallium/drivers/noop/libnoop.a C_SOURCES = \ target.c \ @@ -17,7 +18,7 @@ C_SOURCES = \ $(DRIVER_SOURCES) DRIVER_DEFINES = \ - -DGALLIUM_RBUG -DGALLIUM_TRACE + -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP include ../Makefile.dri diff --git a/src/gallium/targets/dri-r600/target.c b/src/gallium/targets/dri-r600/target.c index 8753e2bab17..2fe345402de 100644 --- a/src/gallium/targets/dri-r600/target.c +++ b/src/gallium/targets/dri-r600/target.c @@ -1,5 +1,5 @@ #include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" +#include "target-helpers/inline_noop_helper.h" #include "r600/drm/r600_drm_public.h" #include "r600/r600_public.h" |