diff options
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/state_trackers/egl/Makefile (renamed from src/gallium/state_trackers/egl_g3d/Makefile) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_g3d.c (renamed from src/gallium/state_trackers/egl_g3d/common/egl_g3d.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_g3d.h (renamed from src/gallium/state_trackers/egl_g3d/common/egl_g3d.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_st.c (renamed from src/gallium/state_trackers/egl_g3d/common/egl_st.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_st.h (renamed from src/gallium/state_trackers/egl_g3d/common/egl_st.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/native.h (renamed from src/gallium/state_trackers/egl_g3d/common/native.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/st_public_tmp.h (renamed from src/gallium/state_trackers/egl_g3d/common/st_public_tmp.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/kms/native_kms.c (renamed from src/gallium/state_trackers/egl_g3d/kms/native_kms.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/kms/native_kms.h (renamed from src/gallium/state_trackers/egl_g3d/kms/native_kms.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/native_dri2.c (renamed from src/gallium/state_trackers/egl_g3d/x11/native_dri2.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/native_x11.c (renamed from src/gallium/state_trackers/egl_g3d/x11/native_x11.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/native_x11.h (renamed from src/gallium/state_trackers/egl_g3d/x11/native_x11.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/native_ximage.c (renamed from src/gallium/state_trackers/egl_g3d/x11/native_ximage.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/sw_winsys.c (renamed from src/gallium/state_trackers/egl_g3d/x11/sw_winsys.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/sw_winsys.h (renamed from src/gallium/state_trackers/egl_g3d/x11/sw_winsys.h) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/x11_screen.c (renamed from src/gallium/state_trackers/egl_g3d/x11/x11_screen.c) | 0 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/x11/x11_screen.h (renamed from src/gallium/state_trackers/egl_g3d/x11/x11_screen.h) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/Makefile.egl (renamed from src/gallium/winsys/drm/Makefile.egl_g3d) | 6 | ||||
-rw-r--r-- | src/gallium/winsys/drm/i965/egl/Makefile (renamed from src/gallium/winsys/drm/i965/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/i965/egl/dummy.c (renamed from src/gallium/winsys/drm/i965/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/intel/egl/Makefile (renamed from src/gallium/winsys/drm/intel/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/intel/egl/dummy.c (renamed from src/gallium/winsys/drm/intel/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/nouveau/egl/Makefile (renamed from src/gallium/winsys/drm/nouveau/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/nouveau/egl/dummy.c (renamed from src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/radeon/egl/Makefile (renamed from src/gallium/winsys/drm/radeon/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/radeon/egl/dummy.c (renamed from src/gallium/winsys/drm/radeon/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/swrast/egl/Makefile (renamed from src/gallium/winsys/drm/swrast/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/swrast/egl/dummy.c (renamed from src/gallium/winsys/drm/swrast/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/egl/Makefile (renamed from src/gallium/winsys/drm/vmware/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/egl/dummy.c (renamed from src/gallium/winsys/drm/vmware/egl_g3d/dummy.c) | 0 |
30 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/state_trackers/egl_g3d/Makefile b/src/gallium/state_trackers/egl/Makefile index b696f2f..b696f2f 100644 --- a/src/gallium/state_trackers/egl_g3d/Makefile +++ b/src/gallium/state_trackers/egl/Makefile diff --git a/src/gallium/state_trackers/egl_g3d/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c index 2ac6215..2ac6215 100644 --- a/src/gallium/state_trackers/egl_g3d/common/egl_g3d.c +++ b/src/gallium/state_trackers/egl/common/egl_g3d.c diff --git a/src/gallium/state_trackers/egl_g3d/common/egl_g3d.h b/src/gallium/state_trackers/egl/common/egl_g3d.h index 3dae8c4..3dae8c4 100644 --- a/src/gallium/state_trackers/egl_g3d/common/egl_g3d.h +++ b/src/gallium/state_trackers/egl/common/egl_g3d.h diff --git a/src/gallium/state_trackers/egl_g3d/common/egl_st.c b/src/gallium/state_trackers/egl/common/egl_st.c index a88ff91..a88ff91 100644 --- a/src/gallium/state_trackers/egl_g3d/common/egl_st.c +++ b/src/gallium/state_trackers/egl/common/egl_st.c diff --git a/src/gallium/state_trackers/egl_g3d/common/egl_st.h b/src/gallium/state_trackers/egl/common/egl_st.h index 8fb464b..8fb464b 100644 --- a/src/gallium/state_trackers/egl_g3d/common/egl_st.h +++ b/src/gallium/state_trackers/egl/common/egl_st.h diff --git a/src/gallium/state_trackers/egl_g3d/common/native.h b/src/gallium/state_trackers/egl/common/native.h index 72a9cec..72a9cec 100644 --- a/src/gallium/state_trackers/egl_g3d/common/native.h +++ b/src/gallium/state_trackers/egl/common/native.h diff --git a/src/gallium/state_trackers/egl_g3d/common/st_public_tmp.h b/src/gallium/state_trackers/egl/common/st_public_tmp.h index 507a0ec..507a0ec 100644 --- a/src/gallium/state_trackers/egl_g3d/common/st_public_tmp.h +++ b/src/gallium/state_trackers/egl/common/st_public_tmp.h diff --git a/src/gallium/state_trackers/egl_g3d/kms/native_kms.c b/src/gallium/state_trackers/egl/kms/native_kms.c index d5baf2c..d5baf2c 100644 --- a/src/gallium/state_trackers/egl_g3d/kms/native_kms.c +++ b/src/gallium/state_trackers/egl/kms/native_kms.c diff --git a/src/gallium/state_trackers/egl_g3d/kms/native_kms.h b/src/gallium/state_trackers/egl/kms/native_kms.h index 095186e..095186e 100644 --- a/src/gallium/state_trackers/egl_g3d/kms/native_kms.h +++ b/src/gallium/state_trackers/egl/kms/native_kms.h diff --git a/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c b/src/gallium/state_trackers/egl/x11/native_dri2.c index 07f82d8..07f82d8 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/native_dri2.c +++ b/src/gallium/state_trackers/egl/x11/native_dri2.c diff --git a/src/gallium/state_trackers/egl_g3d/x11/native_x11.c b/src/gallium/state_trackers/egl/x11/native_x11.c index 695ab88..695ab88 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/native_x11.c +++ b/src/gallium/state_trackers/egl/x11/native_x11.c diff --git a/src/gallium/state_trackers/egl_g3d/x11/native_x11.h b/src/gallium/state_trackers/egl/x11/native_x11.h index 622ddac..622ddac 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/native_x11.h +++ b/src/gallium/state_trackers/egl/x11/native_x11.h diff --git a/src/gallium/state_trackers/egl_g3d/x11/native_ximage.c b/src/gallium/state_trackers/egl/x11/native_ximage.c index dfa8df2..dfa8df2 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/native_ximage.c +++ b/src/gallium/state_trackers/egl/x11/native_ximage.c diff --git a/src/gallium/state_trackers/egl_g3d/x11/sw_winsys.c b/src/gallium/state_trackers/egl/x11/sw_winsys.c index 6ee3ede..6ee3ede 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/sw_winsys.c +++ b/src/gallium/state_trackers/egl/x11/sw_winsys.c diff --git a/src/gallium/state_trackers/egl_g3d/x11/sw_winsys.h b/src/gallium/state_trackers/egl/x11/sw_winsys.h index f96c5a1..f96c5a1 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/sw_winsys.h +++ b/src/gallium/state_trackers/egl/x11/sw_winsys.h diff --git a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c b/src/gallium/state_trackers/egl/x11/x11_screen.c index 76ce45e..76ce45e 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.c +++ b/src/gallium/state_trackers/egl/x11/x11_screen.c diff --git a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.h b/src/gallium/state_trackers/egl/x11/x11_screen.h index 5432858..5432858 100644 --- a/src/gallium/state_trackers/egl_g3d/x11/x11_screen.h +++ b/src/gallium/state_trackers/egl/x11/x11_screen.h diff --git a/src/gallium/winsys/drm/Makefile.egl_g3d b/src/gallium/winsys/drm/Makefile.egl index d8f4739..1b10f11 100644 --- a/src/gallium/winsys/drm/Makefile.egl_g3d +++ b/src/gallium/winsys/drm/Makefile.egl @@ -1,4 +1,4 @@ -# src/gallium/winsys/drm/Makefile.egl_g3d +# src/gallium/winsys/drm/Makefile.egl # The driver Makefile should define # @@ -13,10 +13,10 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o) common_LIBS = -ldrm -lm -ldl -x11_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglx11.a +x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes -kms_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglkms.a +kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a kms_LIBS = $(common_LIBS) ##### RULES ##### diff --git a/src/gallium/winsys/drm/i965/egl_g3d/Makefile b/src/gallium/winsys/drm/i965/egl/Makefile index dd2efe2..1c13258 100644 --- a/src/gallium/winsys/drm/i965/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/i965/egl/Makefile @@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/i965/libi965.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/i965/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/i965/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/i965/egl/dummy.c diff --git a/src/gallium/winsys/drm/intel/egl_g3d/Makefile b/src/gallium/winsys/drm/intel/egl/Makefile index cdbb680..60d675c 100644 --- a/src/gallium/winsys/drm/intel/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/intel/egl/Makefile @@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/i915/libi915.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c b/src/gallium/winsys/drm/intel/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/intel/egl/dummy.c diff --git a/src/gallium/winsys/drm/nouveau/egl_g3d/Makefile b/src/gallium/winsys/drm/nouveau/egl/Makefile index 865a5d5..8e812ac 100644 --- a/src/gallium/winsys/drm/nouveau/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/nouveau/egl/Makefile @@ -16,4 +16,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c b/src/gallium/winsys/drm/nouveau/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/nouveau/egl/dummy.c diff --git a/src/gallium/winsys/drm/radeon/egl_g3d/Makefile b/src/gallium/winsys/drm/radeon/egl/Makefile index e0de68c..cd4f9b2 100644 --- a/src/gallium/winsys/drm/radeon/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/radeon/egl/Makefile @@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/r300/libr300.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c b/src/gallium/winsys/drm/radeon/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/radeon/egl/dummy.c diff --git a/src/gallium/winsys/drm/swrast/egl_g3d/Makefile b/src/gallium/winsys/drm/swrast/egl/Makefile index f0d051e..26fe2d2 100644 --- a/src/gallium/winsys/drm/swrast/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/swrast/egl/Makefile @@ -9,4 +9,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/winsys/drm/swrast/core/libswrastdrm.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c b/src/gallium/winsys/drm/swrast/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/swrast/egl/dummy.c diff --git a/src/gallium/winsys/drm/vmware/egl_g3d/Makefile b/src/gallium/winsys/drm/vmware/egl/Makefile index 3cf7992..a3e7313 100644 --- a/src/gallium/winsys/drm/vmware/egl_g3d/Makefile +++ b/src/gallium/winsys/drm/vmware/egl/Makefile @@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/svga/libsvga.a -include ../../Makefile.egl_g3d +include ../../Makefile.egl diff --git a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c b/src/gallium/winsys/drm/vmware/egl/dummy.c index 4a1bc28..4a1bc28 100644 --- a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c +++ b/src/gallium/winsys/drm/vmware/egl/dummy.c |