From 6a552d5a6fc68e5be6fe138551b1128dbf978119 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 18 Nov 2019 22:45:54 -0400 Subject: [PATCH] Allow Canvases to use the r16, rg16, and rgba16 pixel formats. --- src/modules/graphics/opengl/OpenGL.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index f2fcbb01a..1f1135fbc 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/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)