summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2009-07-13 15:01:51 -0700
committerCorbin Simpson <[email protected]>2009-07-13 16:26:29 -0700
commit59155f70e701bc0b4fb816da991d6921f53b3bc7 (patch)
tree7b8a71ae9f034db266398ac1934ed7e774829587
parentb3f1d370a2eeb5ae69a9d59300820d3a2e86724c (diff)
r300g: Small compile warning fixes.
Signed-off-by: Corbin Simpson <[email protected]>
-rw-r--r--src/gallium/drivers/r300/r300_context.h3
-rw-r--r--src/gallium/drivers/r300/r300_query.h2
-rw-r--r--src/gallium/drivers/r300/r300_screen.h2
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 7a96f51e5b0..d891fd6265f 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 4f447ea45b8..6a7646087a7 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 3f52dbc3bea..2a0e41fbc3b 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;
}