Browse Source

libobs-opengl: Add GS_RGBX format

Kurt Kartaltepe 6 years ago
parent
commit
d940b9e580
2 changed files with 9 additions and 0 deletions
  1. 6 0
      libobs-opengl/gl-subsystem.h
  2. 3 0
      libobs/graphics/graphics.h

+ 6 - 0
libobs-opengl/gl-subsystem.h

@@ -41,6 +41,8 @@ static inline GLenum convert_gs_format(enum gs_color_format format)
 		return GL_RED;
 		return GL_RED;
 	case GS_RGBA:
 	case GS_RGBA:
 		return GL_RGBA;
 		return GL_RGBA;
+	case GS_RGBX:
+		return GL_RGBA;
 	case GS_BGRX:
 	case GS_BGRX:
 		return GL_BGRA;
 		return GL_BGRA;
 	case GS_BGRA:
 	case GS_BGRA:
@@ -87,6 +89,8 @@ static inline GLenum convert_gs_internal_format(enum gs_color_format format)
 		return GL_R8;
 		return GL_R8;
 	case GS_RGBA:
 	case GS_RGBA:
 		return GL_RGBA;
 		return GL_RGBA;
+	case GS_RGBX:
+		return GL_RGB;
 	case GS_BGRX:
 	case GS_BGRX:
 		return GL_RGB;
 		return GL_RGB;
 	case GS_BGRA:
 	case GS_BGRA:
@@ -133,6 +137,8 @@ static inline GLenum get_gl_format_type(enum gs_color_format format)
 		return GL_UNSIGNED_BYTE;
 		return GL_UNSIGNED_BYTE;
 	case GS_RGBA:
 	case GS_RGBA:
 		return GL_UNSIGNED_BYTE;
 		return GL_UNSIGNED_BYTE;
+	case GS_RGBX:
+		return GL_UNSIGNED_BYTE;
 	case GS_BGRX:
 	case GS_BGRX:
 		return GL_UNSIGNED_BYTE;
 		return GL_UNSIGNED_BYTE;
 	case GS_BGRA:
 	case GS_BGRA:

+ 3 - 0
libobs/graphics/graphics.h

@@ -58,6 +58,7 @@ enum gs_color_format {
 	GS_A8,
 	GS_A8,
 	GS_R8,
 	GS_R8,
 	GS_RGBA,
 	GS_RGBA,
+	GS_RGBX,
 	GS_BGRX,
 	GS_BGRX,
 	GS_BGRA,
 	GS_BGRA,
 	GS_R10G10B10A2,
 	GS_R10G10B10A2,
@@ -878,6 +879,8 @@ static inline uint32_t gs_get_format_bpp(enum gs_color_format format)
 		return 8;
 		return 8;
 	case GS_RGBA:
 	case GS_RGBA:
 		return 32;
 		return 32;
+	case GS_RGBX:
+		return 32;
 	case GS_BGRX:
 	case GS_BGRX:
 		return 32;
 		return 32;
 	case GS_BGRA:
 	case GS_BGRA: