diff options
| author | Emil Velikov <[email protected]> | 2014-08-28 22:22:20 +0100 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2014-08-28 21:41:46 -0400 |
| commit | f5fb9c556b8c71b11d6bdd2b18fc39b6fe7d746d (patch) | |
| tree | bbcec6b13fb10c4f13e9e08fec7c0b460b5c1550 | |
| parent | 3b36ba4c399d9018409af0674cbd50c371385ce9 (diff) | |
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 <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/gallium/winsys/sw/hgl/hgl_sw_winsys.c | 19 | ||||
| -rw-r--r-- | 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 27eca2ba280..8e8413bbb97 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 5a2bef7ac7f..bdcddfb4f2b 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 |