Mesa (master): st/egl_g3d: Rename to st/egl.
Chia-I Wu
olv at kemper.freedesktop.org
Fri Jan 22 08:50:15 UTC 2010
Module: Mesa
Branch: master
Commit: 3c967a920718c2a74996ac23b8c1964915db88c2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c967a920718c2a74996ac23b8c1964915db88c2
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Fri Jan 22 16:31:43 2010 +0800
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/{i965/egl_g3d => intel/egl}/dummy.c | 0
src/gallium/winsys/drm/intel/egl_g3d/dummy.c | 1 -
.../winsys/drm/nouveau/{egl_g3d => egl}/Makefile | 2 +-
.../drm/{i965/egl_g3d => nouveau/egl}/dummy.c | 0
src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c | 1 -
.../winsys/drm/radeon/{egl_g3d => egl}/Makefile | 2 +-
.../drm/{i965/egl_g3d => radeon/egl}/dummy.c | 0
src/gallium/winsys/drm/radeon/egl_g3d/dummy.c | 1 -
.../winsys/drm/swrast/{egl_g3d => egl}/Makefile | 2 +-
.../drm/{i965/egl_g3d => swrast/egl}/dummy.c | 0
src/gallium/winsys/drm/swrast/egl_g3d/dummy.c | 1 -
.../winsys/drm/vmware/{egl_g3d => egl}/Makefile | 2 +-
.../drm/{i965/egl_g3d => vmware/egl}/dummy.c | 0
src/gallium/winsys/drm/vmware/egl_g3d/dummy.c | 1 -
41 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/configs/linux-dri b/configs/linux-dri
index feb2bba..95f77ad 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 af78455..259c26a 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 d6e32f5..370bd1b 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 efc7b1e..0882598 100644
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -32,10 +32,10 @@ cards.</p>
the Gallium driver for your hardware. For example</p>
<pre>
- $ ./configure --with-state-trackers=egl_g3d,es,vega --enable-gallium-intel
+ $ ./configure --with-state-trackers=egl,es,vega --enable-gallium-intel
</pre>
-<p>The main library will be enabled by default. The <code>egl_g3d</code> state
+<p>The main library will be enabled by default. The <code>egl</code> state
tracker is needed by a number of EGL drivers. EGL drivers will be covered
later. The <a href="opengles.html">es state tracker</a> provides OpenGL ES 1.x
and 2.x and the <a href="openvg.html">vega state tracker</a> provides OpenVG
@@ -77,9 +77,8 @@ bare KMS (kernel modesetting).</p>
<p>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 <code>egl_g3d</code> state tracker.
-They will <em>not</em> be built without the <code>egl_g3d</code> state
-tracker.</p>
+that a number of EGL drivers depend on the <code>egl</code> state tracker.
+They will <em>not</em> be built without the <code>egl</code> state tracker.</p>
</li>
@@ -160,7 +159,7 @@ variable to true forces the use of software rendering.</p>
<p>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 <code>egl_g3d</code> state
+than the classic ones. These drivers depend on the <code>egl</code> state
tracker to build. The available drivers are</p>
<ul>
@@ -218,8 +217,8 @@ runtime.</p>
<h2>Developers</h2>
The sources of the main library and the classic drivers can be found at
-<code>src/egl/</code>. The sources of the <code>egl_g3d</code> state tracker
-can be found at <code>src/gallium/state_trackers/egl_g3d/</code>.
+<code>src/egl/</code>. The sources of the <code>egl</code> state tracker can
+be found at <code>src/gallium/state_trackers/egl/</code>.
<h3>TODOs</h3>
diff --git a/docs/opengles.html b/docs/opengles.html
index a871e85..fc41e67 100644
--- a/docs/opengles.html
+++ b/docs/opengles.html
@@ -20,7 +20,7 @@ for more information about EGL.</p>
<h2>Build the Libraries</h2>
<ol>
-<li>Run <code>configure</code> with <code>--with-state-trackers=egl_g3d,es</code> and enable the Gallium driver for your hardware.</li>
+<li>Run <code>configure</code> with <code>--with-state-trackers=egl,es</code> and enable the Gallium driver for your hardware.</li>
<li>Build and install Mesa as usual.</li>
</ol>
diff --git a/docs/openvg.html b/docs/openvg.html
index cd39b13..cdf6b57 100644
--- a/docs/openvg.html
+++ b/docs/openvg.html
@@ -34,7 +34,7 @@ Please refer to <a href="egl.html">Mesa EGL</a> for more information about EGL.
<h3>Sample build</h3>
A sample build looks as follows:
<pre>
- $ ./configure --with-state-trackers=egl_g3d,vega --enable-gallium-intel
+ $ ./configure --with-state-trackers=egl,vega --enable-gallium-intel
$ make
$ make install
</pre>
diff --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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/i965/egl/dummy.c
similarity index 100%
copy from src/gallium/winsys/drm/i965/egl_g3d/dummy.c
copy 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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/intel/egl/dummy.c
similarity index 100%
copy from src/gallium/winsys/drm/i965/egl_g3d/dummy.c
copy to src/gallium/winsys/drm/intel/egl/dummy.c
diff --git a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c b/src/gallium/winsys/drm/intel/egl_g3d/dummy.c
deleted file mode 100644
index 4a1bc28..0000000
--- a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* mklib expects at least one object file */
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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/nouveau/egl/dummy.c
similarity index 100%
copy from src/gallium/winsys/drm/i965/egl_g3d/dummy.c
copy to src/gallium/winsys/drm/nouveau/egl/dummy.c
diff --git a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c b/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c
deleted file mode 100644
index 4a1bc28..0000000
--- a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* mklib expects at least one object file */
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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/radeon/egl/dummy.c
similarity index 100%
copy from src/gallium/winsys/drm/i965/egl_g3d/dummy.c
copy to src/gallium/winsys/drm/radeon/egl/dummy.c
diff --git a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c b/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c
deleted file mode 100644
index 4a1bc28..0000000
--- a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* mklib expects at least one object file */
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/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/swrast/egl/dummy.c
similarity index 100%
copy from src/gallium/winsys/drm/i965/egl_g3d/dummy.c
copy to src/gallium/winsys/drm/swrast/egl/dummy.c
diff --git a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c b/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c
deleted file mode 100644
index 4a1bc28..0000000
--- a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* mklib expects at least one object file */
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
diff --git a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c b/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c
deleted file mode 100644
index 4a1bc28..0000000
--- a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* mklib expects at least one object file */
More information about the mesa-commit
mailing list