From: Chia-I Wu
- $ ./configure --with-state-trackers=egl_g3d,es,vega --enable-gallium-intel + $ ./configure --with-state-trackers=egl,es,vega --enable-gallium-intel-
The main library will be enabled by default. The egl_g3d
state
+
The main library will be enabled by default. The egl
state
tracker is needed by a number of EGL drivers. EGL drivers will be covered
later. The es state tracker provides OpenGL ES 1.x
and 2.x and the vega state tracker provides OpenVG
@@ -77,9 +77,8 @@ bare KMS (kernel modesetting).
The argument is a comma separated string. It is usually used to specify the
rendering APIs, like OpenGL ES or OpenVG, to build. But it should be noted
-that a number of EGL drivers depend on the egl_g3d
state tracker.
-They will not be built without the egl_g3d
state
-tracker.
egl
state tracker.
+They will not be built without the egl
state tracker.
@@ -160,7 +159,7 @@ variable to true forces the use of software rendering.
Gallium EGL drivers supports all rendering APIs specified in EGL 1.4. The
support for optional EGL functions and EGL extensions is usually more complete
-than the classic ones. These drivers depend on the egl_g3d
state
+than the classic ones. These drivers depend on the egl
state
tracker to build. The available drivers are
src/egl/
. The sources of the egl_g3d
state tracker
-can be found at src/gallium/state_trackers/egl_g3d/
.
+src/egl/
. The sources of the egl
state tracker can
+be found at src/gallium/state_trackers/egl/
.
configure
with --with-state-trackers=egl_g3d,es
and enable the Gallium driver for your hardware.configure
with --with-state-trackers=egl,es
and enable the Gallium driver for your hardware.- $ ./configure --with-state-trackers=egl_g3d,vega --enable-gallium-intel + $ ./configure --with-state-trackers=egl,vega --enable-gallium-intel $ make $ make installdiff --git a/src/gallium/state_trackers/egl_g3d/Makefile b/src/gallium/state_trackers/egl/Makefile similarity index 100% rename from src/gallium/state_trackers/egl_g3d/Makefile rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/egl_g3d.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/egl_g3d.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/egl_st.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/egl_st.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/native.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/common/st_public_tmp.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/kms/native_kms.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/kms/native_kms.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/native_dri2.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/native_x11.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/native_x11.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/native_ximage.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/sw_winsys.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/sw_winsys.h rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/x11_screen.c rename to 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 similarity index 100% rename from src/gallium/state_trackers/egl_g3d/x11/x11_screen.h rename to 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 similarity index 91% rename from src/gallium/winsys/drm/Makefile.egl_g3d rename to 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 similarity index 92% rename from src/gallium/winsys/drm/i965/egl_g3d/Makefile rename to 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/vmware/egl_g3d/dummy.c b/src/gallium/winsys/drm/i965/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/vmware/egl_g3d/dummy.c rename to 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 similarity index 92% rename from src/gallium/winsys/drm/intel/egl_g3d/Makefile rename to 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/swrast/egl_g3d/dummy.c b/src/gallium/winsys/drm/intel/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/swrast/egl_g3d/dummy.c rename to 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 similarity index 95% rename from src/gallium/winsys/drm/nouveau/egl_g3d/Makefile rename to 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/radeon/egl_g3d/dummy.c b/src/gallium/winsys/drm/nouveau/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/radeon/egl_g3d/dummy.c rename to 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 similarity index 92% rename from src/gallium/winsys/drm/radeon/egl_g3d/Makefile rename to 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/nouveau/egl_g3d/dummy.c b/src/gallium/winsys/drm/radeon/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c rename to 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 similarity index 89% rename from src/gallium/winsys/drm/swrast/egl_g3d/Makefile rename to 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/intel/egl_g3d/dummy.c b/src/gallium/winsys/drm/swrast/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/intel/egl_g3d/dummy.c rename to 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 similarity index 91% rename from src/gallium/winsys/drm/vmware/egl_g3d/Makefile rename to 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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/vmware/egl/dummy.c similarity index 100% rename from src/gallium/winsys/drm/i965/egl_g3d/dummy.c rename to src/gallium/winsys/drm/vmware/egl/dummy.c