Fix up some of the sample to work with the r200 EGL driver

diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index 6c7358400f9d72a1de611153aaeaa7faeeb907a5..2693c372054e48c08c6ce21a2b53b18fc8c54a52 100644 (file)
--- a/progs/egl/demo3.c
+++ b/progs/egl/demo3.c
@@ -576,7 +576,7 @@ main(int argc, char *argv[])
    /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
    */
-   EGLDisplay d = eglGetDisplay("!fb_dri");
+   EGLDisplay d = eglGetDisplay(":0");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {
@@ -602,7 +602,7 @@ main(int argc, char *argv[])
       printf("failed to create screen surface\n");
       return 0;
    }
-   
+
    eglShowSurfaceMESA(d, screen, screen_surf, mode);
 
    b = eglMakeCurrent(d, screen_surf, screen_surf, ctx);
@@ -610,25 +610,24 @@ main(int argc, char *argv[])
       printf("make current failed\n");
       return 0;
    }
+   glViewport(0, 0, 1024, 768);
+
 
-   Init();   
+   Init();
    Reshape(1024, 768);
 
-   glDrawBuffer( GL_FRONT ); 
-   glClearColor( 0, 
-                1.0, 
-                0,
-                1);
+   glDrawBuffer( GL_FRONT );
+   glClearColor( 0, 1.0, 0, 1);
 
-   glClear( GL_COLOR_BUFFER_BIT ); 
+   glClear( GL_COLOR_BUFFER_BIT );
 
-   doubleBuffer = 1;   
-   glDrawBuffer( GL_BACK ); 
+   doubleBuffer = 1;
+   glDrawBuffer( GL_BACK );
 
    Draw(d, screen_surf);
-   
+
    write_ppm("dump.ppm", ((struct fb_display *)_eglLookupDisplay(d))->pFB, 1024, 768);
-   
+
    eglDestroySurface(d, screen_surf);
    eglDestroyContext(d, ctx);
    eglTerminate(d);

diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c
index bd7835393e4d8f585a340eb8f79bddaaaf34ba05..0c3da565f52e0e3c1e8614ed4c20f0dbcd86739c 100644 (file)
--- a/progs/egl/eglgears.c
+++ b/progs/egl/eglgears.c
@@ -87,9 +87,9 @@ static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
 static GLint gear1, gear2, gear3;
 static GLfloat angle = 0.0;
 
-static GLfloat eyesep = 5.0;           /* Eye separation. */
-static GLfloat fix_point = 40.0;       /* Fixation point distance.  */
-static GLfloat left, right, asp;       /* Stereo frustum params.  */
+//static GLfloat eyesep = 5.0;         /* Eye separation. */
+//static GLfloat fix_point = 40.0;     /* Fixation point distance.  */
+//static GLfloat left, right, asp;     /* Stereo frustum params.  */
 
 
 /*
@@ -385,7 +385,7 @@ main(int argc, char *argv[])
        }
        
        // DBR : Create EGL context/surface etc
-       EGLDisplay d = eglGetDisplay("!fb_dri");
+       EGLDisplay d = eglGetDisplay(":0");
        assert(d);
 
        if (!eglInitialize(d, &maj, &min)) {
@@ -431,7 +431,9 @@ main(int argc, char *argv[])
        
        init();                 // Initialise the GL visual
        reshape(1024,768);
-       
+
+   glDrawBuffer( GL_BACK );
+
        // DBR : Run the simulation
        run_gears(d, screen_surf, 5.0);
        

diff --git a/progs/egl/eglinfo.c b/progs/egl/eglinfo.c
index 7d71640310a65b96861f5ef679621e52282f2c92..4826fd0948b9f62e3000bf47fc2340ffeef8cab7 100644 (file)
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/eglinfo.c
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
 {
    int maj, min;
    /*EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);*/
-   EGLDisplay d = eglGetDisplay("!fb_dri");
+   EGLDisplay d = eglGetDisplay("!r200_dri");
 
    if (!eglInitialize(d, &maj, &min)) {
       printf("eglinfo: eglInitialize failed\n");