From 491b6ec0350be69b104e254e623f3efa81252565 Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Sun, 11 Aug 2019 17:16:48 -0700 Subject: [PATCH] Revert "libobs-opengl: Add GS_RGBX format" This reverts commit d940b9e580dcf59a4df7e93b740acf0026640add. --- libobs-opengl/gl-subsystem.h | 6 ------ libobs/graphics/graphics.h | 3 --- 2 files changed, 9 deletions(-) diff --git a/libobs-opengl/gl-subsystem.h b/libobs-opengl/gl-subsystem.h index 49a4465fe..230683618 100644 --- a/libobs-opengl/gl-subsystem.h +++ b/libobs-opengl/gl-subsystem.h @@ -41,8 +41,6 @@ static inline GLenum convert_gs_format(enum gs_color_format format) return GL_RED; case GS_RGBA: return GL_RGBA; - case GS_RGBX: - return GL_RGBA; case GS_BGRX: return GL_BGRA; case GS_BGRA: @@ -89,8 +87,6 @@ static inline GLenum convert_gs_internal_format(enum gs_color_format format) return GL_R8; case GS_RGBA: return GL_RGBA; - case GS_RGBX: - return GL_RGB; case GS_BGRX: return GL_RGB; case GS_BGRA: @@ -137,8 +133,6 @@ static inline GLenum get_gl_format_type(enum gs_color_format format) return GL_UNSIGNED_BYTE; case GS_RGBA: return GL_UNSIGNED_BYTE; - case GS_RGBX: - return GL_UNSIGNED_BYTE; case GS_BGRX: return GL_UNSIGNED_BYTE; case GS_BGRA: diff --git a/libobs/graphics/graphics.h b/libobs/graphics/graphics.h index 1e8c0e90a..726225852 100644 --- a/libobs/graphics/graphics.h +++ b/libobs/graphics/graphics.h @@ -58,7 +58,6 @@ enum gs_color_format { GS_A8, GS_R8, GS_RGBA, - GS_RGBX, GS_BGRX, GS_BGRA, GS_R10G10B10A2, @@ -895,8 +894,6 @@ static inline uint32_t gs_get_format_bpp(enum gs_color_format format) return 8; case GS_RGBA: return 32; - case GS_RGBX: - return 32; case GS_BGRX: return 32; case GS_BGRA: