mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple-egl: Set opaque region when running opaque

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-08-03 15:27:14 -04:00
parent 4b141597c6
commit 45ce98829b
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-egl.c
+19 -7
View File
@@ -77,7 +77,7 @@ struct window {
struct wl_shell_surface *shell_surface; struct wl_shell_surface *shell_surface;
EGLSurface egl_surface; EGLSurface egl_surface;
struct wl_callback *callback; struct wl_callback *callback;
int fullscreen, configured; int fullscreen, configured, opaque;
}; };
static const char *vert_shader_text = static const char *vert_shader_text =
@@ -100,7 +100,7 @@ static const char *frag_shader_text =
static int running = 1; static int running = 1;
static void static void
init_egl(struct display *display, EGLint alpha_size) init_egl(struct display *display, int opaque)
{ {
static const EGLint context_attribs[] = { static const EGLint context_attribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2, EGL_CONTEXT_CLIENT_VERSION, 2,
@@ -112,7 +112,7 @@ init_egl(struct display *display, EGLint alpha_size)
EGL_RED_SIZE, 1, EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1, EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1, EGL_BLUE_SIZE, 1,
EGL_ALPHA_SIZE, alpha_size, EGL_ALPHA_SIZE, 1,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE EGL_NONE
}; };
@@ -120,6 +120,9 @@ init_egl(struct display *display, EGLint alpha_size)
EGLint major, minor, n; EGLint major, minor, n;
EGLBoolean ret; EGLBoolean ret;
if (opaque)
config_attribs[9] = 0;
display->egl.dpy = eglGetDisplay(display->display); display->egl.dpy = eglGetDisplay(display->display);
assert(display->egl.dpy); assert(display->egl.dpy);
@@ -358,6 +361,7 @@ redraw(void *data, struct wl_callback *callback, uint32_t time)
}; };
static const int32_t speed_div = 5; static const int32_t speed_div = 5;
static uint32_t start_time = 0; static uint32_t start_time = 0;
struct wl_region *region;
if (callback) if (callback)
wl_callback_destroy(callback); wl_callback_destroy(callback);
@@ -394,6 +398,15 @@ redraw(void *data, struct wl_callback *callback, uint32_t time)
eglSwapBuffers(window->display->egl.dpy, window->egl_surface); eglSwapBuffers(window->display->egl.dpy, window->egl_surface);
if (window->opaque) {
region = wl_compositor_create_region(window->display->compositor);
wl_region_add(region, 0, 0,
window->window_size.width,
window->window_size.height);
wl_surface_set_opaque_region(window->surface, region);
wl_region_destroy(region);
}
window->callback = wl_surface_frame(window->surface); window->callback = wl_surface_frame(window->surface);
wl_callback_add_listener(window->callback, &frame_listener, window); wl_callback_add_listener(window->callback, &frame_listener, window);
} }
@@ -565,14 +578,13 @@ main(int argc, char **argv)
struct sigaction sigint; struct sigaction sigint;
struct display display = { 0 }; struct display display = { 0 };
struct window window = { 0 }; struct window window = { 0 };
int alpha_size, i; int i;
window.display = &display; window.display = &display;
display.window = &window; display.window = &window;
window.window_size.width = 250; window.window_size.width = 250;
window.window_size.height = 250; window.window_size.height = 250;
alpha_size = 1;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (strcmp("-f", argv[i]) == 0) if (strcmp("-f", argv[i]) == 0)
window.fullscreen = 1; window.fullscreen = 1;
@@ -590,9 +602,9 @@ main(int argc, char **argv)
wl_display_iterate(display.display, WL_DISPLAY_READABLE); wl_display_iterate(display.display, WL_DISPLAY_READABLE);
if (window.fullscreen) if (window.fullscreen)
alpha_size = 0; window.opaque = 1;
init_egl(&display, alpha_size); init_egl(&display, window.opaque);
create_surface(&window); create_surface(&window);
init_gl(&window); init_gl(&window);