From 3c967a920718c2a74996ac23b8c1964915db88c2 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 22 Jan 2010 16:31:43 +0800 Subject: [PATCH] st/egl_g3d: Rename to st/egl. Simply the name to egl. --- configs/linux-dri | 2 +- configs/linux-opengl-es | 4 ++-- configure.ac | 8 ++++---- docs/egl.html | 15 +++++++-------- docs/opengles.html | 2 +- docs/openvg.html | 2 +- .../state_trackers/{egl_g3d => egl}/Makefile | 0 .../{egl_g3d => egl}/common/egl_g3d.c | 0 .../{egl_g3d => egl}/common/egl_g3d.h | 0 .../{egl_g3d => egl}/common/egl_st.c | 0 .../{egl_g3d => egl}/common/egl_st.h | 0 .../{egl_g3d => egl}/common/native.h | 0 .../{egl_g3d => egl}/common/st_public_tmp.h | 0 .../{egl_g3d => egl}/kms/native_kms.c | 0 .../{egl_g3d => egl}/kms/native_kms.h | 0 .../{egl_g3d => egl}/x11/native_dri2.c | 0 .../{egl_g3d => egl}/x11/native_x11.c | 0 .../{egl_g3d => egl}/x11/native_x11.h | 0 .../{egl_g3d => egl}/x11/native_ximage.c | 0 .../{egl_g3d => egl}/x11/sw_winsys.c | 0 .../{egl_g3d => egl}/x11/sw_winsys.h | 0 .../{egl_g3d => egl}/x11/x11_screen.c | 0 .../{egl_g3d => egl}/x11/x11_screen.h | 0 .../winsys/drm/{Makefile.egl_g3d => Makefile.egl} | 6 +++--- .../winsys/drm/i965/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/i965/{egl_g3d => egl}/dummy.c | 0 .../winsys/drm/intel/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/intel/{egl_g3d => egl}/dummy.c | 0 .../winsys/drm/nouveau/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/nouveau/{egl_g3d => egl}/dummy.c | 0 .../winsys/drm/radeon/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/radeon/{egl_g3d => egl}/dummy.c | 0 .../winsys/drm/swrast/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/swrast/{egl_g3d => egl}/dummy.c | 0 .../winsys/drm/vmware/{egl_g3d => egl}/Makefile | 2 +- .../winsys/drm/vmware/{egl_g3d => egl}/dummy.c | 0 36 files changed, 25 insertions(+), 26 deletions(-) rename src/gallium/state_trackers/{egl_g3d => egl}/Makefile (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/egl_g3d.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/egl_g3d.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/egl_st.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/egl_st.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/native.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/common/st_public_tmp.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/kms/native_kms.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/kms/native_kms.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/native_dri2.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/native_x11.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/native_x11.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/native_ximage.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/sw_winsys.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/sw_winsys.h (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/x11_screen.c (100%) rename src/gallium/state_trackers/{egl_g3d => egl}/x11/x11_screen.h (100%) rename src/gallium/winsys/drm/{Makefile.egl_g3d => Makefile.egl} (91%) rename src/gallium/winsys/drm/i965/{egl_g3d => egl}/Makefile (92%) rename src/gallium/winsys/drm/i965/{egl_g3d => egl}/dummy.c (100%) rename src/gallium/winsys/drm/intel/{egl_g3d => egl}/Makefile (92%) rename src/gallium/winsys/drm/intel/{egl_g3d => egl}/dummy.c (100%) rename src/gallium/winsys/drm/nouveau/{egl_g3d => egl}/Makefile (95%) rename src/gallium/winsys/drm/nouveau/{egl_g3d => egl}/dummy.c (100%) rename src/gallium/winsys/drm/radeon/{egl_g3d => egl}/Makefile (92%) rename src/gallium/winsys/drm/radeon/{egl_g3d => egl}/dummy.c (100%) rename src/gallium/winsys/drm/swrast/{egl_g3d => egl}/Makefile (89%) rename src/gallium/winsys/drm/swrast/{egl_g3d => egl}/dummy.c (100%) rename src/gallium/winsys/drm/vmware/{egl_g3d => egl}/Makefile (91%) rename src/gallium/winsys/drm/vmware/{egl_g3d => egl}/dummy.c (100%) diff --git a/configs/linux-dri b/configs/linux-dri index feb2bba3a00..95f77ade1dd 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -61,7 +61,7 @@ DRIVER_DIRS = dri WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = drm GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 -GALLIUM_STATE_TRACKERS_DIRS = egl_g3d +GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \ savage sis tdfx unichrome ffb swrast diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index af784551a71..259c26a931b 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -9,7 +9,7 @@ LIB_DIR = lib SRC_DIRS = egl glsl mesa/es gallium gallium/winsys PROGRAM_DIRS = es1/screen es1/xegl es2/xegl -# egl_g3d needs this +# egl st needs this DEFINES += -DGLX_DIRECT_RENDERING # no mesa or egl drivers @@ -23,6 +23,6 @@ GALLIUM_STATE_TRACKERS_DIRS = es # build egl_x11_{swrast,i915}.so GALLIUM_DRIVERS_DIRS += trace i915 -GALLIUM_STATE_TRACKERS_DIRS += egl_g3d +GALLIUM_STATE_TRACKERS_DIRS += egl GALLIUM_WINSYS_DIRS += drm GALLIUM_WINSYS_DRM_DIRS += intel swrast diff --git a/configure.ac b/configure.ac index d6e32f590aa..370bd1b9b7f 100644 --- a/configure.ac +++ b/configure.ac @@ -1165,7 +1165,7 @@ yes) dri) GALLIUM_STATE_TRACKERS_DIRS="dri" if test "x$enable_egl" = xyes; then - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl_g3d" + GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl" fi # Have only tested st/xorg on 1.6.0 servers PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0], @@ -1182,9 +1182,9 @@ yes) AC_MSG_ERROR([state tracker '$tracker' doesn't exist]) case "$tracker" in - egl_g3d) + egl) if test "x$enable_egl" != xyes; then - AC_MSG_ERROR([cannot build egl_g3d state tracker without EGL library]) + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) fi ;; xorg) @@ -1223,7 +1223,7 @@ yes) # verify the requested driver directories exist egl_displays=`IFS=', '; echo $with_egl_displays` for dpy in $egl_displays; do - test -d "$srcdir/src/gallium/state_trackers/egl_g3d/$dpy" || \ + test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \ AC_MSG_ERROR([EGL display '$dpy' does't exist]) done EGL_DISPLAYS="$egl_displays" diff --git a/docs/egl.html b/docs/egl.html index efc7b1ed3aa..08825989669 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -32,10 +32,10 @@ cards.

the Gallium driver for your hardware. For example

-  $ ./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.

+that a number of EGL drivers depend on the 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