temporairly try and use cairo again
This commit is contained in:
parent
6433322cda
commit
86eb481aa3
3 changed files with 199 additions and 432 deletions
|
|
@ -13,13 +13,34 @@
|
|||
|
||||
#include <wayland-client-protocol.h>
|
||||
#include <wayland-egl.h>
|
||||
#include <EGL/egl.h>
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glext.h>
|
||||
#include <cairo/cairo.h>
|
||||
|
||||
#include <wayland-client.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <linux/input-event-codes.h>
|
||||
#include <poll.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <assert.h>
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
#include "Mw/BaseTypes.h"
|
||||
#include "Mw/LowLevel.h"
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <wayland-egl-core.h>
|
||||
#include <wayland-util.h>
|
||||
|
||||
/* TODO: find out what FreeBSD and such wants us to include */
|
||||
#include <linux/input.h>
|
||||
|
||||
MWDECL int MwLLWaylandCallInit(void);
|
||||
|
||||
#ifndef WL_PROTOCOLS_DEFINED
|
||||
|
|
@ -89,18 +110,19 @@ struct _MwLLWayland {
|
|||
MwU32 x, y, ww, wh;
|
||||
MwPoint cur_mouse_pos;
|
||||
|
||||
int last_serial;
|
||||
cairo_surface_t* cairo_surface;
|
||||
void* mapped_buffer;
|
||||
|
||||
MwLL parent;
|
||||
|
||||
GLuint fbo;
|
||||
unsigned int fbo_texture;
|
||||
// GLuint fbo;
|
||||
// unsigned int fbo_texture;
|
||||
|
||||
EGLNativeWindowType egl_window_native;
|
||||
EGLDisplay egl_display;
|
||||
EGLContext egl_context;
|
||||
EGLSurface egl_surface;
|
||||
EGLConfig egl_config;
|
||||
// EGLNativeWindowType egl_window_native;
|
||||
// EGLDisplay egl_display;
|
||||
// EGLContext egl_context;
|
||||
// EGLSurface egl_surface;
|
||||
// EGLConfig egl_config;
|
||||
};
|
||||
|
||||
struct _MwLLWaylandColor {
|
||||
|
|
@ -109,7 +131,7 @@ struct _MwLLWaylandColor {
|
|||
|
||||
struct _MwLLWaylandPixmap {
|
||||
struct _MwLLCommonPixmap common;
|
||||
GLuint texture;
|
||||
// GLuint texture;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue