progs/egl: Move demos a level deeper.

Move the demos to "opengl" subdirectory.

diff --git a/configs/linux-dri b/configs/linux-dri
index e21a3e9..9017bec 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,7 +52,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx egl $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
+PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS)
 
 # EGL directories
 EGL_DRIVERS_DIRS = glx

diff --git a/configs/linux-egl b/configs/linux-egl
index 28165ed..cd664b4 100644 (file)
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -48,7 +48,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl/opengl
 
 DRIVER_DIRS = dri
 GALLIUM_WINSYS_DIRS = egl_drm

diff --git a/configure.ac b/configure.ac
index f2e87f4..5647442 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -954,7 +954,7 @@ if test "x$enable_egl" = xyes; then
     fi
 
     if test "$with_demos" = yes; then
-        PROGRAM_DIRS="$PROGRAM_DIRS egl"
+        PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl"
     fi
 fi
 AC_SUBST([EGL_LIB_DEPS])

diff --git a/progs/egl/.gitignore b/progs/egl/opengl/.gitignore
similarity index 100%
rename from progs/egl/.gitignore
rename to progs/egl/opengl/.gitignore

diff --git a/progs/egl/Makefile b/progs/egl/opengl/Makefile
similarity index 99%
rename from progs/egl/Makefile
rename to progs/egl/opengl/Makefile
index 890240f..50a60c7 100644 (file)
--- a/progs/egl/Makefile
+++ b/progs/egl/opengl/Makefile
@@ -1,6 +1,6 @@
 # progs/egl/Makefile
 
-TOP = ../..
+TOP = ../../..
 include $(TOP)/configs/current
 
 

diff --git a/progs/egl/demo1.c b/progs/egl/opengl/demo1.c
similarity index 100%
rename from progs/egl/demo1.c
rename to progs/egl/opengl/demo1.c

diff --git a/progs/egl/demo2.c b/progs/egl/opengl/demo2.c
similarity index 100%
rename from progs/egl/demo2.c
rename to progs/egl/opengl/demo2.c

diff --git a/progs/egl/demo3.c b/progs/egl/opengl/demo3.c
similarity index 100%
rename from progs/egl/demo3.c
rename to progs/egl/opengl/demo3.c

diff --git a/progs/egl/eglgears.c b/progs/egl/opengl/eglgears.c
similarity index 100%
rename from progs/egl/eglgears.c
rename to progs/egl/opengl/eglgears.c

diff --git a/progs/egl/eglinfo.c b/progs/egl/opengl/eglinfo.c
similarity index 100%
rename from progs/egl/eglinfo.c
rename to progs/egl/opengl/eglinfo.c

diff --git a/progs/egl/eglscreen.c b/progs/egl/opengl/eglscreen.c
similarity index 100%
rename from progs/egl/eglscreen.c
rename to progs/egl/opengl/eglscreen.c

diff --git a/progs/egl/egltri.c b/progs/egl/opengl/egltri.c
similarity index 100%
rename from progs/egl/egltri.c
rename to progs/egl/opengl/egltri.c

diff --git a/progs/egl/peglgears.c b/progs/egl/opengl/peglgears.c
similarity index 100%
rename from progs/egl/peglgears.c
rename to progs/egl/opengl/peglgears.c

diff --git a/progs/egl/xegl_tri.c b/progs/egl/opengl/xegl_tri.c
similarity index 100%
rename from progs/egl/xegl_tri.c
rename to progs/egl/opengl/xegl_tri.c

diff --git a/progs/egl/xeglgears.c b/progs/egl/opengl/xeglgears.c
similarity index 100%
rename from progs/egl/xeglgears.c
rename to progs/egl/opengl/xeglgears.c

diff --git a/progs/egl/xeglthreads.c b/progs/egl/opengl/xeglthreads.c
similarity index 100%
rename from progs/egl/xeglthreads.c
rename to progs/egl/opengl/xeglthreads.c