Module: Mesa Branch: master Commit: f724036f0045bd28f323af3666c43b3ef03b6886 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f724036f0045bd28f323af3666c43b3ef03b6886
Author: José Fonseca <[email protected]> Date: Tue Sep 22 17:40:20 2009 +0100 wgl: Flatten the source tree. It is easier to have the WGL API on top of the ICD callbacks as Microsoft's own implementation does, than to have a seperate shared entity. This source reorganization is in antecipation of that. --- src/gallium/state_trackers/wgl/SConscript | 26 +++++++++---------- .../state_trackers/wgl/{shared => }/stw_context.c | 8 +++--- .../state_trackers/wgl/{shared => }/stw_context.h | 0 .../state_trackers/wgl/{shared => }/stw_device.c | 12 ++++---- .../state_trackers/wgl/{shared => }/stw_device.h | 0 ...tensionsstring.c => stw_ext_extensionsstring.c} | 0 .../{shared/stw_extgallium.c => stw_ext_gallium.c} | 1 + .../{shared/stw_extgallium.h => stw_ext_gallium.h} | 0 .../stw_arbpixelformat.c => stw_ext_pixelformat.c} | 0 ...tw_extswapinterval.c => stw_ext_swapinterval.c} | 0 .../wgl/{shared => }/stw_framebuffer.c | 0 .../wgl/{shared => }/stw_framebuffer.h | 0 .../wgl/{shared => }/stw_getprocaddress.c | 2 +- src/gallium/state_trackers/wgl/{icd => }/stw_icd.c | 4 +- src/gallium/state_trackers/wgl/{icd => }/stw_icd.h | 0 .../wgl/{shared => }/stw_pixelformat.c | 0 .../wgl/{shared => }/stw_pixelformat.h | 0 .../state_trackers/wgl/{shared => }/stw_public.h | 0 .../state_trackers/wgl/{shared => }/stw_tls.c | 0 .../state_trackers/wgl/{shared => }/stw_tls.h | 0 .../state_trackers/wgl/{ => }/wgl/stw_wgl.c | 2 +- .../state_trackers/wgl/{ => }/wgl/stw_wgl.h | 0 .../state_trackers/wgl/{shared => }/stw_winsys.h | 0 23 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript index 69b8861..2e9aacb 100644 --- a/src/gallium/state_trackers/wgl/SConscript +++ b/src/gallium/state_trackers/wgl/SConscript @@ -18,20 +18,18 @@ if env['platform'] in ['windows']: ]) sources = [ - 'icd/stw_icd.c', - - 'wgl/stw_wgl.c', - - 'shared/stw_context.c', - 'shared/stw_device.c', - 'shared/stw_framebuffer.c', - 'shared/stw_pixelformat.c', - 'shared/stw_extensionsstring.c', - 'shared/stw_extswapinterval.c', - 'shared/stw_getprocaddress.c', - 'shared/stw_extgallium.c', - 'shared/stw_arbpixelformat.c', - 'shared/stw_tls.c', + 'stw_context.c', + 'stw_device.c', + 'stw_ext_extensionsstring.c', + 'stw_ext_gallium.c', + 'stw_ext_pixelformat.c', + 'stw_ext_swapinterval.c', + 'stw_framebuffer.c', + 'stw_getprocaddress.c', + 'stw_icd.c', + 'stw_pixelformat.c', + 'stw_tls.c', + 'stw_wgl.c', ] wgl = env.ConvenienceLibrary( diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c similarity index 98% rename from src/gallium/state_trackers/wgl/shared/stw_context.c rename to src/gallium/state_trackers/wgl/stw_context.c index 4968ecc..ead2c13 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_context.c +++ b/src/gallium/state_trackers/wgl/stw_context.c @@ -39,10 +39,10 @@ #include "trace/tr_context.h" #endif -#include "shared/stw_device.h" -#include "shared/stw_winsys.h" -#include "shared/stw_framebuffer.h" -#include "shared/stw_pixelformat.h" +#include "stw_device.h" +#include "stw_winsys.h" +#include "stw_framebuffer.h" +#include "stw_pixelformat.h" #include "stw_public.h" #include "stw_context.h" #include "stw_tls.h" diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.h b/src/gallium/state_trackers/wgl/stw_context.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_context.h rename to src/gallium/state_trackers/wgl/stw_context.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c similarity index 96% rename from src/gallium/state_trackers/wgl/shared/stw_device.c rename to src/gallium/state_trackers/wgl/stw_device.c index 0b69549..cbc3570 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_device.c +++ b/src/gallium/state_trackers/wgl/stw_device.c @@ -37,12 +37,12 @@ #include "trace/tr_texture.h" #endif -#include "shared/stw_device.h" -#include "shared/stw_winsys.h" -#include "shared/stw_pixelformat.h" -#include "shared/stw_public.h" -#include "shared/stw_tls.h" -#include "shared/stw_framebuffer.h" +#include "stw_device.h" +#include "stw_winsys.h" +#include "stw_pixelformat.h" +#include "stw_public.h" +#include "stw_tls.h" +#include "stw_framebuffer.h" #ifdef WIN32_THREADS extern _glthread_Mutex OneTimeLock; diff --git a/src/gallium/state_trackers/wgl/shared/stw_device.h b/src/gallium/state_trackers/wgl/stw_device.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_device.h rename to src/gallium/state_trackers/wgl/stw_device.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_extensionsstring.c b/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_extensionsstring.c rename to src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_extgallium.c b/src/gallium/state_trackers/wgl/stw_ext_gallium.c similarity index 98% rename from src/gallium/state_trackers/wgl/shared/stw_extgallium.c rename to src/gallium/state_trackers/wgl/stw_ext_gallium.c index fc22737..13a42fe 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_extgallium.c +++ b/src/gallium/state_trackers/wgl/stw_ext_gallium.c @@ -30,6 +30,7 @@ #include "stw_public.h" #include "stw_device.h" #include "stw_winsys.h" +#include "stw_ext_gallium.h" #ifdef DEBUG #include "trace/tr_screen.h" diff --git a/src/gallium/state_trackers/wgl/shared/stw_extgallium.h b/src/gallium/state_trackers/wgl/stw_ext_gallium.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_extgallium.h rename to src/gallium/state_trackers/wgl/stw_ext_gallium.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c b/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c rename to src/gallium/state_trackers/wgl/stw_ext_pixelformat.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_extswapinterval.c b/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_extswapinterval.c rename to src/gallium/state_trackers/wgl/stw_ext_swapinterval.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c b/src/gallium/state_trackers/wgl/stw_framebuffer.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_framebuffer.c rename to src/gallium/state_trackers/wgl/stw_framebuffer.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.h b/src/gallium/state_trackers/wgl/stw_framebuffer.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_framebuffer.h rename to src/gallium/state_trackers/wgl/stw_framebuffer.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_getprocaddress.c b/src/gallium/state_trackers/wgl/stw_getprocaddress.c similarity index 98% rename from src/gallium/state_trackers/wgl/shared/stw_getprocaddress.c rename to src/gallium/state_trackers/wgl/stw_getprocaddress.c index 879ced9..57ce63e 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_getprocaddress.c +++ b/src/gallium/state_trackers/wgl/stw_getprocaddress.c @@ -34,7 +34,7 @@ #include "glapi/glapi.h" #include "stw_public.h" -#include "stw_extgallium.h" +#include "stw_ext_gallium.h" struct stw_extension_entry { diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.c b/src/gallium/state_trackers/wgl/stw_icd.c similarity index 99% rename from src/gallium/state_trackers/wgl/icd/stw_icd.c rename to src/gallium/state_trackers/wgl/stw_icd.c index 7dc6841..dc5ba91 100644 --- a/src/gallium/state_trackers/wgl/icd/stw_icd.c +++ b/src/gallium/state_trackers/wgl/stw_icd.c @@ -33,8 +33,8 @@ #include "util/u_debug.h" #include "pipe/p_thread.h" -#include "shared/stw_public.h" -#include "icd/stw_icd.h" +#include "stw_public.h" +#include "stw_icd.h" #define DBG 0 diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.h b/src/gallium/state_trackers/wgl/stw_icd.h similarity index 100% rename from src/gallium/state_trackers/wgl/icd/stw_icd.h rename to src/gallium/state_trackers/wgl/stw_icd.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c b/src/gallium/state_trackers/wgl/stw_pixelformat.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_pixelformat.c rename to src/gallium/state_trackers/wgl/stw_pixelformat.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h b/src/gallium/state_trackers/wgl/stw_pixelformat.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_pixelformat.h rename to src/gallium/state_trackers/wgl/stw_pixelformat.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_public.h b/src/gallium/state_trackers/wgl/stw_public.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_public.h rename to src/gallium/state_trackers/wgl/stw_public.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_tls.c b/src/gallium/state_trackers/wgl/stw_tls.c similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_tls.c rename to src/gallium/state_trackers/wgl/stw_tls.c diff --git a/src/gallium/state_trackers/wgl/shared/stw_tls.h b/src/gallium/state_trackers/wgl/stw_tls.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_tls.h rename to src/gallium/state_trackers/wgl/stw_tls.h diff --git a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/stw_wgl.c similarity index 99% rename from src/gallium/state_trackers/wgl/wgl/stw_wgl.c rename to src/gallium/state_trackers/wgl/stw_wgl.c index a131292..d4b2f51 100644 --- a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c +++ b/src/gallium/state_trackers/wgl/stw_wgl.c @@ -28,7 +28,7 @@ #include <windows.h> #include "util/u_debug.h" -#include "shared/stw_public.h" +#include "stw_public.h" #include "stw_wgl.h" diff --git a/src/gallium/state_trackers/wgl/wgl/stw_wgl.h b/src/gallium/state_trackers/wgl/stw_wgl.h similarity index 100% rename from src/gallium/state_trackers/wgl/wgl/stw_wgl.h rename to src/gallium/state_trackers/wgl/stw_wgl.h diff --git a/src/gallium/state_trackers/wgl/shared/stw_winsys.h b/src/gallium/state_trackers/wgl/stw_winsys.h similarity index 100% rename from src/gallium/state_trackers/wgl/shared/stw_winsys.h rename to src/gallium/state_trackers/wgl/stw_winsys.h _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
