summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--progs/egl/demo1.c3
-rw-r--r--progs/egl/demo2.c3
-rw-r--r--progs/egl/demo3.c3
-rw-r--r--progs/egl/eglgears.c2
-rw-r--r--progs/egl/eglinfo.c3
-rw-r--r--progs/egl/eglscreen.c2
-rw-r--r--progs/egl/egltri.c6
-rw-r--r--progs/egl/peglgears.c2
8 files changed, 6 insertions, 18 deletions
diff --git a/progs/egl/demo1.c b/progs/egl/demo1.c
index 49b66245388..6381ad59e6b 100644
--- 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 d7283e13bd3..5817771aec8 100644
--- 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 daab62d1738..3db9094fdd7 100644
--- 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 31346d95230..0eee9ecf4da 100644
--- 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 feae954b75a..4486916e958 100644
--- 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 c0b5a210a4a..47b3ce3366f 100644
--- 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 44096d94a27..79f6702007e 100644
--- 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 bac16453c16..1ddb691677f 100644
--- 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)) {