diff options
| -rw-r--r-- | hardware/cmsb-001/configuration.nix | 19 | ||||
| -rw-r--r-- | meson_options.txt | 8 | ||||
| -rw-r--r-- | src/render/renderer_libplacebo.c | 6 |
3 files changed, 26 insertions, 7 deletions
diff --git a/hardware/cmsb-001/configuration.nix b/hardware/cmsb-001/configuration.nix index 7eb6484..a1578d6 100644 --- a/hardware/cmsb-001/configuration.nix +++ b/hardware/cmsb-001/configuration.nix @@ -122,6 +122,25 @@ camu ]; + security.wrappers = { + cage = { + owner = "root"; + group = "root"; + source = "${pkgs.cage}/bin/cage"; + setuid = true; + }; + }; + + services.cage = { + enable = true; + user = "akiyo"; + environment = { + WLR_LIBINPUT_NO_DEVICES = "1"; + LIBGL_ALWAYS_SOFTWARE = "1"; + }; + program = "${pkgs.camu}/bin/cmv"; + }; + # https://pablo.tools/blog/computers/nixos-generate-raspberry-images/ #sdImage = { # populateFirmwareCommands = let diff --git a/meson_options.txt b/meson_options.txt index 9956981..85bc33c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,9 +1,9 @@ option('sink', type: 'feature', value: 'enabled') -option('sink-only', type: 'boolean', value: true) +option('sink-only', type: 'boolean', value: false) option('sink-use-vulkan', type: 'boolean', value: false) option('codecs', type: 'array', choices: ['ffmpeg', 'stb_image', 'spng', 'wuffs'], value: ['ffmpeg']) option('renderer', type: 'combo', choices: ['libplacebo', 'tiger'], value: 'libplacebo') -option('portal', type: 'feature', value: 'disabled') -option('server', type: 'feature', value: 'disabled') -option('client', type: 'feature', value: 'disabled') +option('server', type: 'feature', value: 'enabled') +option('client', type: 'feature', value: 'enabled') +option('portal', type: 'feature', value: 'enabled') option('tests', type: 'boolean', value: false) diff --git a/src/render/renderer_libplacebo.c b/src/render/renderer_libplacebo.c index 797dbd0..49addb0 100644 --- a/src/render/renderer_libplacebo.c +++ b/src/render/renderer_libplacebo.c @@ -98,8 +98,8 @@ static bool renderer_lp_create_renderer(struct camu_renderer *renderer, s32 *wid #elif defined CAMU_RENDERER_OPENGL (void)gl_load_loader; lr->gl = pl_opengl_create(lr->logger, pl_opengl_params( - .allow_software = true, .debug = false, + .allow_software = true, .make_current = gl_make_current, .release_current = gl_release_current, .get_proc_addr = get_gl_proc_address, @@ -129,9 +129,9 @@ static bool renderer_lp_create_renderer(struct camu_renderer *renderer, s32 *wid pl_swapchain_resize(lr->swapchain, width, height); al_memset(&lr->params, 0, sizeof(struct pl_render_params)); - //lr->params = pl_render_fast_params; + lr->params = pl_render_fast_params; //lr->params.upscaler = &pl_filter_nearest; - lr->params = pl_render_default_params; + //lr->params = pl_render_default_params; //lr->params = pl_render_high_quality_params; lr->params.deband_params = NULL; |