From f74e00f4d1cafb5555aefec124edb47cc2891f92 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 18 Aug 2009 20:29:02 +1000 Subject: [PATCH] radeon/r200: fix build after OQ commits --- src/mesa/drivers/dri/r200/Makefile | 3 ++- src/mesa/drivers/dri/r200/radeon_queryobj.c | 1 + src/mesa/drivers/dri/r200/radeon_queryobj.h | 1 + src/mesa/drivers/dri/radeon/Makefile | 3 ++- src/mesa/drivers/dri/radeon/radeon_queryobj.h | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 120000 src/mesa/drivers/dri/r200/radeon_queryobj.c create mode 120000 src/mesa/drivers/dri/r200/radeon_queryobj.h diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index e81a1b3..2114ce5 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -27,7 +27,8 @@ RADEON_COMMON_SOURCES = \ radeon_cs_legacy.c \ radeon_mipmap_tree.c \ radeon_span.c \ - radeon_fbo.c + radeon_fbo.c \ + radeon_queryobj.c DRIVER_SOURCES = r200_context.c \ diff --git a/src/mesa/drivers/dri/r200/radeon_queryobj.c b/src/mesa/drivers/dri/r200/radeon_queryobj.c new file mode 120000 index 0000000..1d6ebc1 --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_queryobj.c @@ -0,0 +1 @@ +../radeon/radeon_queryobj.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/r200/radeon_queryobj.h b/src/mesa/drivers/dri/r200/radeon_queryobj.h new file mode 120000 index 0000000..8f6f842 --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_queryobj.h @@ -0,0 +1 @@ +../radeon/radeon_queryobj.h \ No newline at end of file diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile index b59ad68..6bf67d2 100644 --- a/src/mesa/drivers/dri/radeon/Makefile +++ b/src/mesa/drivers/dri/radeon/Makefile @@ -24,7 +24,8 @@ RADEON_COMMON_SOURCES = \ radeon_cs_legacy.c \ radeon_mipmap_tree.c \ radeon_span.c \ - radeon_fbo.c + radeon_fbo.c \ + radeon_queryobj.c DRIVER_SOURCES = \ radeon_context.c \ diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.h b/src/mesa/drivers/dri/radeon/radeon_queryobj.h index 5e70583..19374dc 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.h +++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.h @@ -27,7 +27,7 @@ #include "main/imports.h" #include "main/simple_list.h" -#include "radeon_context.h" +#include "radeon_common_context.h" extern void radeonEmitQueryBegin(GLcontext *ctx); extern void radeonEmitQueryEnd(GLcontext *ctx); -- 2.7.4