From e82b02c7e839189bcafe6c81ae8972fe6a88dd01 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 30 Sep 2009 12:32:22 +0800 Subject: [PATCH] progs/egl: Make demo3 work again. Signed-off-by: Chia-I Wu --- progs/egl/demo3.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c index 3db9094fdd7..0665fd0516e 100644 --- a/progs/egl/demo3.c +++ b/progs/egl/demo3.c @@ -11,6 +11,7 @@ #include #include #include +#include @@ -551,15 +552,6 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height) } } -#include "../../src/egl/main/egldisplay.h" - -typedef struct fb_display -{ - _EGLDisplay Base; /* base class/object */ - void *pFB; -} fbDisplay; - - int main(int argc, char *argv[]) { @@ -571,6 +563,7 @@ main(int argc, char *argv[]) EGLModeMESA mode; EGLint numConfigs, count; EGLBoolean b; + const GLubyte *bitmap; const EGLint screenAttribs[] = { EGL_WIDTH, 1024, EGL_HEIGHT, 768, @@ -587,6 +580,11 @@ main(int argc, char *argv[]) printf("EGL version = %d.%d\n", maj, min); printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); + if (!strstr(eglQueryString(d, EGL_EXTENSIONS), + "EGL_MESA_screen_surface")) { + printf("EGL_MESA_screen_surface is not supported\n"); + exit(1); + } eglGetConfigs(d, configs, 10, &numConfigs); eglGetScreensMESA(d, &screen, 1, &count); @@ -617,17 +615,24 @@ main(int argc, char *argv[]) Init(); Reshape(1024, 768); + /* some drivers crash when rendering to front buffer */ +#if 0 glDrawBuffer( GL_FRONT ); glClearColor( 0, 1.0, 0, 1); glClear( GL_COLOR_BUFFER_BIT ); +#endif doubleBuffer = 1; glDrawBuffer( GL_BACK ); Draw(d, screen_surf); + sleep(2); - write_ppm("dump.ppm", ((struct fb_display *)_eglLookupDisplay(d))->pFB, 1024, 768); + /* TODO EGL_KHR_lock_surface */ + bitmap = NULL; + if (bitmap) + write_ppm("dump.ppm", bitmap, 1024, 768); eglDestroySurface(d, screen_surf); eglDestroyContext(d, ctx); -- 2.30.2