sw/hgl: struct haiku_displaytarget is not public struct

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 <kallisti5@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
index 27eca2ba2804842f0866948d54f2fbd4521e85e4..8e8413bbb972ba22895a27f3442f434bad90c7a0 100644 (file)
--- 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 5a2bef7ac7fd1d190b0b288b40a14d341eaa5111..bdcddfb4f2b3234d7c6aee17c5c1b664a92305d1 100644 (file)
--- 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