progs/egl: Replace EGL_i915 by EGL_DEFAULT_DISPLAY.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/progs/egl/demo1.c b/progs/egl/demo1.c
index 49b6624538832aa34e407101ee6e0444f9ca5d29..6381ad59e6b11bfa91b4927aed10853c927dc59c 100644 (file)
--- a/progs/egl/demo1.c
+++ b/progs/egl/demo1.c
@@ -102,10 +102,7 @@ main(int argc, char *argv[])
       EGL_NONE
    };
 
-   /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-   */
-   EGLDisplay d = eglGetDisplay((EGLNativeDisplayType) "!EGL_i915");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/demo2.c b/progs/egl/demo2.c
index d7283e13bd3f6d47572f0a38fb7be6c03e309d82..5817771aec8959618c0dbf50207a1a434a7f36ec 100644 (file)
--- a/progs/egl/demo2.c
+++ b/progs/egl/demo2.c
@@ -119,10 +119,7 @@ main(int argc, char *argv[])
    EGLScreenMESA screen;
    EGLint count;
 
-   /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-   */
-   EGLDisplay d = eglGetDisplay((EGLNativeDisplayType) "!EGL_i915");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index daab62d1738cce7f27bca8ed6a88ea12cd3b57a9..3db9094fdd780fae6c2796b118e40e1128fe39c8 100644 (file)
--- a/progs/egl/demo3.c
+++ b/progs/egl/demo3.c
@@ -577,10 +577,7 @@ main(int argc, char *argv[])
       EGL_NONE
    };
 
-   /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-   */
-   EGLDisplay d = eglGetDisplay("!EGL_i915");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c
index 31346d95230862453d84ae0edd602a8225c38d13..0eee9ecf4da2dca747c6d92cd2fa0f8b1a1e2e1f 100644 (file)
--- a/progs/egl/eglgears.c
+++ b/progs/egl/eglgears.c
@@ -388,7 +388,7 @@ main(int argc, char *argv[])
        }
        
        /* DBR : Create EGL context/surface etc */
-       d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
+       d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
        assert(d);
 
        if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/eglinfo.c b/progs/egl/eglinfo.c
index feae954b75afc0b3d977c8a73a94d36eb9306778..4486916e9581e873662a71ffa0ecc61e7652d880 100644 (file)
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/eglinfo.c
@@ -147,8 +147,7 @@ int
 main(int argc, char *argv[])
 {
    int maj, min;
-   //EGLDisplay d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
-   EGLDisplay d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
+   EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
    if (!eglInitialize(d, &maj, &min)) {
       printf("eglinfo: eglInitialize failed\n");

diff --git a/progs/egl/eglscreen.c b/progs/egl/eglscreen.c
index c0b5a210a4abb023512bdea6a4a0259c166f81d5..47b3ce3366fae2ace50c159663a03f2838d65311 100644 (file)
--- a/progs/egl/eglscreen.c
+++ b/progs/egl/eglscreen.c
@@ -55,7 +55,7 @@ main(int argc, char *argv[])
        EGLint count, chosenMode;
        EGLint width = 0, height = 0;
 
-       d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
+       d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
        assert(d);
 
        if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/egltri.c b/progs/egl/egltri.c
index 44096d94a2787d5490e1e14ef26cbbf81039175c..79f6702007e736b108dcbca3038e21e60ae07596 100644 (file)
--- a/progs/egl/egltri.c
+++ b/progs/egl/egltri.c
@@ -130,9 +130,7 @@ static void run(EGLDisplay dpy, EGLSurface surf, int ttr)
 
        while (ct - st < ttr)
        {
-               double tt = current_time();
-               double dt = tt - ct;
-               ct = tt;
+               ct = current_time();
 
                draw();
 
@@ -174,7 +172,7 @@ int main(int argc, char *argv[])
        }
 
        /* DBR : Create EGL context/surface etc */
-       d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
+       d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
        assert(d);
 
        if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/peglgears.c b/progs/egl/peglgears.c
index bac16453c16f3c9cf85576230c051bbfa92f0f4f..1ddb691677f1418b91940a0d3b1193ca73c5b41e 100644 (file)
--- a/progs/egl/peglgears.c
+++ b/progs/egl/peglgears.c
@@ -385,7 +385,7 @@ main(int argc, char *argv[])
        }
        
        /* DBR : Create EGL context/surface etc */
-       d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915");
+       d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
        assert(d);
 
        if (!eglInitialize(d, &major, &minor)) {