From 19d06f4e1692070afc7b3cab0ea1d78044820b0a Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 28 Jan 2009 11:40:54 +0000 Subject: [PATCH] wgl: split into shared, (fake)wgl and icd directories --- src/gallium/state_trackers/wgl/SConscript | 27 ++++++++++--------- .../state_trackers/wgl/{ => icd}/stw_icd.c | 6 ++--- .../state_trackers/wgl/{ => icd}/stw_icd.h | 0 .../wgl/{ => shared}/stw_device.c | 6 ++--- .../wgl/{ => shared}/stw_device.h | 2 +- .../wgl/{ => shared}/stw_framebuffer.c | 0 .../wgl/{ => shared}/stw_framebuffer.h | 0 .../wgl/{ => shared}/stw_pixelformat.c | 0 .../wgl/{ => shared}/stw_pixelformat.h | 0 .../wgl/{ => shared}/stw_quirks.c | 0 .../wgl/{ => shared}/stw_winsys.h | 0 .../state_trackers/wgl/{ => wgl}/stw_wgl.c | 0 .../state_trackers/wgl/{ => wgl}/stw_wgl.h | 0 .../{ => wgl}/stw_wgl_arbextensionsstring.c | 0 .../{ => wgl}/stw_wgl_arbextensionsstring.h | 0 .../wgl/{ => wgl}/stw_wgl_arbmultisample.c | 0 .../wgl/{ => wgl}/stw_wgl_arbmultisample.h | 0 .../wgl/{ => wgl}/stw_wgl_arbpixelformat.c | 2 +- .../wgl/{ => wgl}/stw_wgl_arbpixelformat.h | 0 .../wgl/{ => wgl}/stw_wgl_context.c | 8 +++--- .../wgl/{ => wgl}/stw_wgl_context.h | 0 .../wgl/{ => wgl}/stw_wgl_getprocaddress.c | 0 .../wgl/{ => wgl}/stw_wgl_pixelformat.c | 2 +- .../wgl/{ => wgl}/stw_wgl_swapbuffers.c | 6 ++--- 24 files changed, 30 insertions(+), 29 deletions(-) rename src/gallium/state_trackers/wgl/{ => icd}/stw_icd.c (99%) rename src/gallium/state_trackers/wgl/{ => icd}/stw_icd.h (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_device.c (96%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_device.h (98%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_framebuffer.c (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_framebuffer.h (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_pixelformat.c (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_pixelformat.h (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_quirks.c (100%) rename src/gallium/state_trackers/wgl/{ => shared}/stw_winsys.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl.c (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbextensionsstring.c (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbextensionsstring.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbmultisample.c (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbmultisample.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbpixelformat.c (99%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_arbpixelformat.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_context.c (98%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_context.h (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_getprocaddress.c (100%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_pixelformat.c (99%) rename src/gallium/state_trackers/wgl/{ => wgl}/stw_wgl_swapbuffers.c (95%) diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript index bb579930f52..9516dc5a3c2 100644 --- a/src/gallium/state_trackers/wgl/SConscript +++ b/src/gallium/state_trackers/wgl/SConscript @@ -8,6 +8,7 @@ if env['platform'] in ['windows']: env.Append(CPPPATH = [ '#src/mesa', + '.', ]) env.Append(CPPDEFINES = [ @@ -18,19 +19,19 @@ if env['platform'] in ['windows']: ]) sources = [ - 'stw_device.c', - 'stw_framebuffer.c', - 'stw_icd.c', - 'stw_pixelformat.c', - 'stw_quirks.c', - 'stw_wgl_arbextensionsstring.c', - 'stw_wgl_arbmultisample.c', - 'stw_wgl_arbpixelformat.c', - #'stw_wgl.c', - 'stw_wgl_context.c', - 'stw_wgl_getprocaddress.c', - 'stw_wgl_pixelformat.c', - 'stw_wgl_swapbuffers.c', + 'icd/stw_icd.c', + 'shared/stw_device.c', + 'shared/stw_framebuffer.c', + 'shared/stw_pixelformat.c', + 'shared/stw_quirks.c', + 'wgl/stw_wgl_arbextensionsstring.c', + 'wgl/stw_wgl_arbmultisample.c', + 'wgl/stw_wgl_arbpixelformat.c', + #'wgl/stw_wgl.c', + 'wgl/stw_wgl_context.c', + 'wgl/stw_wgl_getprocaddress.c', + 'wgl/stw_wgl_pixelformat.c', + 'wgl/stw_wgl_swapbuffers.c', ] wgl = env.ConvenienceLibrary( diff --git a/src/gallium/state_trackers/wgl/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c similarity index 99% rename from src/gallium/state_trackers/wgl/stw_icd.c rename to src/gallium/state_trackers/wgl/icd/stw_icd.c index 1dddc242097..bf057eb83bd 100644 --- a/src/gallium/state_trackers/wgl/stw_icd.c +++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c @@ -32,9 +32,9 @@ #include "pipe/p_debug.h" -#include "stw_device.h" -#include "stw_icd.h" -#include "stw_wgl.h" +#include "shared/stw_device.h" +#include "icd/stw_icd.h" +#include "wgl/stw_wgl.h" static HGLRC diff --git a/src/gallium/state_trackers/wgl/stw_icd.h b/src/gallium/state_trackers/wgl/icd/stw_icd.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_icd.h rename to src/gallium/state_trackers/wgl/icd/stw_icd.h diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/shared/stw_device.c similarity index 96% rename from src/gallium/state_trackers/wgl/stw_device.c rename to src/gallium/state_trackers/wgl/shared/stw_device.c index 129b24ce777..63ee066824e 100644 --- a/src/gallium/state_trackers/wgl/stw_device.c +++ b/src/gallium/state_trackers/wgl/shared/stw_device.c @@ -31,9 +31,9 @@ #include "pipe/p_winsys.h" #include "pipe/p_screen.h" -#include "stw_device.h" -#include "stw_winsys.h" -#include "stw_pixelformat.h" +#include "shared/stw_device.h" +#include "shared/stw_winsys.h" +#include "shared/stw_pixelformat.h" struct stw_device *stw_dev = NULL; diff --git a/src/gallium/state_trackers/wgl/stw_device.h b/src/gallium/state_trackers/wgl/shared/stw_device.h similarity index 98% rename from src/gallium/state_trackers/wgl/stw_device.h rename to src/gallium/state_trackers/wgl/shared/stw_device.h index e2020bf0554..2babc654daf 100644 --- a/src/gallium/state_trackers/wgl/stw_device.h +++ b/src/gallium/state_trackers/wgl/shared/stw_device.h @@ -29,7 +29,7 @@ #define ST_DEVICE_H_ -#include "stw_icd.h" +#include "icd/stw_icd.h" struct pipe_screen; diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_framebuffer.c rename to src/gallium/state_trackers/wgl/shared/stw_framebuffer.c diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.h b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_framebuffer.h rename to src/gallium/state_trackers/wgl/shared/stw_framebuffer.h diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_pixelformat.c rename to src/gallium/state_trackers/wgl/shared/stw_pixelformat.c diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.h b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_pixelformat.h rename to src/gallium/state_trackers/wgl/shared/stw_pixelformat.h diff --git a/src/gallium/state_trackers/wgl/stw_quirks.c b/src/gallium/state_trackers/wgl/shared/stw_quirks.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_quirks.c rename to src/gallium/state_trackers/wgl/shared/stw_quirks.c diff --git a/src/gallium/state_trackers/wgl/stw_winsys.h b/src/gallium/state_trackers/wgl/shared/stw_winsys.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_winsys.h rename to src/gallium/state_trackers/wgl/shared/stw_winsys.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl.c diff --git a/src/gallium/state_trackers/wgl/stw_wgl.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl.h rename to src/gallium/state_trackers/wgl/wgl/stw_wgl.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.c diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.c diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.c similarity index 99% rename from src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.c index 344bb15d3c1..a1e6fc2ca4b 100644 --- a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c +++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.c @@ -29,7 +29,7 @@ #include "pipe/p_compiler.h" #include "util/u_memory.h" -#include "stw_pixelformat.h" +#include "shared/stw_pixelformat.h" #include "stw_wgl_arbmultisample.h" #include "stw_wgl_arbpixelformat.h" diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl_context.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.c similarity index 98% rename from src/gallium/state_trackers/wgl/stw_wgl_context.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_context.c index 890d97fd72a..da4688bcb17 100644 --- a/src/gallium/state_trackers/wgl/stw_wgl_context.c +++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.c @@ -33,10 +33,10 @@ #include "pipe/p_context.h" #include "state_tracker/st_context.h" #include "state_tracker/st_public.h" -#include "stw_device.h" -#include "stw_winsys.h" -#include "stw_framebuffer.h" -#include "stw_pixelformat.h" +#include "shared/stw_device.h" +#include "shared/stw_winsys.h" +#include "shared/stw_framebuffer.h" +#include "shared/stw_pixelformat.h" #include "stw_wgl_arbmultisample.h" #include "stw_wgl_context.h" #include "stw_wgl.h" diff --git a/src/gallium/state_trackers/wgl/stw_wgl_context.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.h similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_context.h rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_context.h diff --git a/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_getprocaddress.c similarity index 100% rename from src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_getprocaddress.c diff --git a/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_pixelformat.c similarity index 99% rename from src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_pixelformat.c index 7a8a2e22e49..4646f57a198 100644 --- a/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c +++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_pixelformat.c @@ -29,7 +29,7 @@ #include "pipe/p_compiler.h" #include "pipe/p_debug.h" -#include "stw_pixelformat.h" +#include "shared/stw_pixelformat.h" #include "stw_wgl.h" static uint currentpixelformat = 0; diff --git a/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c similarity index 95% rename from src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c rename to src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c index 002bcc64e72..c0af8bc4f6f 100644 --- a/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c +++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c @@ -32,9 +32,9 @@ #include "pipe/p_context.h" #include "state_tracker/st_context.h" #include "state_tracker/st_public.h" -#include "stw_winsys.h" -#include "stw_device.h" -#include "stw_framebuffer.h" +#include "shared/stw_winsys.h" +#include "shared/stw_device.h" +#include "shared/stw_framebuffer.h" #include "stw_wgl.h" WINGDIAPI BOOL APIENTRY -- 2.30.2