lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libobs-opengl/CMakeLists.txt
View file

@ -84,11 +84,13 @@ endif()
if(WIN32 OR APPLE)
set_target_properties(libobs-opengl
PROPERTIES
FOLDER "core"
OUTPUT_NAME libobs-opengl
PREFIX "")
else()
set_target_properties(libobs-opengl
PROPERTIES
FOLDER "core"
OUTPUT_NAME obs-opengl
VERSION 0.0
SOVERSION 0

4
libobs-opengl/gl-cocoa.m
View file

@ -292,8 +292,6 @@ void device_present(gs_device_t *device)
glFlush();
[NSOpenGLContext clearCurrentContext];
CGLUnlockContext([device->plat->context CGLContextObj]);
CGLLockContext([device->cur_swap->wi->context CGLContextObj]);
[device->cur_swap->wi->context makeCurrentContext];
@ -309,8 +307,6 @@ void device_present(gs_device_t *device)
CGLUnlockContext([device->cur_swap->wi->context CGLContextObj]);
CGLLockContext([device->plat->context CGLContextObj]);
[device->plat->context makeCurrentContext];
}

4
libobs-opengl/gl-shaderparser.c
View file

@ -427,7 +427,9 @@ static bool gl_write_texture_code(struct gl_shader_parser *glsp,
else if (cf_token_is(cfp, "Load")) {
written = gl_write_texture_call(glsp, var, "texelFetch", false);
dstr_cat(&glsp->gl_string, "(");
function_end = ").xy, 0)";
function_end = (strcmp(var->type, "texture3d") == 0)
? ").xyz, 0)"
: ").xy, 0)";
}
if (!written)