From: Chia-I Wu Date: Thu, 1 Apr 2010 05:43:33 +0000 (+0800) Subject: progs/es: Move OpenGL ES demos to subdirectories of progs/egl. X-Git-Tag: android-x86-2.2~5290 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f231cab2b7c13ba70d6aa694f74b6d6eee6470f;p=android-x86%2Fexternal-mesa.git progs/es: Move OpenGL ES demos to subdirectories of progs/egl. Move progs/es1/xegl -> progs/egl/opengles1, progs/es1/screen -> progs/egl/opengles1/screen, progs/es2/xegl -> progs/egl/opengles2. --- diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index 32fe40fb848..ead47136f4a 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -7,7 +7,7 @@ CONFIG_NAME = linux-opengl-es # Directories to build LIB_DIR = lib SRC_DIRS = egl glsl mesa/es gallium gallium/winsys gallium/targets -PROGRAM_DIRS = es1/screen es1/xegl es2/xegl +PROGRAM_DIRS = egl/opengles1 egl/opengles2 # egl st needs this DEFINES += -DGLX_DIRECT_RENDERING diff --git a/progs/egl/opengles1/.gitignore b/progs/egl/opengles1/.gitignore new file mode 100644 index 00000000000..8c1c9a8ef98 --- /dev/null +++ b/progs/egl/opengles1/.gitignore @@ -0,0 +1,11 @@ +screen/gears +screen/tri +bindtex +drawtex +es1_info +msaa +pbuffer +render_tex +torus +tri +two_win diff --git a/progs/es1/xegl/Makefile b/progs/egl/opengles1/Makefile similarity index 97% rename from progs/es1/xegl/Makefile rename to progs/egl/opengles1/Makefile index 6869c443065..0dd47edf1b3 100644 --- a/progs/es1/xegl/Makefile +++ b/progs/egl/opengles1/Makefile @@ -1,4 +1,4 @@ -# progs/es1/xegl/Makefile +# progs/egl/opengles1/Makefile TOP = ../../.. include $(TOP)/configs/current diff --git a/progs/es1/xegl/bindtex.c b/progs/egl/opengles1/bindtex.c similarity index 100% rename from progs/es1/xegl/bindtex.c rename to progs/egl/opengles1/bindtex.c diff --git a/progs/es1/xegl/drawtex.c b/progs/egl/opengles1/drawtex.c similarity index 100% rename from progs/es1/xegl/drawtex.c rename to progs/egl/opengles1/drawtex.c diff --git a/progs/es1/xegl/es1_info.c b/progs/egl/opengles1/es1_info.c similarity index 100% rename from progs/es1/xegl/es1_info.c rename to progs/egl/opengles1/es1_info.c diff --git a/progs/es1/xegl/msaa.c b/progs/egl/opengles1/msaa.c similarity index 100% rename from progs/es1/xegl/msaa.c rename to progs/egl/opengles1/msaa.c diff --git a/progs/es1/xegl/pbuffer.c b/progs/egl/opengles1/pbuffer.c similarity index 100% rename from progs/es1/xegl/pbuffer.c rename to progs/egl/opengles1/pbuffer.c diff --git a/progs/es1/xegl/render_tex.c b/progs/egl/opengles1/render_tex.c similarity index 100% rename from progs/es1/xegl/render_tex.c rename to progs/egl/opengles1/render_tex.c diff --git a/progs/es1/screen/Makefile b/progs/egl/opengles1/screen/Makefile similarity index 90% rename from progs/es1/screen/Makefile rename to progs/egl/opengles1/screen/Makefile index 4ba2f9a7dc1..5b2a59c71ca 100644 --- a/progs/es1/screen/Makefile +++ b/progs/egl/opengles1/screen/Makefile @@ -1,6 +1,6 @@ -# progs/es1/screen/Makefile +# progs/egl/opengles1/screen/Makefile -TOP = ../../.. +TOP = ../../../.. include $(TOP)/configs/current ES1_CFLAGS = -I$(TOP)/include diff --git a/progs/es1/screen/gears.c b/progs/egl/opengles1/screen/gears.c similarity index 100% rename from progs/es1/screen/gears.c rename to progs/egl/opengles1/screen/gears.c diff --git a/progs/es1/screen/tri.c b/progs/egl/opengles1/screen/tri.c similarity index 100% rename from progs/es1/screen/tri.c rename to progs/egl/opengles1/screen/tri.c diff --git a/progs/es1/screen/winsys.c b/progs/egl/opengles1/screen/winsys.c similarity index 100% rename from progs/es1/screen/winsys.c rename to progs/egl/opengles1/screen/winsys.c diff --git a/progs/es1/screen/winsys.h b/progs/egl/opengles1/screen/winsys.h similarity index 100% rename from progs/es1/screen/winsys.h rename to progs/egl/opengles1/screen/winsys.h diff --git a/progs/es1/xegl/torus.c b/progs/egl/opengles1/torus.c similarity index 100% rename from progs/es1/xegl/torus.c rename to progs/egl/opengles1/torus.c diff --git a/progs/es1/xegl/tri.c b/progs/egl/opengles1/tri.c similarity index 100% rename from progs/es1/xegl/tri.c rename to progs/egl/opengles1/tri.c diff --git a/progs/es1/xegl/two_win.c b/progs/egl/opengles1/two_win.c similarity index 100% rename from progs/es1/xegl/two_win.c rename to progs/egl/opengles1/two_win.c diff --git a/progs/egl/opengles2/.gitignore b/progs/egl/opengles2/.gitignore new file mode 100644 index 00000000000..6158cc6e680 --- /dev/null +++ b/progs/egl/opengles2/.gitignore @@ -0,0 +1,3 @@ +es2_info.c +es2_info +tri diff --git a/progs/es2/xegl/Makefile b/progs/egl/opengles2/Makefile similarity index 90% rename from progs/es2/xegl/Makefile rename to progs/egl/opengles2/Makefile index 5bb167c1c63..710c4d8c130 100644 --- a/progs/es2/xegl/Makefile +++ b/progs/egl/opengles2/Makefile @@ -1,4 +1,4 @@ -# progs/es2/xegl/Makefile +# progs/egl/opengles2/Makefile TOP = ../../.. include $(TOP)/configs/current @@ -33,7 +33,7 @@ default: $(PROGRAMS) -es2_info.c: ../../es1/xegl/es1_info.c +es2_info.c: ../opengles1/es1_info.c cp -f $^ $@ es2_info: es2_info.o $(ES2_LIB_DEPS) diff --git a/progs/es2/xegl/tri.c b/progs/egl/opengles2/tri.c similarity index 100% rename from progs/es2/xegl/tri.c rename to progs/egl/opengles2/tri.c diff --git a/progs/es1/.gitignore b/progs/es1/.gitignore deleted file mode 100644 index 5e29a6b5faa..00000000000 --- a/progs/es1/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -screen/gears -screen/tri -xegl/bindtex -xegl/drawtex -xegl/es1_info -xegl/msaa -xegl/pbuffer -xegl/render_tex -xegl/torus -xegl/tri -xegl/two_win diff --git a/progs/es2/.gitignore b/progs/es2/.gitignore deleted file mode 100644 index 7d5c16936c2..00000000000 --- a/progs/es2/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -xegl/es2_info.c -xegl/es2_info -xegl/tri