Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Use patched static wlroots as a submodule and subproject.

Browse source 
That should help setting it up on a machine that might want to use normal
wlroots for other things. Resolve a GL symbol conflict now that we're
colocated with wlroots' dynamic loading code.
This commit is contained in:
Pierre-Loup A. Griffais 2019-11-16 16:56:34 -08:00 committed by Pierre-Loup A. Griffais
parent 07c4714234
commit 7e9bc2a6a0
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "subprojects/wlroots"]
path = subprojects/wlroots
url = https://github.com/Plagman/wlroots.git

6
meson.build
View file

@ -48,6 +48,9 @@ waffle_dep = dependency('waffle-1')
subdir('protocol')
wlroots_proj = subproject('wlroots')
wlroots_static_dep = wlroots_proj.get_variable('wlroots_static_dep')
executable(
'steamcompmgr',
'src/steamcompmgr.c',
@ -75,6 +78,7 @@ executable(
dependencies : [
dep_x11, dep_xdamage, dep_xcomposite, dep_xrender, dep_xext, dep_gl,
dep_xxf86vm, pixman_dep, drm_dep, wlroots_dep, protos, wayland_server,
wayland_protos, libinput, xkbcommon, math, thread_dep, waffle_dep
wayland_protos, libinput, xkbcommon, math, thread_dep, waffle_dep,
wlroots_static_dep
],
)

4
src/steamcompmgr.c
View file

@ -69,6 +69,7 @@
PFNEGLCREATEIMAGEKHRPROC __pointer_to_eglCreateImageKHR;
PFNEGLDESTROYIMAGEKHRPROC __pointer_to_eglDestroyImageKHR;
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC __pointer_to_glEGLImageTargetTexture2DOES;
typedef struct _ignore {
struct _ignore *next;
@ -374,7 +375,7 @@ ensure_win_resources (Display *dpy, win *w)
glGenTextures( 1, &w->texName );
glBindTexture (GL_TEXTURE_2D, w->texName);
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, w->eglImage);
__pointer_to_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, w->eglImage);
// Only consume once
w->dmabuf_attribs_valid = False;
@ -1832,6 +1833,7 @@ steamcompmgr_main (int argc, char **argv)
__pointer_to_eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)eglGetProcAddress("eglCreateImageKHR");
__pointer_to_eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)eglGetProcAddress("eglDestroyImageKHR");
__pointer_to_glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)eglGetProcAddress("glEGLImageTargetTexture2DOES");
eglSwapInterval( eglGetCurrentDisplay(), 1 );

1
subprojects/wlroots Submodule

@ -0,0 +1 @@
Subproject commit 235a6cce8bfdee6409aba4066d0c947df71b0b18