diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-07-13 15:01:51 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-07-13 16:26:29 -0700 |
| commit | 59155f70e701bc0b4fb816da991d6921f53b3bc7 (patch) | |
| tree | 7b8a71ae9f034db266398ac1934ed7e774829587 | |
| parent | b3f1d370a2eeb5ae69a9d59300820d3a2e86724c (diff) | |
| download | external_mesa3d-59155f70e701bc0b4fb816da991d6921f53b3bc7.zip external_mesa3d-59155f70e701bc0b4fb816da991d6921f53b3bc7.tar.gz external_mesa3d-59155f70e701bc0b4fb816da991d6921f53b3bc7.tar.bz2 | |
r300g: Small compile warning fixes.
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_query.h | 2 | ||||
| -rw-r--r-- | 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; } |