Mesa (master): r300g: Small compile warning fixes.
Corbin Simpson
csimpson at kemper.freedesktop.org
Mon Jul 13 23:28:58 UTC 2009
Module: Mesa
Branch: master
Commit: 59155f70e701bc0b4fb816da991d6921f53b3bc7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59155f70e701bc0b4fb816da991d6921f53b3bc7
Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date: Mon Jul 13 15:01:51 2009 -0700
r300g: Small compile warning fixes.
Signed-off-by: Corbin Simpson <MostAwesomeDude at gmail.com>
---
src/gallium/drivers/r300/r300_context.h | 3 ++-
src/gallium/drivers/r300/r300_query.h | 2 ++
src/gallium/drivers/r300/r300_screen.h | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 7a96f51..d891fd6 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -331,7 +331,8 @@ struct r300_context {
};
/* Convenience cast wrapper. */
-static struct r300_context* r300_context(struct pipe_context* context) {
+static INLINE struct r300_context* r300_context(struct pipe_context* context)
+{
return (struct r300_context*)context;
}
diff --git a/src/gallium/drivers/r300/r300_query.h b/src/gallium/drivers/r300/r300_query.h
index 4f447ea..6a76460 100644
--- a/src/gallium/drivers/r300/r300_query.h
+++ b/src/gallium/drivers/r300/r300_query.h
@@ -27,6 +27,8 @@
#include "r300_cs.h"
#include "r300_reg.h"
+struct r300_context;
+
struct r300_query {
/* The kind of query. Currently only OQ is supported. */
unsigned type;
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 3f52dbc..2a0e41f 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -49,7 +49,7 @@ struct r300_transfer {
};
/* Convenience cast wrapper. */
-static struct r300_screen* r300_screen(struct pipe_screen* screen) {
+static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
return (struct r300_screen*)screen;
}
More information about the mesa-commit
mailing list