summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
Diffstat (limited to 'progs')
-rw-r--r--progs/egl/eglinfo.c15
-rw-r--r--progs/egl/xeglgears.c99
-rw-r--r--progs/tests/vpeval.c5
-rw-r--r--progs/tests/vptest1.c5
-rw-r--r--progs/tests/vptest2.c6
-rw-r--r--progs/tests/vptest3.c5
6 files changed, 106 insertions, 29 deletions
diff --git a/progs/egl/eglinfo.c b/progs/egl/eglinfo.c
index 9664667a68..37bc22e9fd 100644
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/eglinfo.c
@@ -37,6 +37,10 @@
#define MAX_MODES 1000
#define MAX_SCREENS 10
+/* These are X visual types, so if you're running eglinfo under
+ * something not X, they probably don't make sense. */
+static const char *vnames[] = { "SG", "GS", "SC", "PC", "TC", "DC" };
+
/**
* Print table of all available configurations.
*/
@@ -49,15 +53,15 @@ PrintConfigs(EGLDisplay d)
eglGetConfigs(d, configs, MAX_CONFIGS, &numConfigs);
printf("Configurations:\n");
- printf(" bf lv colorbuffer dp st ms vis cav bi renderable supported\n");
- printf(" id sz l r g b a th cl ns b id eat nd gl es es2 vg surfaces \n");
+ printf(" bf lv colorbuffer dp st ms vis cav bi renderable supported\n");
+ printf(" id sz l r g b a th cl ns b id eat nd gl es es2 vg surfaces \n");
printf("---------------------------------------------------------------------\n");
for (i = 0; i < numConfigs; i++) {
EGLint id, size, level;
EGLint red, green, blue, alpha;
EGLint depth, stencil;
EGLint renderable, surfaces;
- EGLint vid, caveat, bindRgb, bindRgba;
+ EGLint vid, vtype, caveat, bindRgb, bindRgba;
EGLint samples, sampleBuffers;
char surfString[100] = "";
@@ -72,6 +76,7 @@ PrintConfigs(EGLDisplay d)
eglGetConfigAttrib(d, configs[i], EGL_DEPTH_SIZE, &depth);
eglGetConfigAttrib(d, configs[i], EGL_STENCIL_SIZE, &stencil);
eglGetConfigAttrib(d, configs[i], EGL_NATIVE_VISUAL_ID, &vid);
+ eglGetConfigAttrib(d, configs[i], EGL_NATIVE_VISUAL_TYPE, &vtype);
eglGetConfigAttrib(d, configs[i], EGL_CONFIG_CAVEAT, &caveat);
eglGetConfigAttrib(d, configs[i], EGL_BIND_TO_TEXTURE_RGB, &bindRgb);
@@ -95,11 +100,11 @@ PrintConfigs(EGLDisplay d)
if (strlen(surfString) > 0)
surfString[strlen(surfString) - 1] = 0;
- printf("0x%02x %2d %2d %2d %2d %2d %2d %2d %2d %2d%2d 0x%03x ",
+ printf("0x%02x %2d %2d %2d %2d %2d %2d %2d %2d %2d%2d 0x%02x%s ",
id, size, level,
red, green, blue, alpha,
depth, stencil,
- samples, sampleBuffers, vid);
+ samples, sampleBuffers, vid, vtype < 6 ? vnames[vtype] : "--");
printf(" %c %c %c %c %c %c %s\n",
(caveat != EGL_NONE) ? 'y' : ' ',
(bindRgba) ? 'a' : (bindRgb) ? 'y' : ' ',
diff --git a/progs/egl/xeglgears.c b/progs/egl/xeglgears.c
index 9fdf474244..efb63ef3c9 100644
--- a/progs/egl/xeglgears.c
+++ b/progs/egl/xeglgears.c
@@ -237,6 +237,7 @@ gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width,
static void
draw(void)
{
+ glClearColor(0.2, 0.2, 0.2, 0.2);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glPushMatrix();
@@ -319,8 +320,6 @@ init(void)
glEndList();
glEnable(GL_NORMALIZE);
-
- glClearColor(0.2, 0.2, 0.2, 0.0);
}
@@ -529,6 +528,43 @@ egl_manager_destroy(struct egl_manager *eman)
free(eman);
}
+enum { GEARS_WINDOW, GEARS_PIXMAP, GEARS_PBUFFER_COPY, GEARS_PBUFFER_TEXTURE };
+
+static void
+texture_gears(struct egl_manager *eman)
+{
+ static const GLint verts[12] =
+ { -5, -6, -10, 5, -6, -10, -5, 4, 10, 5, 4, 10 };
+ static const GLint tex_coords[8] = { 0, 0, 1, 0, 0, 1, 1, 1 };
+ static const GLuint indices[4] = { 0, 1, 2, 3 };
+
+ eglMakeCurrent(eman->dpy, eman->pix, eman->pix, eman->ctx);
+
+ glClearColor(0, 0, 0, 0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_REPEAT);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+ glVertexPointer(3, GL_INT, 0, verts);
+ glTexCoordPointer(2, GL_INT, 0, tex_coords);
+
+ eglBindTexImage(eman->dpy, eman->pbuf, EGL_BACK_BUFFER);
+
+ glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_INT, indices);
+
+ glDisableClientState(GL_VERTEX_ARRAY);
+ glDisableClientState(GL_COLOR_ARRAY);
+ glDisable(GL_TEXTURE_2D);
+
+ eglReleaseTexImage(eman->dpy, eman->pbuf, EGL_BACK_BUFFER);
+}
+
static void
event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
{
@@ -597,17 +633,25 @@ event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
if (angle > 3600.0)
angle -= 3600.0;
+ if (surface_type == GEARS_PBUFFER_TEXTURE)
+ eglMakeCurrent(eman->dpy, eman->pbuf, eman->pbuf, eman->ctx);
+
draw();
switch (surface_type) {
- case EGL_WINDOW_BIT:
+ case GEARS_WINDOW:
eglSwapBuffers(eman->dpy, eman->win);
break;
- case EGL_PBUFFER_BIT:
- eglWaitClient();
- if (!eglCopyBuffers(eman->dpy, eman->pbuf, eman->xpix))
- break;
+ case GEARS_PBUFFER_TEXTURE:
+ case GEARS_PBUFFER_COPY:
+ if (surface_type == GEARS_PBUFFER_TEXTURE) {
+ texture_gears(eman);
+ } else {
+ if (!eglCopyBuffers(eman->dpy, eman->pbuf, eman->xpix))
+ break;
+ }
+ eglWaitClient();
/* fall through */
- case EGL_PIXMAP_BIT:
+ case GEARS_PIXMAP:
eglWaitClient();
for (x = 0; x < w; x += orig_w) {
for (y = 0; y < h; y += orig_h) {
@@ -645,7 +689,8 @@ usage(void)
printf(" -fullscreen run in fullscreen mode\n");
printf(" -info display OpenGL renderer info\n");
printf(" -pixmap use pixmap surface\n");
- printf(" -pbuffer use pbuffer surface\n");
+ printf(" -pbuffer-copy use pbuffer surface and eglCopyBuffers\n");
+ printf(" -pbuffer-texture use pbuffer surface and eglBindTexImage\n");
}
@@ -657,7 +702,7 @@ main(int argc, char *argv[])
char *dpyName = NULL;
struct egl_manager *eman;
EGLint attribs[] = {
- EGL_SURFACE_TYPE, 0, /* filled later */
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT, /* may be changed later */
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
@@ -666,7 +711,7 @@ main(int argc, char *argv[])
EGL_NONE
};
char win_title[] = "xeglgears (window/pixmap/pbuffer)";
- EGLint surface_type = EGL_WINDOW_BIT;
+ EGLint surface_type = GEARS_WINDOW;
GLboolean printInfo = GL_FALSE;
GLboolean fullscreen = GL_FALSE;
EGLBoolean ret;
@@ -684,10 +729,16 @@ main(int argc, char *argv[])
fullscreen = GL_TRUE;
}
else if (strcmp(argv[i], "-pixmap") == 0) {
- surface_type = EGL_PIXMAP_BIT;
+ surface_type = GEARS_PIXMAP;
+ attribs[1] = EGL_PIXMAP_BIT;
}
- else if (strcmp(argv[i], "-pbuffer") == 0) {
- surface_type = EGL_PBUFFER_BIT;
+ else if (strcmp(argv[i], "-pbuffer-copy") == 0) {
+ surface_type = GEARS_PBUFFER_COPY;
+ attribs[1] = EGL_PBUFFER_BIT;
+ }
+ else if (strcmp(argv[i], "-pbuffer-texture") == 0) {
+ surface_type = GEARS_PBUFFER_TEXTURE;
+ attribs[1] = EGL_PBUFFER_BIT;
}
else {
usage();
@@ -695,9 +746,6 @@ main(int argc, char *argv[])
}
}
- /* set surface type */
- attribs[1] = surface_type;
-
x_dpy = XOpenDisplay(dpyName);
if (!x_dpy) {
printf("Error: couldn't open display %s\n",
@@ -714,18 +762,18 @@ main(int argc, char *argv[])
}
snprintf(win_title, sizeof(win_title), "xeglgears (%s)",
- (surface_type == EGL_WINDOW_BIT) ? "window" :
- (surface_type == EGL_PIXMAP_BIT) ? "pixmap" : "pbuffer");
+ (surface_type == GEARS_WINDOW) ? "window" :
+ (surface_type == GEARS_PIXMAP) ? "pixmap" : "pbuffer");
/* create surface(s) */
switch (surface_type) {
- case EGL_WINDOW_BIT:
+ case GEARS_WINDOW:
ret = egl_manager_create_window(eman, win_title, winWidth, winHeight,
EGL_TRUE, fullscreen, NULL);
if (ret)
ret = eglMakeCurrent(eman->dpy, eman->win, eman->win, eman->ctx);
break;
- case EGL_PIXMAP_BIT:
+ case GEARS_PIXMAP:
ret = (egl_manager_create_window(eman, win_title, winWidth, winHeight,
EGL_FALSE, fullscreen, NULL) &&
egl_manager_create_pixmap(eman, eman->xwin,
@@ -733,17 +781,20 @@ main(int argc, char *argv[])
if (ret)
ret = eglMakeCurrent(eman->dpy, eman->pix, eman->pix, eman->ctx);
break;
- case EGL_PBUFFER_BIT:
+ case GEARS_PBUFFER_TEXTURE:
+ case GEARS_PBUFFER_COPY:
{
EGLint pbuf_attribs[] = {
EGL_WIDTH, winWidth,
EGL_HEIGHT, winHeight,
+ EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGB,
+ EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
EGL_NONE
};
ret = (egl_manager_create_window(eman, win_title, winWidth, winHeight,
- EGL_FALSE, fullscreen, NULL) &&
+ EGL_FALSE, fullscreen, NULL) &&
egl_manager_create_pixmap(eman, eman->xwin,
- EGL_FALSE, NULL) &&
+ EGL_TRUE, NULL) &&
egl_manager_create_pbuffer(eman, pbuf_attribs));
if (ret)
ret = eglMakeCurrent(eman->dpy, eman->pbuf, eman->pbuf, eman->ctx);
diff --git a/progs/tests/vpeval.c b/progs/tests/vpeval.c
index 3e8a732df5..a4024b5336 100644
--- a/progs/tests/vpeval.c
+++ b/progs/tests/vpeval.c
@@ -145,6 +145,11 @@ myinit(int argc, char *argv[])
printf("Using vertex program attribs? %s\n", program ? "yes" : "no");
+ if (program && !glutExtensionSupported("GL_NV_vertex_program")) {
+ printf("Sorry, this requires GL_NV_vertex_program\n");
+ exit(1);
+ }
+
if (!program) {
glMap2f(GL_MAP2_VERTEX_4,
0.0, 1.0, 4, 4,
diff --git a/progs/tests/vptest1.c b/progs/tests/vptest1.c
index 6e32b03346..d83f9cae37 100644
--- a/progs/tests/vptest1.c
+++ b/progs/tests/vptest1.c
@@ -113,6 +113,11 @@ static void Init( void )
GLuint progs[5];
+ if (!glutExtensionSupported("GL_NV_vertex_program")) {
+ printf("Sorry, this program requires GL_NV_vertex_program\n");
+ exit(1);
+ }
+
glGenProgramsNV(2, progs);
assert(progs[0]);
assert(progs[1]);
diff --git a/progs/tests/vptest2.c b/progs/tests/vptest2.c
index 4161b03a67..89cd6b1458 100644
--- a/progs/tests/vptest2.c
+++ b/progs/tests/vptest2.c
@@ -144,6 +144,12 @@ int main( int argc, char *argv[] )
glutReshapeFunc( Reshape );
glutKeyboardFunc( Key );
glutDisplayFunc( Display );
+
+ if (!glutExtensionSupported("GL_NV_vertex_program")) {
+ printf("Sorry, this program requires GL_NV_vertex_program\n");
+ exit(1);
+ }
+
Test1();
Test2();
Test3();
diff --git a/progs/tests/vptest3.c b/progs/tests/vptest3.c
index 4e4bfee31d..58ce227e6e 100644
--- a/progs/tests/vptest3.c
+++ b/progs/tests/vptest3.c
@@ -93,6 +93,11 @@ static void Init( void )
#endif
"END\n";
+ if (!glutExtensionSupported("GL_NV_vertex_program")) {
+ printf("Sorry, this program requires GL_NV_vertex_program\n");
+ exit(1);
+ }
+
glLoadProgramNV(GL_VERTEX_PROGRAM_NV, 1,
strlen(prog1),
(const GLubyte *) prog1);
generated by cgit v1.2.3 (git 2.51.0) at 2025-12-16 03:34:39 +0000