jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs-opengl: Fix border color support on GL textures

master
jp9000 2022-01-12 06:34:00 -08:00
parent b4b396411a
commit 8ed8301452
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libobs-opengl/gl-helpers.h
View File

@ -173,6 +173,12 @@ static inline bool gl_tex_param_f(GLenum target, GLenum param, GLfloat val)
return gl_success("glTexParameterf");
}
static inline bool gl_tex_param_fv(GLenum target, GLenum param, GLfloat *val)
{
glTexParameterfv(target, param, val);
return gl_success("glTexParameterf");
}
static inline bool gl_tex_param_i(GLenum target, GLenum param, GLint val)
{
glTexParameteri(target, param, val);

9
libobs-opengl/gl-subsystem.c
View File

@ -199,6 +199,8 @@ void convert_sampler_info(struct gs_sampler_state *sampler,
else if (sampler->max_anisotropy > max_anisotropy_max)
sampler->max_anisotropy = max_anisotropy_max;
vec4_from_rgba(&sampler->border_color, info->border_color);
blog(LOG_DEBUG,
"convert_sampler_info: 1 <= max_anisotropy <= "
"%d violated, selected: %d, set: %d",
@ -473,6 +475,13 @@ static bool load_texture_sampler(gs_texture_t *tex, gs_samplerstate_t *ss)
success = false;
if (!gl_tex_param_i(tex->gl_target, GL_TEXTURE_WRAP_R, ss->address_w))
success = false;
if (ss->address_u == GL_CLAMP_TO_BORDER ||
ss->address_v == GL_CLAMP_TO_BORDER ||
ss->address_w == GL_CLAMP_TO_BORDER) {
if (!gl_tex_param_fv(tex->gl_target, GL_TEXTURE_BORDER_COLOR,
ss->border_color.ptr))
success = false;
}
if (GLAD_GL_EXT_texture_filter_anisotropic) {
if (!gl_tex_param_i(tex->gl_target,
GL_TEXTURE_MAX_ANISOTROPY_EXT,

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

@ -419,6 +419,7 @@ struct gs_sampler_state {
GLint address_v;
GLint address_w;
GLint max_anisotropy;
struct vec4 border_color;
};
static inline void samplerstate_addref(gs_samplerstate_t *ss)