This version integrates suggestions from Ian, like: rename eglut as a subset of glut abstract piglit-egl-gles2-framework.c for EGL/OpenGL ES 2.0, and piglit-egl-gl-framework.c for EGL/desktop OpenGL and also some minor changes Thanks --Shuang