diff options
author | Dave Airlie <[email protected]> | 2009-08-18 20:29:02 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2009-08-18 20:29:02 +1000 |
commit | f74e00f4d1cafb5555aefec124edb47cc2891f92 (patch) | |
tree | 46be94fb022c71d2677ad444ccf8310adf7dbd89 | |
parent | 9ad76e9479c9c3cb8b2947d5144de33bb31197b8 (diff) |
radeon/r200: fix build after OQ commits
-rw-r--r-- | src/mesa/drivers/dri/r200/Makefile | 3 | ||||
l--------- | src/mesa/drivers/dri/r200/radeon_queryobj.c | 1 | ||||
l--------- | src/mesa/drivers/dri/r200/radeon_queryobj.h | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/Makefile | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_queryobj.h | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index e81a1b38ac3..2114ce55c14 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 00000000000..1d6ebc1c48b --- /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 00000000000..8f6f842b0a6 --- /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 b59ad68f445..6bf67d2ea59 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 5e705838fea..19374dc76b7 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); |