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

Update to use eglGetDRMDisplayMESA()

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-07-08 20:15:10 -04:00
parent 86e0989673
commit f252d6a98e
7 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/gears.c
-1
View File
@@ -30,7 +30,6 @@
#include <time.h> #include <time.h>
#include <cairo.h> #include <cairo.h>
#include <glib.h> #include <glib.h>
#include <cairo-drm.h>
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#define EGL_EGLEXT_PROTOTYPES #define EGL_EGLEXT_PROTOTYPES
clients/image.c
-1
View File
@@ -30,7 +30,6 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <cairo.h> #include <cairo.h>
#include <cairo-drm.h>
#include <glib.h> #include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
clients/terminal.c
-1
View File
@@ -32,7 +32,6 @@
#include <ctype.h> #include <ctype.h>
#include <cairo.h> #include <cairo.h>
#include <glib.h> #include <glib.h>
#include <cairo-drm.h>
#include <X11/keysym.h> #include <X11/keysym.h>
clients/view.c
-1
View File
@@ -30,7 +30,6 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <cairo.h> #include <cairo.h>
#include <cairo-drm.h>
#include <glib.h> #include <glib.h>
#include <linux/input.h> #include <linux/input.h>
clients/window.c
+1 -10
View File
@@ -820,7 +820,6 @@ init_xkb(struct display *d)
struct display * struct display *
display_create(int *argc, char **argv[], const GOptionEntry *option_entries) display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
{ {
PFNEGLGETTYPEDDISPLAYMESA get_typed_display_mesa;
struct display *d; struct display *d;
EGLint major, minor, count; EGLint major, minor, count;
EGLConfig config; EGLConfig config;
@@ -869,15 +868,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
return NULL; return NULL;
} }
get_typed_display_mesa = d->dpy = eglGetDRMDisplayMESA(fd);
(PFNEGLGETTYPEDDISPLAYMESA) eglGetProcAddress("eglGetTypedDisplayMESA");
if (get_typed_display_mesa == NULL) {
fprintf(stderr, "eglGetDisplayMESA() not found\n");
return NULL;
}
d->dpy = get_typed_display_mesa(EGL_DRM_DISPLAY_TYPE_MESA,
(void *) fd);
if (!eglInitialize(d->dpy, &major, &minor)) { if (!eglInitialize(d->dpy, &major, &minor)) {
fprintf(stderr, "failed to initialize display\n"); fprintf(stderr, "failed to initialize display\n");
return NULL; return NULL;
compositor-drm.c
+1 -10
View File
@@ -305,7 +305,6 @@ init_egl(struct drm_compositor *ec, struct udev_device *device)
{ {
EGLint major, minor, count; EGLint major, minor, count;
EGLConfig config; EGLConfig config;
PFNEGLGETTYPEDDISPLAYMESA get_typed_display_mesa;
static const EGLint config_attribs[] = { static const EGLint config_attribs[] = {
EGL_SURFACE_TYPE, 0, EGL_SURFACE_TYPE, 0,
@@ -314,13 +313,6 @@ init_egl(struct drm_compositor *ec, struct udev_device *device)
EGL_NONE EGL_NONE
}; };
get_typed_display_mesa =
(PFNEGLGETTYPEDDISPLAYMESA) eglGetProcAddress("eglGetTypedDisplayMESA");
if (get_typed_display_mesa == NULL) {
fprintf(stderr, "eglGetTypedDisplayMESA() not found\n");
return -1;
}
ec->base.base.device = strdup(udev_device_get_devnode(device)); ec->base.base.device = strdup(udev_device_get_devnode(device));
ec->drm_fd = open(ec->base.base.device, O_RDWR); ec->drm_fd = open(ec->base.base.device, O_RDWR);
if (ec->drm_fd < 0) { if (ec->drm_fd < 0) {
@@ -330,8 +322,7 @@ init_egl(struct drm_compositor *ec, struct udev_device *device)
return -1; return -1;
} }
ec->base.display = get_typed_display_mesa(EGL_DRM_DISPLAY_TYPE_MESA, ec->base.display = eglGetDRMDisplayMESA(ec->drm_fd);
(void *) ec->drm_fd);
if (ec->base.display == NULL) { if (ec->base.display == NULL) {
fprintf(stderr, "failed to create display\n"); fprintf(stderr, "failed to create display\n");
return -1; return -1;
compositor-x11.c
+1 -11
View File
@@ -198,7 +198,6 @@ dri2_authenticate(struct x11_compositor *c)
static int static int
x11_compositor_init_egl(struct x11_compositor *c) x11_compositor_init_egl(struct x11_compositor *c)
{ {
PFNEGLGETTYPEDDISPLAYMESA get_typed_display_mesa;
EGLint major, minor, count; EGLint major, minor, count;
EGLConfig config; EGLConfig config;
@@ -223,16 +222,7 @@ x11_compositor_init_egl(struct x11_compositor *c)
if (dri2_authenticate(c) < 0) if (dri2_authenticate(c) < 0)
return -1; return -1;
get_typed_display_mesa = c->base.display = eglGetDRMDisplayMESA(c->drm_fd);
(PFNEGLGETTYPEDDISPLAYMESA)
eglGetProcAddress("eglGetTypedDisplayMESA");
if (get_typed_display_mesa == NULL) {
fprintf(stderr, "eglGetTypedDisplayMESA() not found\n");
return -1;
}
c->base.display = get_typed_display_mesa(EGL_DRM_DISPLAY_TYPE_MESA,
(void *) c->drm_fd);
if (c->base.display == NULL) { if (c->base.display == NULL) {
fprintf(stderr, "failed to create display\n"); fprintf(stderr, "failed to create display\n");
return -1; return -1;