summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@tungstengraphics.com>2008-05-14 17:20:25 +0200
committerJakob Bornecrantz <jakob@tungstengraphics.com>2008-05-14 17:20:25 +0200
commit3f9de6ff7dbfc417b50ac27be8461304f0134f91 (patch)
treece811aed611d2a942e11e7c30e50a87f33903626 /progs
parentd07fbdd93941d5027a1aa7f0726140c6648a1e27 (diff)
egl: Updated EGL samples to use new i915 EGL winsys
Diffstat (limited to 'progs')
-rw-r--r--progs/egl/Makefile8
-rw-r--r--progs/egl/demo1.c2
-rw-r--r--progs/egl/demo2.c2
-rw-r--r--progs/egl/demo3.c2
-rw-r--r--progs/egl/eglgears.c2
-rw-r--r--progs/egl/eglinfo.c2
6 files changed, 12 insertions, 6 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index 33447a9d57..da710cbbbf 100644
--- 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 9ef17e38b7..0cc6f59777 100644
--- 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 17bbca6158..3f6f53c18e 100644
--- 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 9edf7c952b..e9d2180bf0 100644
--- 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 9feee20d88..909f4837b2 100644
--- 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 f9c2475445..85de2173fc 100644
--- 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");