Mesa (master): r300g: fix warnings
Corbin Simpson
csimpson at kemper.freedesktop.org
Fri Dec 4 17:24:08 UTC 2009
Module: Mesa
Branch: master
Commit: 3da8265cd3233e2b22ab0f8a28fbba892984e399
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3da8265cd3233e2b22ab0f8a28fbba892984e399
Author: Marek Olšák <maraeo at gmail.com>
Date: Fri Dec 4 16:06:16 2009 +0100
r300g: fix warnings
---
src/gallium/drivers/r300/r300_context.c | 4 ++--
src/gallium/drivers/r300/r300_winsys.h | 2 ++
src/gallium/winsys/drm/radeon/core/radeon_buffer.c | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 68a17dc..5b337f0 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -36,8 +36,8 @@
#include "r300_screen.h"
#include "r300_state_derived.h"
#include "r300_state_invariant.h"
-
-#include "radeon_winsys.h"
+#include "r300_texture.h"
+#include "r300_winsys.h"
static enum pipe_error r300_clear_hash_table(void* key, void* value,
void* data)
diff --git a/src/gallium/drivers/r300/r300_winsys.h b/src/gallium/drivers/r300/r300_winsys.h
index f869858..1ae6de7 100644
--- a/src/gallium/drivers/r300/r300_winsys.h
+++ b/src/gallium/drivers/r300/r300_winsys.h
@@ -35,6 +35,8 @@ extern "C" {
#include "pipe/p_state.h"
#include "pipe/internal/p_winsys_screen.h"
+#include "radeon_winsys.h"
+
struct pipe_context* r300_create_context(struct pipe_screen* screen,
struct radeon_winsys* radeon_winsys);
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
index 65f7bab..0ca7b39 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
@@ -35,7 +35,9 @@
#include "radeon_bo_gem.h"
#include "softpipe/sp_texture.h"
#include "r300_context.h"
+#include "util/u_math.h"
#include <X11/Xutil.h>
+
struct radeon_vl_context
{
Display *display;
More information about the mesa-commit
mailing list