Mesa (radeon-rewrite): r300: move forward declarations to where they belong

Alex Deucher agd5f at kemper.freedesktop.org
Sat May 16 15:47:57 UTC 2009


Module: Mesa
Branch: radeon-rewrite
Commit: 6f1a86ca1eb4a44a738d0ad99861d948c9749de6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f1a86ca1eb4a44a738d0ad99861d948c9749de6

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Wed May 13 23:09:39 2009 +0200

r300: move forward declarations to where they belong

---

 src/mesa/drivers/dri/r300/r300_context.c |    5 +----
 src/mesa/drivers/dri/r300/r300_render.h  |    4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 5b22a11..be8d480 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -64,6 +64,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_ioctl.h"
 #include "r300_tex.h"
 #include "r300_emit.h"
+#include "r300_render.h"
 #include "r300_swtcl.h"
 #include "radeon_bocs_wrapper.h"
 
@@ -150,10 +151,6 @@ const struct dri_extension gl_20_extension[] = {
   {"GL_VERSION_2_0",			GL_VERSION_2_0_functions },
 };
 
-
-extern struct tnl_pipeline_stage _r300_render_stage;
-extern const struct tnl_pipeline_stage _r300_tcl_stage;
-
 static const struct tnl_pipeline_stage *r300_pipeline[] = {
 
 	/* Try and go straight to t&l
diff --git a/src/mesa/drivers/dri/r300/r300_render.h b/src/mesa/drivers/dri/r300/r300_render.h
index fbc9581..940d256 100644
--- a/src/mesa/drivers/dri/r300/r300_render.h
+++ b/src/mesa/drivers/dri/r300/r300_render.h
@@ -44,6 +44,10 @@
 #define R300_FALLBACK_INVALID_BUFFERS   (1 << 31)
 #define R300_RASTER_FALLBACK_MASK        0xffff0000
 
+extern const struct tnl_pipeline_stage _r300_render_stage;
+
+extern const struct tnl_pipeline_stage _r300_tcl_stage;
+
 extern void r300SwitchFallback(GLcontext *ctx, uint32_t bit, GLboolean mode);
 
 #endif




More information about the mesa-commit mailing list