gallium: Move p_thread.h and p_atomic.h out of gallium interfaces.

Into os/os_thread.h and util/u_atomic.h respectively.

src/gallium/auxiliary/draw/draw_pt_util.c

@@ -33,6 +33,7 @@
 #include "draw/draw_context.h"
 #include "draw/draw_private.h"
 #include "draw/draw_pt.h"
+#include "util/u_debug.h"
 
 void draw_pt_split_prim(unsigned prim, unsigned *first, unsigned *incr)
 {

src/gallium/auxiliary/os/os_thread.h

@@ -31,8 +31,8 @@
  */
 
 
-#ifndef _P_THREAD2_H_
-#define _P_THREAD2_H_
+#ifndef OS_THREAD_H_
+#define OS_THREAD_H_
 
 
 #include "pipe/p_compiler.h"
@@ -276,4 +276,4 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
 
 
 
-#endif /* _P_THREAD2_H_ */
+#endif /* OS_THREAD_H_ */

src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c

@@ -44,7 +44,7 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"
 

src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c

@@ -36,7 +36,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"
 #include "util/u_time.h"

src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c

@@ -35,7 +35,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"

src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c

@@ -35,7 +35,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"
 #include "util/u_mm.h"

src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c

@@ -37,7 +37,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"

src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c

@@ -38,7 +38,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"

src/gallium/auxiliary/rtasm/rtasm_execmem.c

@@ -32,7 +32,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_memory.h"
 
 #include "rtasm_execmem.h"
@@ -58,7 +58,7 @@
 
 #include <unistd.h>
 #include <sys/mman.h>
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_mm.h"
 
 #define EXEC_HEAP_SIZE (10*1024*1024)

src/gallium/auxiliary/util/u_atomic.h

@@ -6,11 +6,11 @@
  *
  */
 
-#ifndef P_ATOMIC_H
-#define P_ATOMIC_H
+#ifndef U_ATOMIC_H
+#define U_ATOMIC_H
 
-#include "p_compiler.h"
-#include "p_defines.h"
+#include "pipe/p_compiler.h"
+#include "pipe/p_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -244,4 +244,4 @@ p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
 }
 #endif
 
-#endif /* P_ATOMIC_H */
+#endif /* U_ATOMIC_H */

src/gallium/auxiliary/util/u_inlines.h

@@ -33,7 +33,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_screen.h"
 #include "util/u_debug.h"
-#include "pipe/p_atomic.h"
+#include "util/u_atomic.h"
 
 
 #ifdef __cplusplus

src/gallium/auxiliary/util/u_ringbuffer.c

@@ -1,5 +1,5 @@
 
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "pipe/p_defines.h"
 #include "util/u_ringbuffer.h"
 #include "util/u_math.h"

src/gallium/drivers/svga/svga_screen.h

@@ -28,7 +28,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 #include "util/u_double_list.h"
 

src/gallium/drivers/svga/svga_screen_buffer.c

@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 

src/gallium/drivers/svga/svga_screen_cache.h

@@ -31,7 +31,7 @@
 #include "svga_reg.h"
 #include "svga3d_reg.h"
 
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 #include "util/u_double_list.h"
 

src/gallium/drivers/svga/svga_screen_texture.c

@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"

src/gallium/drivers/trace/tr_dump.c

@@ -45,7 +45,7 @@
 #endif
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"

src/gallium/drivers/trace/tr_screen.h

@@ -30,7 +30,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 
 #ifdef __cplusplus

src/gallium/state_trackers/glx/xlib/xm_api.h

@@ -60,7 +60,7 @@ and create a window, you must do the following to use the X/Mesa interface:
 #include "main/mtypes.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_public.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 
 # include <X11/Xlib.h>

src/gallium/state_trackers/wgl/stw_device.h

@@ -30,7 +30,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_handle_table.h"
 #include "stw_icd.h"
 #include "stw_pixelformat.h"

src/gallium/state_trackers/wgl/stw_framebuffer.h

@@ -32,7 +32,7 @@
 
 #include "main/mtypes.h"
 
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 struct pipe_surface;
 struct stw_pixelformat_info;

src/gallium/winsys/drm/intel/gem/intel_drm_fence.c

@@ -1,7 +1,7 @@
 
 #include "intel_drm_winsys.h"
 #include "util/u_memory.h"
-#include "pipe/p_atomic.h"
+#include "util/u_atomic.h"
 
 /**
  * Because gem does not have fence's we have to create our own fences.

src/gallium/winsys/drm/vmware/core/vmw_surface.h

@@ -36,8 +36,8 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_atomic.h"
-#include "pipe/p_atomic.h"
+#include "util/u_atomic.h"
+#include "util/u_atomic.h"
 
 #define VMW_MAX_PRESENTS 3