From 3f9de6ff7dbfc417b50ac27be8461304f0134f91 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 14 May 2008 17:20:25 +0200
Subject: egl: Updated EGL samples to use new i915 EGL winsys

---
 progs/egl/demo3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'progs/egl/demo3.c')

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)) {
-- 
cgit v1.2.3


From d8a693ee49ab2c5699a12f8595be8b8606971dbd Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 28 May 2008 01:16:06 +0200
Subject: egl: Make demo3 compile

---
 progs/egl/demo3.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/egl/demo3.c')

diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index e9d2180bf0..6ea7578793 100644
--- a/progs/egl/demo3.c
+++ b/progs/egl/demo3.c
@@ -3,6 +3,7 @@
  */
 
 #include <GLES/egl.h>
+#include <GL/gl.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3


From af540ef3692e2dd047c6355c67b3ba5a99a75395 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 4 Jun 2008 10:11:25 -0600
Subject: egl: updated egl.h include paths

---
 progs/egl/demo1.c     | 4 ++--
 progs/egl/demo2.c     | 4 ++--
 progs/egl/demo3.c     | 5 ++++-
 progs/egl/eglgears.c  | 4 ++--
 progs/egl/eglinfo.c   | 2 +-
 progs/egl/xeglgears.c | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'progs/egl/demo3.c')

diff --git a/progs/egl/demo1.c b/progs/egl/demo1.c
index 52673187c4..49b6624538 100644
--- a/progs/egl/demo1.c
+++ b/progs/egl/demo1.c
@@ -4,8 +4,8 @@
 
 #define EGL_EGLEXT_PROTOTYPES
 
-#include <GLES/egl.h>
-#include <GLES/eglext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/progs/egl/demo2.c b/progs/egl/demo2.c
index c95aaafa13..d7283e13bd 100644
--- a/progs/egl/demo2.c
+++ b/progs/egl/demo2.c
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <GLES/egl.h>
-#include <GLES/eglext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <GLES/gl.h>
 
 /*#define FRONTBUFFER*/
diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index 6ea7578793..a6096a257e 100644
--- a/progs/egl/demo3.c
+++ b/progs/egl/demo3.c
@@ -2,7 +2,10 @@
  * Exercise EGL API functions
  */
 
-#include <GLES/egl.h>
+#define EGL_EGLEXT_PROTOTYPES
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <GL/gl.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c
index a004cb7e86..20f6c1ff6e 100644
--- a/progs/egl/eglgears.c
+++ b/progs/egl/eglgears.c
@@ -35,8 +35,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <GL/gl.h>
-#include <GLES/egl.h>
-#include <GLES/eglext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 
 #define MAX_CONFIGS 10
 #define MAX_MODES 100
diff --git a/progs/egl/eglinfo.c b/progs/egl/eglinfo.c
index 442de5d63f..f0fd442990 100644
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/eglinfo.c
@@ -25,7 +25,7 @@
  */
 
 
-#include <GLES/egl.h>
+#include <EGL/egl.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/progs/egl/xeglgears.c b/progs/egl/xeglgears.c
index 519d4bb692..d5fbc03410 100644
--- a/progs/egl/xeglgears.c
+++ b/progs/egl/xeglgears.c
@@ -40,7 +40,7 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <GL/gl.h>
-#include <GLES/egl.h>
+#include <EGL/egl.h>
 
 
 #define BENCHMARK
-- 
cgit v1.2.3