From 0e471ac45771393ea74178eb98f41b904168cf64 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 27 Jan 2009 11:28:29 +0000 Subject: [PATCH] wgl: relocate wgl code to state_trackers/wgl Similar to the GLX state trackers for DRI and xlib. --- src/gallium/SConscript | 3 +++ .../state_tracker => gallium/state_trackers}/wgl/SConscript | 0 .../state_tracker => gallium/state_trackers}/wgl/opengl32.def | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_device.c | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_device.h | 0 .../state_trackers}/wgl/stw_framebuffer.c | 0 .../state_trackers}/wgl/stw_framebuffer.h | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_icd.c | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_icd.h | 0 .../state_trackers}/wgl/stw_pixelformat.c | 0 .../state_trackers}/wgl/stw_pixelformat.h | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_quirks.c | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_wgl.c | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_wgl.h | 0 .../state_trackers}/wgl/stw_wgl_arbextensionsstring.c | 0 .../state_trackers}/wgl/stw_wgl_arbextensionsstring.h | 0 .../state_trackers}/wgl/stw_wgl_arbmultisample.c | 0 .../state_trackers}/wgl/stw_wgl_arbmultisample.h | 0 .../state_trackers}/wgl/stw_wgl_arbpixelformat.c | 0 .../state_trackers}/wgl/stw_wgl_arbpixelformat.h | 0 .../state_trackers}/wgl/stw_wgl_context.c | 0 .../state_trackers}/wgl/stw_wgl_context.h | 0 .../state_trackers}/wgl/stw_wgl_getprocaddress.c | 0 .../state_trackers}/wgl/stw_wgl_pixelformat.c | 0 .../state_trackers}/wgl/stw_wgl_swapbuffers.c | 0 .../state_tracker => gallium/state_trackers}/wgl/stw_winsys.h | 0 src/mesa/SConscript | 2 -- 27 files changed, 3 insertions(+), 2 deletions(-) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/SConscript (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/opengl32.def (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_device.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_device.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_framebuffer.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_framebuffer.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_icd.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_icd.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_pixelformat.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_pixelformat.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_quirks.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbextensionsstring.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbextensionsstring.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbmultisample.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbmultisample.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbpixelformat.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_arbpixelformat.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_context.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_context.h (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_getprocaddress.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_pixelformat.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_wgl_swapbuffers.c (100%) rename src/{mesa/state_tracker => gallium/state_trackers}/wgl/stw_winsys.h (100%) diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 6a3e7e77ed8..9e4596a647f 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -27,3 +27,6 @@ for driver in env['drivers']: SConscript(os.path.join('drivers', driver, 'SConscript')) SConscript('state_trackers/python/SConscript') + +if platform == 'windows': + SConscript('state_trackers/wgl/SConscript') diff --git a/src/mesa/state_tracker/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript similarity index 100% rename from src/mesa/state_tracker/wgl/SConscript rename to src/gallium/state_trackers/wgl/SConscript diff --git a/src/mesa/state_tracker/wgl/opengl32.def b/src/gallium/state_trackers/wgl/opengl32.def similarity index 100% rename from src/mesa/state_tracker/wgl/opengl32.def rename to src/gallium/state_trackers/wgl/opengl32.def diff --git a/src/mesa/state_tracker/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_device.c rename to src/gallium/state_trackers/wgl/stw_device.c diff --git a/src/mesa/state_tracker/wgl/stw_device.h b/src/gallium/state_trackers/wgl/stw_device.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_device.h rename to src/gallium/state_trackers/wgl/stw_device.h diff --git a/src/mesa/state_tracker/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/stw_framebuffer.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_framebuffer.c rename to src/gallium/state_trackers/wgl/stw_framebuffer.c diff --git a/src/mesa/state_tracker/wgl/stw_framebuffer.h b/src/gallium/state_trackers/wgl/stw_framebuffer.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_framebuffer.h rename to src/gallium/state_trackers/wgl/stw_framebuffer.h diff --git a/src/mesa/state_tracker/wgl/stw_icd.c b/src/gallium/state_trackers/wgl/stw_icd.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_icd.c rename to src/gallium/state_trackers/wgl/stw_icd.c diff --git a/src/mesa/state_tracker/wgl/stw_icd.h b/src/gallium/state_trackers/wgl/stw_icd.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_icd.h rename to src/gallium/state_trackers/wgl/stw_icd.h diff --git a/src/mesa/state_tracker/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/stw_pixelformat.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_pixelformat.c rename to src/gallium/state_trackers/wgl/stw_pixelformat.c diff --git a/src/mesa/state_tracker/wgl/stw_pixelformat.h b/src/gallium/state_trackers/wgl/stw_pixelformat.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_pixelformat.h rename to src/gallium/state_trackers/wgl/stw_pixelformat.h diff --git a/src/mesa/state_tracker/wgl/stw_quirks.c b/src/gallium/state_trackers/wgl/stw_quirks.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_quirks.c rename to src/gallium/state_trackers/wgl/stw_quirks.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/stw_wgl.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl.c rename to src/gallium/state_trackers/wgl/stw_wgl.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl.h b/src/gallium/state_trackers/wgl/stw_wgl.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl.h rename to src/gallium/state_trackers/wgl/stw_wgl.h diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.c b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.c rename to src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.h b/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbextensionsstring.h rename to src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.c b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.c rename to src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.h b/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbmultisample.h rename to src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.c b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.c rename to src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.h b/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_arbpixelformat.h rename to src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h diff --git a/src/mesa/state_tracker/wgl/stw_wgl_context.c b/src/gallium/state_trackers/wgl/stw_wgl_context.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_context.c rename to src/gallium/state_trackers/wgl/stw_wgl_context.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_context.h b/src/gallium/state_trackers/wgl/stw_wgl_context.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_context.h rename to src/gallium/state_trackers/wgl/stw_wgl_context.h diff --git a/src/mesa/state_tracker/wgl/stw_wgl_getprocaddress.c b/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_getprocaddress.c rename to src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_pixelformat.c b/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_pixelformat.c rename to src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c diff --git a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c b/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c similarity index 100% rename from src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c rename to src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c diff --git a/src/mesa/state_tracker/wgl/stw_winsys.h b/src/gallium/state_trackers/wgl/stw_winsys.h similarity index 100% rename from src/mesa/state_tracker/wgl/stw_winsys.h rename to src/gallium/state_trackers/wgl/stw_winsys.h diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 01620ee6147..a878d31dbb5 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -341,5 +341,3 @@ if env['platform'] != 'winddk': ) Export('glapi') - if platform == 'windows': - SConscript('state_tracker/wgl/SConscript') -- 2.30.2