OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert OpenGL swizzle change

Browse source 
Was wrong to use the swizzle -- it was an incorrect assumption on my
part that this could work in the first place (despite working on
windows)
This commit is contained in:
jp9000 2014-04-12 23:57:40 -07:00
parent 0e9b13fcf9
commit bc33b09ba9
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libobs-opengl/gl-subsystem.c
View file

@ -322,21 +322,8 @@ static void strip_mipmap_filter(GLint *filter)
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
}
gl_tex_param_i(tex->gl_target, GL_TEXTURE_SWIZZLE_R,
(tex->format == GS_A8) ? GL_ALPHA : GL_RED);
}
static bool load_texture_sampler(texture_t tex, samplerstate_t ss)

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

@ -27,8 +27,6 @@
#include "gl-helpers.h"
#define USE_FORMAT_SWIZZLE
struct gl_platform;
struct gl_windowinfo;
@ -44,13 +42,8 @@ static inline GLint convert_gs_format(enum gs_color_format format)
case GS_A8: return GL_RGBA;
case GS_R8: return GL_RED;
case GS_RGBA: return GL_RGBA;
#ifdef USE_FORMAT_SWIZZLE
case GS_BGRX: return GL_RGB;
case GS_BGRA: return GL_RGBA;
#else
case GS_BGRX: return GL_BGR;
case GS_BGRA: return GL_BGRA;
#endif
case GS_R10G10B10A2: return GL_RGBA;
case GS_RGBA16: return GL_RGBA;
case GS_R16: return GL_RED;