KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xeglgears: Clean up the code a bit 

Still a mess...
This commit is contained in:
Kristian Høgsberg 2010-02-26 13:18:37 -05:00
parent ea203de2d0
commit 88c174d182
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
progs/egl/xeglgears.c
View File

@ -344,6 +344,8 @@ struct egl_manager {
EGLBoolean verbose; EGLBoolean verbose;
EGLint major, minor; EGLint major, minor;
GC gc;
}; };
static struct egl_manager * static struct egl_manager *
@ -475,6 +477,8 @@ egl_manager_create_window(struct egl_manager *eman, const char *name,
} }
} }
eman->gc = XCreateGC(eman->xdpy, eman->xwin, 0, NULL);
XMapWindow(eman->xdpy, eman->xwin); XMapWindow(eman->xdpy, eman->xwin);
return EGL_TRUE; return EGL_TRUE;
@ -531,6 +535,8 @@ egl_manager_destroy(struct egl_manager *eman)
if (eman->xpix != None) if (eman->xpix != None)
XFreePixmap(eman->xdpy, eman->xpix); XFreePixmap(eman->xdpy, eman->xpix);
XFreeGC(eman->xdpy, eman->gc);
free(eman); free(eman);
} }
@ -580,11 +586,27 @@ texture_gears(struct egl_manager *eman, int surface_type)
eglSwapBuffers(eman->dpy, eman->win); eglSwapBuffers(eman->dpy, eman->win);
} }
static void
copy_gears(struct egl_manager *eman,
EGLint tile_w, EGLint tile_h, EGLint w, EGLint h)
{
int x, y;
eglWaitClient();
for (x = 0; x < w; x += tile_w) {
for (y = 0; y < h; y += tile_h) {
XCopyArea(eman->xdpy, eman->xpix, eman->xwin, eman->gc,
0, 0, tile_w, tile_h, x, y);
}
}
}
static void static void
event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h) event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
{ {
GC gc = XCreateGC(eman->xdpy, eman->xwin, 0, NULL); int window_w = w, window_h = h;
EGLint orig_w = w, orig_h = h;
if (surface_type == EGL_PBUFFER_BIT) if (surface_type == EGL_PBUFFER_BIT)
printf("there will be no screen update if " printf("there will be no screen update if "
@ -599,10 +621,10 @@ event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
/* we'll redraw below */ /* we'll redraw below */
break; break;
case ConfigureNotify: case ConfigureNotify:
w = event.xconfigure.width; window_w = event.xconfigure.width;
h = event.xconfigure.height; window_h = event.xconfigure.height;
if (surface_type == EGL_WINDOW_BIT) if (surface_type == EGL_WINDOW_BIT)
reshape(w, h); reshape(window_w, window_h);
break; break;
case KeyPress: case KeyPress:
{ {
@ -637,7 +659,6 @@ event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
static int frames = 0; static int frames = 0;
static double tRot0 = -1.0, tRate0 = -1.0; static double tRot0 = -1.0, tRate0 = -1.0;
double dt, t = current_time(); double dt, t = current_time();
int x, y;
if (tRot0 < 0.0) if (tRot0 < 0.0)
tRot0 = t; tRot0 = t;
dt = t - tRot0; dt = t - tRot0;
@ -649,41 +670,35 @@ event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
angle -= 3600.0; angle -= 3600.0;
switch (surface_type) { switch (surface_type) {
case GEARS_WINDOW:
draw();
eglSwapBuffers(eman->dpy, eman->win);
break;
case GEARS_PBUFFER: case GEARS_PBUFFER:
draw();
if (!eglCopyBuffers(eman->dpy, eman->pbuf, eman->xpix))
break;
copy_gears(eman, w, h, window_w, window_h);
break;
case GEARS_PBUFFER_TEXTURE: case GEARS_PBUFFER_TEXTURE:
eglMakeCurrent(eman->dpy, eman->pbuf, eman->pbuf, eman->ctx); eglMakeCurrent(eman->dpy, eman->pbuf, eman->pbuf, eman->ctx);
draw();
texture_gears(eman, surface_type);
break; break;
case GEARS_PIXMAP: case GEARS_PIXMAP:
draw();
copy_gears(eman, w, h, window_w, window_h);
break;
case GEARS_PIXMAP_TEXTURE: case GEARS_PIXMAP_TEXTURE:
eglMakeCurrent(eman->dpy, eman->pix, eman->pix, eman->ctx); eglMakeCurrent(eman->dpy, eman->pix, eman->pix, eman->ctx);
break; draw();
}
draw();
switch (surface_type) {
case GEARS_WINDOW:
eglSwapBuffers(eman->dpy, eman->win);
break;
case GEARS_PBUFFER_TEXTURE:
case GEARS_PIXMAP_TEXTURE:
texture_gears(eman, surface_type); texture_gears(eman, surface_type);
break; break;
case GEARS_PBUFFER: }
if (!eglCopyBuffers(eman->dpy, eman->pbuf, eman->xpix))
break;
eglWaitClient();
/* fall through */
case GEARS_PIXMAP:
eglWaitClient();
for (x = 0; x < w; x += orig_w) {
for (y = 0; y < h; y += orig_h) {
XCopyArea(eman->xdpy, eman->xpix, eman->xwin, gc,
0, 0, orig_w, orig_h, x, y);
}
}
break;
}
frames++; frames++;
@ -699,8 +714,6 @@ event_loop(struct egl_manager *eman, EGLint surface_type, EGLint w, EGLint h)
} }
} }
} }
XFreeGC(eman->xdpy, gc);
} }