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

OpenGL: Use texture swizzle for BGRA/BGR/A8

Browse Source 
On some operating systems, with specific drivers it seems that BGR/BGRA
isn't properly treated as such in certain cases.  This fix will
hopefully force the formats to be treated as BGR/BGRA when actually
rendering, which should get around the implementation-specific issue.
This commit is contained in:
jp9000
2014-04-11 13:14:20 -07:00
parent f98c006711
commit 362e008b87
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,9 +311,28 @@ static void strip_mipmap_filter(GLint *filter)
*filter = GL_NEAREST;
}
static inline void apply_swizzle(struct gs_texture *tex)
{
if (tex->format == GS_A8) {
gl_tex_param_i(tex->gl_target, GL_TEXTURE_SWIZZLE_R, GL_ALPHA);
} else {
#ifdef USE_FORMAT_SWIZZLE
bool invert_format =
(tex->format == GS_BGRA || tex->format == GS_BGRX);
gl_tex_param_i(tex->gl_target, GL_TEXTURE_SWIZZLE_R,
invert_format ? GL_BLUE : GL_RED);
gl_tex_param_i(tex->gl_target, GL_TEXTURE_SWIZZLE_B,
invert_format ? GL_RED : GL_BLUE);
#else
gl_tex_param_i(tex->gl_target, GL_TEXTURE_SWIZZLE_R, GL_RED);
#endif
}
}
static bool load_texture_sampler(texture_t tex, samplerstate_t ss)
{
bool success = true;
bool success = true;
GLint min_filter;
if (tex->cur_sampler == ss)
@@ -347,6 +366,8 @@ static bool load_texture_sampler(texture_t tex, samplerstate_t ss)
ss->max_anisotropy))
success = false;
apply_swizzle(tex);
return success;
}