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

New upstream version 0.15.4+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2016-08-28 14:07:43 +02:00
parent 55d5047af0
commit 67704ac59c
359 changed files with 8423 additions and 1050 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libobs-opengl/gl-shader.c
View file

@ -487,6 +487,12 @@ static void program_set_param_data(struct gs_program *program,
}
} else if (pp->param->type == GS_SHADER_PARAM_TEXTURE) {
if (pp->param->next_sampler) {
program->device->cur_samplers[pp->param->sampler_id] =
pp->param->next_sampler;
pp->param->next_sampler = NULL;
}
glUniform1i(pp->obj, pp->param->texture_id);
device_load_texture(program->device, pp->param->texture,
pp->param->texture_id);
@ -720,3 +726,8 @@ void gs_shader_set_default(gs_sparam_t *param)
{
gs_shader_set_val(param, param->def_value.array, param->def_value.num);
}
void gs_shader_set_next_sampler(gs_sparam_t *param, gs_samplerstate_t *sampler)
{
param->next_sampler = sampler;
}

1
libobs-opengl/gl-subsystem.h
View file

@ -300,6 +300,7 @@ struct gs_shader_param {
char *name;
gs_shader_t *shader;
gs_samplerstate_t *next_sampler;
GLint texture_id;
size_t sampler_id;
int array_count;