summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/linux-dri2
-rw-r--r--configs/linux-egl2
-rw-r--r--configure.ac2
-rw-r--r--progs/egl/opengl/.gitignore (renamed from progs/egl/.gitignore)0
-rw-r--r--progs/egl/opengl/Makefile (renamed from progs/egl/Makefile)2
-rw-r--r--progs/egl/opengl/demo1.c (renamed from progs/egl/demo1.c)0
-rw-r--r--progs/egl/opengl/demo2.c (renamed from progs/egl/demo2.c)0
-rw-r--r--progs/egl/opengl/demo3.c (renamed from progs/egl/demo3.c)0
-rw-r--r--progs/egl/opengl/eglgears.c (renamed from progs/egl/eglgears.c)0
-rw-r--r--progs/egl/opengl/eglinfo.c (renamed from progs/egl/eglinfo.c)0
-rw-r--r--progs/egl/opengl/eglscreen.c (renamed from progs/egl/eglscreen.c)0
-rw-r--r--progs/egl/opengl/egltri.c (renamed from progs/egl/egltri.c)0
-rw-r--r--progs/egl/opengl/peglgears.c (renamed from progs/egl/peglgears.c)0
-rw-r--r--progs/egl/opengl/xegl_tri.c (renamed from progs/egl/xegl_tri.c)0
-rw-r--r--progs/egl/opengl/xeglgears.c (renamed from progs/egl/xeglgears.c)0
-rw-r--r--progs/egl/opengl/xeglthreads.c (renamed from progs/egl/xeglthreads.c)0
16 files changed, 4 insertions, 4 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index e21a3e9594..9017becdaf 100644
--- 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 28165ed5b5..cd664b4171 100644
--- 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 f2e87f4d4c..5647442ea1 100644
--- 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
index 7a13d4686a..7a13d4686a 100644
--- a/progs/egl/.gitignore
+++ b/progs/egl/opengl/.gitignore
diff --git a/progs/egl/Makefile b/progs/egl/opengl/Makefile
index 890240f9a3..50a60c701d 100644
--- 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
index d892734ee5..d892734ee5 100644
--- a/progs/egl/demo1.c
+++ b/progs/egl/opengl/demo1.c
diff --git a/progs/egl/demo2.c b/progs/egl/opengl/demo2.c
index b9e92f62ac..b9e92f62ac 100644
--- a/progs/egl/demo2.c
+++ b/progs/egl/opengl/demo2.c
diff --git a/progs/egl/demo3.c b/progs/egl/opengl/demo3.c
index 64b9ee652c..64b9ee652c 100644
--- a/progs/egl/demo3.c
+++ b/progs/egl/opengl/demo3.c
diff --git a/progs/egl/eglgears.c b/progs/egl/opengl/eglgears.c
index 63490953ae..63490953ae 100644
--- a/progs/egl/eglgears.c
+++ b/progs/egl/opengl/eglgears.c
diff --git a/progs/egl/eglinfo.c b/progs/egl/opengl/eglinfo.c
index 961fd9ccc7..961fd9ccc7 100644
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/opengl/eglinfo.c
diff --git a/progs/egl/eglscreen.c b/progs/egl/opengl/eglscreen.c
index 520f76ea03..520f76ea03 100644
--- a/progs/egl/eglscreen.c
+++ b/progs/egl/opengl/eglscreen.c
diff --git a/progs/egl/egltri.c b/progs/egl/opengl/egltri.c
index 006e06eb03..006e06eb03 100644
--- a/progs/egl/egltri.c
+++ b/progs/egl/opengl/egltri.c
diff --git a/progs/egl/peglgears.c b/progs/egl/opengl/peglgears.c
index 212d1acf69..212d1acf69 100644
--- a/progs/egl/peglgears.c
+++ b/progs/egl/opengl/peglgears.c
diff --git a/progs/egl/xegl_tri.c b/progs/egl/opengl/xegl_tri.c
index 1f1a005a21..1f1a005a21 100644
--- a/progs/egl/xegl_tri.c
+++ b/progs/egl/opengl/xegl_tri.c
diff --git a/progs/egl/xeglgears.c b/progs/egl/opengl/xeglgears.c
index a6a977d9ff..a6a977d9ff 100644
--- a/progs/egl/xeglgears.c
+++ b/progs/egl/opengl/xeglgears.c
diff --git a/progs/egl/xeglthreads.c b/progs/egl/opengl/xeglthreads.c
index 5787faecb9..5787faecb9 100644
--- a/progs/egl/xeglthreads.c
+++ b/progs/egl/opengl/xeglthreads.c