summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@gmail.com>2005-08-07 02:15:27 +0000
committerJon Smirl <jonsmirl@gmail.com>2005-08-07 02:15:27 +0000
commit9a4dbf1cffc923cd3c6b0e70a6ddf1d9fe085ad2 (patch)
treea45769aa510dbc9bda66d7f27f0fff522cbe9a74
parent7e5da5d52629bfa68f83429254eab0304cf346bd (diff)
Fix up some of the sample to work with the r200 EGL driver
-rw-r--r--progs/egl/demo3.c25
-rw-r--r--progs/egl/eglgears.c12
-rw-r--r--progs/egl/eglinfo.c2
3 files changed, 20 insertions, 19 deletions
diff --git a/progs/egl/demo3.c b/progs/egl/demo3.c
index 6c7358400f..2693c37205 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("!fb_dri");
+ EGLDisplay d = eglGetDisplay(":0");
assert(d);
if (!eglInitialize(d, &maj, &min)) {
@@ -602,7 +602,7 @@ main(int argc, char *argv[])
printf("failed to create screen surface\n");
return 0;
}
-
+
eglShowSurfaceMESA(d, screen, screen_surf, mode);
b = eglMakeCurrent(d, screen_surf, screen_surf, ctx);
@@ -610,25 +610,24 @@ main(int argc, char *argv[])
printf("make current failed\n");
return 0;
}
+ glViewport(0, 0, 1024, 768);
+
- Init();
+ Init();
Reshape(1024, 768);
- glDrawBuffer( GL_FRONT );
- glClearColor( 0,
- 1.0,
- 0,
- 1);
+ glDrawBuffer( GL_FRONT );
+ glClearColor( 0, 1.0, 0, 1);
- glClear( GL_COLOR_BUFFER_BIT );
+ glClear( GL_COLOR_BUFFER_BIT );
- doubleBuffer = 1;
- glDrawBuffer( GL_BACK );
+ doubleBuffer = 1;
+ glDrawBuffer( GL_BACK );
Draw(d, screen_surf);
-
+
write_ppm("dump.ppm", ((struct fb_display *)_eglLookupDisplay(d))->pFB, 1024, 768);
-
+
eglDestroySurface(d, screen_surf);
eglDestroyContext(d, ctx);
eglTerminate(d);
diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c
index bd7835393e..0c3da565f5 100644
--- a/progs/egl/eglgears.c
+++ b/progs/egl/eglgears.c
@@ -87,9 +87,9 @@ static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
static GLint gear1, gear2, gear3;
static GLfloat angle = 0.0;
-static GLfloat eyesep = 5.0; /* Eye separation. */
-static GLfloat fix_point = 40.0; /* Fixation point distance. */
-static GLfloat left, right, asp; /* Stereo frustum params. */
+//static GLfloat eyesep = 5.0; /* Eye separation. */
+//static GLfloat fix_point = 40.0; /* Fixation point distance. */
+//static GLfloat left, right, asp; /* Stereo frustum params. */
/*
@@ -385,7 +385,7 @@ main(int argc, char *argv[])
}
// DBR : Create EGL context/surface etc
- EGLDisplay d = eglGetDisplay("!fb_dri");
+ EGLDisplay d = eglGetDisplay(":0");
assert(d);
if (!eglInitialize(d, &maj, &min)) {
@@ -431,7 +431,9 @@ main(int argc, char *argv[])
init(); // Initialise the GL visual
reshape(1024,768);
-
+
+ glDrawBuffer( GL_BACK );
+
// DBR : Run the simulation
run_gears(d, screen_surf, 5.0);
diff --git a/progs/egl/eglinfo.c b/progs/egl/eglinfo.c
index 7d71640310..4826fd0948 100644
--- a/progs/egl/eglinfo.c
+++ b/progs/egl/eglinfo.c
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
{
int maj, min;
/*EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);*/
- EGLDisplay d = eglGetDisplay("!fb_dri");
+ EGLDisplay d = eglGetDisplay("!r200_dri");
if (!eglInitialize(d, &maj, &min)) {
printf("eglinfo: eglInitialize failed\n");