Browse Source

Allow Canvases to use the r16, rg16, and rgba16 pixel formats.

Alex Szpakowski 5 years ago
parent
commit
6a552d5a6f
1 changed files with 4 additions and 10 deletions
  1. 4 10
      src/modules/graphics/opengl/OpenGL.cpp

+ 4 - 10
src/modules/graphics/opengl/OpenGL.cpp

@@ -1718,17 +1718,11 @@ bool OpenGL::isPixelFormatSupported(PixelFormat pixelformat, bool rendertarget,
 			return GLAD_ES_VERSION_3_0 || GLAD_EXT_sRGB || GLAD_VERSION_2_1 || GLAD_EXT_texture_sRGB;
 	case PIXELFORMAT_R16:
 	case PIXELFORMAT_RG16:
-		if (rendertarget)
-			return false;
-		else
-			return GLAD_VERSION_3_0
-				|| (GLAD_VERSION_1_1 && GLAD_ARB_texture_rg)
-				|| (GLAD_EXT_texture_norm16 && (GLAD_ES_VERSION_3_0 || GLAD_EXT_texture_rg));
+		return GLAD_VERSION_3_0
+			|| (GLAD_VERSION_1_1 && GLAD_ARB_texture_rg)
+			|| (GLAD_EXT_texture_norm16 && (GLAD_ES_VERSION_3_0 || GLAD_EXT_texture_rg));
 	case PIXELFORMAT_RGBA16:
-		if (rendertarget)
-			return false;
-		else
-			return GLAD_VERSION_1_1 || GLAD_EXT_texture_norm16;
+		return GLAD_VERSION_1_1 || GLAD_EXT_texture_norm16;
 	case PIXELFORMAT_R16F:
 	case PIXELFORMAT_RG16F:
 		if (GLAD_VERSION_1_0)