diff options
Diffstat (limited to 'src/gallium/winsys')
19 files changed, 21 insertions, 21 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 3568d8229cd..1a30c9a3cf3 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -30,7 +30,7 @@ #include "util/hash_table.h" #include "util/os_time.h" #include "util/u_hash_table.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "drm-uapi/amdgpu_drm.h" #include <xf86drm.h> #include <stdio.h> diff --git a/src/gallium/winsys/i915/drm/i915_drm_buffer.c b/src/gallium/winsys/i915/drm/i915_drm_buffer.c index 9b525f9809c..3d24b64e679 100644 --- a/src/gallium/winsys/i915/drm/i915_drm_buffer.c +++ b/src/gallium/winsys/i915/drm/i915_drm_buffer.c @@ -1,4 +1,4 @@ -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "i915_drm_winsys.h" #include "util/u_memory.h" diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c index d07ee496e48..add8ff83e2b 100644 --- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c +++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c @@ -3,7 +3,7 @@ #include "drm-uapi/i915_drm.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "i915_drm_winsys.h" #include "i915_drm_public.h" diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index f802d858eac..948e0b20ce3 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -33,7 +33,7 @@ #include "os/os_mman.h" #include "util/os_time.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include <sys/ioctl.h> #include <xf86drm.h> diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c index 62d1b18b9e3..0a6e586e013 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c @@ -36,7 +36,7 @@ #include "svga_drm_public.h" #include "svga3d_surfacedefs.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "vmwgfx_drm.h" #include <xf86drm.h> diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c index bb3a1adedc1..ed267e9ad68 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c @@ -37,7 +37,7 @@ #include "util/u_memory.h" #include "util/u_math.h" #include "svgadump/svga_dump.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "vmw_screen.h" #include "vmw_context.h" #include "vmw_fence.h" diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c index 6173147a1ff..c889e968534 100644 --- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c +++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c @@ -39,7 +39,7 @@ #include "util/u_math.h" #include "util/u_memory.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" #include "dri_sw_winsys.h" diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.h b/src/gallium/winsys/sw/dri/dri_sw_winsys.h index 47e3777d4cd..e9fbac0c187 100644 --- a/src/gallium/winsys/sw/dri/dri_sw_winsys.h +++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.h @@ -29,7 +29,7 @@ #ifndef DRI_SW_WINSYS #define DRI_SW_WINSYS -#include "state_tracker/drisw_api.h" +#include "frontend/drisw_api.h" struct sw_winsys; diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c index ed22e82ee6d..87ffbcc0689 100644 --- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c +++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c @@ -42,7 +42,7 @@ #include "util/format/u_format.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" #include "gdi_sw_winsys.h" diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h index 4bbcb47848b..c882b1d8d35 100644 --- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h +++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h @@ -4,7 +4,7 @@ #include <windows.h> #include "pipe/p_compiler.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" void gdi_sw_display( struct sw_winsys *winsys, struct sw_displaytarget *dt, diff --git a/src/gallium/winsys/sw/hgl/SConscript b/src/gallium/winsys/sw/hgl/SConscript index 7755b00ea8c..776dd831a4b 100644 --- a/src/gallium/winsys/sw/hgl/SConscript +++ b/src/gallium/winsys/sw/hgl/SConscript @@ -12,7 +12,7 @@ if env['platform'] in ('haiku'): '#/src/gallium/include', '#/src/gallium/auxiliary', '#/src/gallium/drivers', - '#/src/gallium/state_trackers/hgl', + '#/src/gallium/frontend/hgl', ]) ws_haiku = env.ConvenienceLibrary( diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c index 35e7137b549..bcbaf9cabe5 100644 --- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c +++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c @@ -34,8 +34,8 @@ #include "util/format/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 "frontend/api.h" +#include "frontend/sw_winsys.h" #include "bitmap_wrapper.h" #include "hgl_sw_winsys.h" diff --git a/src/gallium/winsys/sw/hgl/meson.build b/src/gallium/winsys/sw/hgl/meson.build index 8901096bd12..10096651c99 100644 --- a/src/gallium/winsys/sw/hgl/meson.build +++ b/src/gallium/winsys/sw/hgl/meson.build @@ -23,7 +23,7 @@ libswhgl = static_library( files('hgl_sw_winsys.c'), c_args : c_vis_args, include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux, - include_directories('../../../state_trackers/hgl') + include_directories('../../../frontends/hgl') ], build_by_default : false, ) diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c index da11be2333a..b501ba0403a 100644 --- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c +++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c @@ -50,8 +50,8 @@ #include "util/u_memory.h" #include "util/list.h" -#include "state_tracker/sw_winsys.h" -#include "state_tracker/drm_driver.h" +#include "frontend/sw_winsys.h" +#include "frontend/drm_driver.h" #include "kms_dri_sw_winsys.h" #ifdef DEBUG diff --git a/src/gallium/winsys/sw/null/null_sw_winsys.c b/src/gallium/winsys/sw/null/null_sw_winsys.c index e897f246d26..a39f74c879c 100644 --- a/src/gallium/winsys/sw/null/null_sw_winsys.c +++ b/src/gallium/winsys/sw/null/null_sw_winsys.c @@ -39,7 +39,7 @@ #include "pipe/p_format.h" #include "util/u_memory.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" #include "null_sw_winsys.h" diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c index 37c499b9485..b042d4a56c4 100644 --- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c +++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c @@ -29,7 +29,7 @@ #include "pipe/p_format.h" #include "pipe/p_state.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" #include "util/u_memory.h" #include "util/u_inlines.h" diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c index 8e97f0a24af..0eea71b7523 100644 --- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c +++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c @@ -39,7 +39,7 @@ #include "util/u_math.h" #include "util/u_memory.h" -#include "state_tracker/xlibsw_api.h" +#include "frontend/xlibsw_api.h" #include "xlib_sw_winsys.h" #include <X11/Xlib.h> diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index 7b20636ad20..b19bdf4b6f8 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -35,7 +35,7 @@ #include "util/u_hash_table.h" #include "util/u_inlines.h" #include "util/u_pointer.h" -#include "state_tracker/drm_driver.h" +#include "frontend/drm_driver.h" #include "virgl/virgl_screen.h" #include "virgl/virgl_public.h" diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c index dbe3afe9f80..2f79909d540 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c @@ -26,7 +26,7 @@ #include "util/format/u_format.h" #include "util/u_inlines.h" #include "util/os_time.h" -#include "state_tracker/sw_winsys.h" +#include "frontend/sw_winsys.h" #include "os/os_mman.h" #include "virgl_vtest_winsys.h" |