Request 6283 (accepted)

Overview

Request 6283 (accepted)

- Update to version 1.5.2

Created by fl4nn 7 months ago
In state accepted
Package maintainer: fl4nn

Submit obs-vkcapture

Submit package home:fl4nn:b...s:Multimedia / obs-vkcapture to package Multimedia / obs-vkcapture

obs-vkcapture.changes Changed

obs-vkcapture.spec Changed

obs-vkcapture-1.5.1.tar.gz/CMakeLists.txt -> obs-vkcapture-1.5.2.tar.gz/CMakeLists.txt Changed

obs-vkcapture-1.5.1.tar.gz/src/glinject.c -> obs-vkcapture-1.5.2.tar.gz/src/glinject.c Changed

@@ -140,6 +140,7 @@
         GETGLXADDR(GetProcAddress);
         GETGLXADDR(GetProcAddressARB);
         GETGLXPROCADDR(DestroyContext);
+        GETGLXPROCADDR(CreateWindow);
         GETGLXPROCADDR(SwapBuffers);
         GETGLXPROCADDR(SwapBuffersMscOML);
         GETGLXPROCADDR(CreatePixmap);
@@ -788,6 +789,10 @@
 
 static void gl_shtex_capture()
 {
+    bool scissorEnabled = gl_f.IsEnabled(GL_SCISSOR_TEST);
+    if (scissorEnabled) {
+        gl_f.Disable(GL_SCISSOR_TEST);
+    }
     GLboolean last_srgb;
     GLint last_read_fbo;
     GLint last_draw_fbo;
@@ -808,6 +813,9 @@
     } else {
         gl_f.Disable(GL_FRAMEBUFFER_SRGB);
     }
+    if (scissorEnabled) {
+        gl_f.Enable(GL_SCISSOR_TEST);
+    }
 }
 
 static bool gl_shtex_init()
@@ -893,11 +901,13 @@
             hlog("Failed to create EGL image");
             goto fail;
         }
-        const int queried = egl_f.ExportDMABUFImageQueryMESA(data.display, data.image, &data.buf_fourcc, &data.nfd, &data.buf_modifier);
+        uint64_t modifiers4;
+        const int queried = egl_f.ExportDMABUFImageQueryMESA(data.display, data.image, &data.buf_fourcc, &data.nfd, modifiers);
         if (!queried) {
             hlog("Failed to query dmabuf export");
             goto fail;
         }
+        data.buf_modifier = modifiers0;
         const int exported = egl_f.ExportDMABUFImageMESA(data.display, data.image, data.buf_fds, data.buf_strides, data.buf_offsets);
         if (!exported) {
             hlog("Failed dmabuf export");
@@ -1072,6 +1082,7 @@
 void *glXGetProcAddress(const char *procName);
 void *glXGetProcAddressARB(const char *procName);
 void glXDestroyContext(void *display, void *context);
+bool glXCreateWindow(void *display, void *config, unsigned long win, const int *attribList);
 void glXSwapBuffers(void *display, void *surface);
 int64_t glXSwapBuffersMscOML(void *display, void *drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
 
@@ -1084,7 +1095,8 @@
     ADD_HOOK(glXGetProcAddressARB),
     ADD_HOOK(glXSwapBuffers),
     ADD_HOOK(glXSwapBuffersMscOML),
-    ADD_HOOK(glXDestroyContext)
+    ADD_HOOK(glXDestroyContext),
+    ADD_HOOK(glXCreateWindow)
 #undef ADD_HOOK
 };
 
@@ -1127,6 +1139,17 @@
     glx_f.DestroyContext(display, context);
 }
 
+bool glXCreateWindow(void *display, void *config, unsigned long win, const int *attribList)
+{
+    if (!gl_init_funcs(/*glx*/true)) {
+        return false;
+    }
+
+    gl_free();
+
+    return glx_f.CreateWindow(display, config, win, attribList);
+}
+
 void glXSwapBuffers(void *display, void *drawable)
 {
     if (!gl_init_funcs(/*glx*/true)) {

obs-vkcapture-1.5.1.tar.gz/src/glinject.h -> obs-vkcapture-1.5.2.tar.gz/src/glinject.h Changed

obs-vkcapture-1.5.1.tar.gz/src/vkcapture.c -> obs-vkcapture-1.5.2.tar.gz/src/vkcapture.c Changed

@@ -563,7 +563,7 @@
     }
 
     const enum gs_color_space color_space = gs_get_color_space();
-    const char *tech_name = "Draw";
+    const char *tech_name = "DrawSrgbDecompress";
     float multiplier = 1.f;
 
     if (color_space == GS_CS_709_EXTENDED) {
@@ -573,8 +573,15 @@
 
     effect = obs_get_base_effect(ctx->allow_transparency ? OBS_EFFECT_DEFAULT : OBS_EFFECT_OPAQUE);
 
+    const bool linear_srgb = gs_get_linear_srgb();
+    const bool previous = gs_framebuffer_srgb_enabled();
+    gs_enable_framebuffer_srgb(linear_srgb);
+
     gs_eparam_t *image = gs_effect_get_param_by_name(effect, "image");
-    gs_effect_set_texture(image, ctx->texture);
+    if (linear_srgb)
+        gs_effect_set_texture_srgb(image, ctx->texture);
+    else
+        gs_effect_set_texture(image, ctx->texture);
 
     while (gs_effect_loop(effect, tech_name)) {
         gs_effect_set_float(gs_effect_get_param_by_name(effect, "multiplier"), multiplier);
@@ -597,6 +604,8 @@
             cursor_render(ctx);
         }
     }
+
+    gs_enable_framebuffer_srgb(previous);
 }
 
 static const char *vkcapture_source_get_name(void *data)
@@ -690,7 +699,7 @@
     .id = "vkcapture-source",
     .type = OBS_SOURCE_TYPE_INPUT,
     .get_name = vkcapture_source_get_name,
-    .output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DO_NOT_DUPLICATE,
+    .output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_SRGB,
     .create = vkcapture_source_create,
     .destroy = vkcapture_source_destroy,
     .update = vkcapture_source_update,

obs-vkcapture-1.5.1.tar.gz/src/xcursor-xcb.c -> obs-vkcapture-1.5.2.tar.gz/src/xcursor-xcb.c Changed

Build Results
RPM Lint

Refresh

Comments for request 6283 0

Request History

fl4nn created request 7 months ago

- Update to version 1.5.2

fl4nn accepted request 7 months ago