summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-05 16:20:07 -0700
committerVinson Lee <[email protected]>2010-08-05 16:20:07 -0700
commit0a7cbe845fe029411ae25c4bfe60763485a760f4 (patch)
tree1c5d9fcfa14436616e6a673037aef58ff3ce1627
parent3d038a3ed2d8325c4b826f13b62398b3ed33f3ba (diff)
st/mesa: Clean up header file inclusion in st_manager.h.
Include mtypes.h for GLcontext, gl_buffer_index, and GLframebuffer symbols. Include p_compiler.h for boolean symbol. Include st_context.h in st_cb_eglimage.c as it previously included st_context.h indirectly through st_manager.h.
-rw-r--r--src/mesa/state_tracker/st_cb_eglimage.c1
-rw-r--r--src/mesa/state_tracker/st_manager.h7
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c
index 4aaf91d5a19..037e576fabe 100644
--- a/src/mesa/state_tracker/st_cb_eglimage.c
+++ b/src/mesa/state_tracker/st_cb_eglimage.c
@@ -33,6 +33,7 @@
#include "util/u_format.h"
#include "st_cb_eglimage.h"
#include "st_cb_fbo.h"
+#include "st_context.h"
#include "st_texture.h"
#include "st_format.h"
#include "st_manager.h"
diff --git a/src/mesa/state_tracker/st_manager.h b/src/mesa/state_tracker/st_manager.h
index cd2887b1e0f..48a9d4d99a6 100644
--- a/src/mesa/state_tracker/st_manager.h
+++ b/src/mesa/state_tracker/st_manager.h
@@ -29,8 +29,11 @@
#ifndef ST_MANAGER_H
#define ST_MANAGER_H
-#include "state_tracker/st_api.h"
-#include "st_context.h"
+#include "main/mtypes.h"
+
+#include "pipe/p_compiler.h"
+
+struct st_context;
struct pipe_surface *
st_manager_get_egl_image_surface(struct st_context *st,