summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-01-14 12:51:47 -0800
committerCorbin Simpson <[email protected]>2009-02-01 23:30:23 -0800
commit4ce81294943177eed99d7418f1a2f88573b578fe (patch)
tree2cef12a6c94cb8ab4caa8c3e39396f1c24243329 /src/gallium/drivers
parent21a5a133fff3ab1a068a11a32144dcb63f1d5020 (diff)
r300: Fix errant inlines.
This should unbreak dynamic loading.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/r300/r300_context.h4
-rw-r--r--src/gallium/drivers/r300/r300_screen.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 40c310abca2..0551275dcc7 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -27,6 +27,8 @@
#include "pipe/p_context.h"
#include "util/u_memory.h"
+#include "r300_screen.h"
+
struct r300_blend_state {
uint32_t blend_control; /* R300_RB3D_BLENDCNTL: 0x4e04 */
uint32_t alpha_blend_control; /* R300_RB3D_ABLENDCNTL: 0x4e08 */
@@ -82,4 +84,4 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
struct pipe_winsys* winsys,
struct r300_winsys* r300_winsys);
-#endif /* R300_CONTEXT_H */ \ No newline at end of file
+#endif /* R300_CONTEXT_H */
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 36fc5aa67dd..a1b97f218e9 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -23,11 +23,10 @@
#ifndef R300_SCREEN_H
#define R300_SCREEN_H
+#include "pipe/p_inlines.h"
#include "pipe/p_screen.h"
#include "util/u_memory.h"
-#include "r300_context.h"
-
struct r300_screen {
/* Parent class */
struct pipe_screen screen;