radeon/r200: fix build after OQ commits

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index e81a1b38ac369dd6b14f012f9105d52fe43b1fef..2114ce55c14d6dd10f46c907b93c7f1692f4cd81 100644 (file)
--- 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 (symlink)
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 (symlink)
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 b59ad68f445d3ecb4c26d734e5359f3e32aaab17..6bf67d2ea590033d468b94b9a7aa70cb9c469f1b 100644 (file)
--- 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 5e705838feab750a41bef317b11b27941e7437fb..19374dc76b7083503a46aa1bcfe5fd36e9e41656 100644 (file)
--- 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);