egl: Updated EGL samples to use new i915 EGL winsys

diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index 33447a9d57502c65a5a433d266d523ef73ccf70f..da710cbbbfc7ec3930550fff1f3400d0893173e6 100644 (file)
--- a/progs/egl/Makefile
+++ b/progs/egl/Makefile
@@ -46,7 +46,7 @@ demo3.o: demo3.c $(HEADERS)
 
 
 eglinfo: eglinfo.o $(TOP)/$(LIB_DIR)/libEGL.so
-       $(CC) $(CFLAGS) eglinfo.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@
+       $(CC) $(CFLAGS) eglinfo.o -L$(TOP)/$(LIB_DIR) -lGL -lEGL $(LIBDRM_LIB) -o $@
 
 eglinfo.o: eglinfo.c $(HEADERS)
        $(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c
@@ -63,3 +63,9 @@ clean:
        rm -f *.o *~
        rm -f *.so
        rm -f $(PROGRAMS)
+
+run:
+       LD_LIBRARY_PATH=$(TOP)/lib ./eglgears
+
+debug:
+       LD_LIBRARY_PATH=$(TOP)/lib gdb ./eglgears

diff --git a/progs/egl/demo1.c b/progs/egl/demo1.c
index 9ef17e38b7daa4845283af90d31383681ba885aa..0cc6f59777f9f19ee5a5bfafc7dd6228be969afb 100644 (file)
--- a/progs/egl/demo1.c
+++ b/progs/egl/demo1.c
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
    /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
    */
-   EGLDisplay d = eglGetDisplay("!fb_dri");
+   EGLDisplay d = eglGetDisplay("!EGL_i915");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/demo2.c b/progs/egl/demo2.c
index 17bbca61587da64aaa875df2d6f591e4bd431863..3f6f53c18efce8a1ce7780227144431f91d7e040 100644 (file)
--- a/progs/egl/demo2.c
+++ b/progs/egl/demo2.c
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
    /*
    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
    */
-   EGLDisplay d = eglGetDisplay("!fb_dri");
+   EGLDisplay d = eglGetDisplay("!EGL_i915");
    assert(d);
 
    if (!eglInitialize(d, &maj, &min)) {

diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index 9edf7c952b3cc5a49f8786ca7fd55665c2726c0e..e9d2180bf07598be2336d73f2273d594c1a9e256 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(":0");
+   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 9feee20d889befc0cfa4135f419a42bd0a6ec2a8..909f4837b2af1ecb51f7ac9303324aae450e13c7 100644 (file)
--- a/progs/egl/eglgears.c
+++ b/progs/egl/eglgears.c
@@ -385,7 +385,7 @@ main(int argc, char *argv[])
        }
        
        /* DBR : Create EGL context/surface etc */
-        d = eglGetDisplay(":0");
+        d = eglGetDisplay("!EGL_i915");
        assert(d);
 
        if (!eglInitialize(d, &maj, &min)) {

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