It is meant to be private within the actual winsys. Remove it from
the exported header, and fold it into it's only user.
Cc: Alexander von Gluck IV <kallis...@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/gallium/winsys/sw/hgl/hgl_sw_winsys.c | 19 +++++++++++++++++++
src/gallium/winsys/sw/hgl/hgl_sw_winsys.h | 25 ++-----------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
index 27eca2b..8e8413b 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
@@ -27,15 +27,34 @@
#include "pipe/p_compiler.h"
+#include "pipe/p_defines.h"
#include "pipe/p_format.h"
#include "util/u_inlines.h"
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_memory.h"
+#include "state_tracker/st_api.h"
+#include "state_tracker/sw_winsys.h"
+#include "bitmap_wrapper.h"
#include "hgl_sw_winsys.h"
+struct haiku_displaytarget
+{
+ enum pipe_format format;
+ color_space colorSpace;
+
+ unsigned width;
+ unsigned height;
+ unsigned stride;
+
+ unsigned size;
+
+ void* data;
+};
+
+
// Cast
static INLINE struct haiku_displaytarget*
hgl_sw_displaytarget(struct sw_displaytarget* target)
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
index 5a2bef7..bdcddfb 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
@@ -27,30 +27,9 @@
#ifndef _HGL_SOFTWAREWINSYS_H
#define _HGL_SOFTWAREWINSYS_H
+struct sw_winsys;
-#include "pipe/p_defines.h"
-#include "state_tracker/st_api.h"
-#include "state_tracker/sw_winsys.h"
-
-#include "bitmap_wrapper.h"
-
-
-struct haiku_displaytarget
-{
- enum pipe_format format;
- color_space colorSpace;
-
- unsigned width;
- unsigned height;
- unsigned stride;
-
- unsigned size;
-
- void* data;
-};
-
-
-struct sw_winsys* hgl_create_sw_winsys();
+struct sw_winsys* hgl_create_sw_winsys(void);
#endif
--
2.0.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
