From: Gert Wollny Date: Thu, 24 Jan 2019 11:38:05 +0000 (+0100) Subject: mesa/core: Enable EXT_texture_sRGB_R8 also for desktop GL X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45903cddc371f0893730dc7621cb8dc03db153e0;p=mesa.git mesa/core: Enable EXT_texture_sRGB_R8 also for desktop GL As of Nov/30/2018 the extension is also valid for OpenGL >= 1.2, so enable it accordingly and also add the required view class entry. Signed-off-by: Gert Wollny Reviewed-by: Marek Olšák --- diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 7554db1da6b..f0a37d57559 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -301,7 +301,7 @@ EXT(EXT_texture_object , dummy_true EXT(EXT_texture_rectangle , NV_texture_rectangle , GLL, x , x , x , 2004) EXT(EXT_texture_rg , ARB_texture_rg , x , x , x , ES2, 2011) EXT(EXT_texture_sRGB , EXT_texture_sRGB , GLL, GLC, x , x , 2004) -EXT(EXT_texture_sRGB_R8 , EXT_texture_sRGB_R8 , x , x , x , 30, 2015) +EXT(EXT_texture_sRGB_R8 , EXT_texture_sRGB_R8 , GLL ,GLC, x , 30, 2018) EXT(EXT_texture_sRGB_decode , EXT_texture_sRGB_decode , GLL, GLC, x , 30, 2006) EXT(EXT_texture_shared_exponent , EXT_texture_shared_exponent , GLL, GLC, x , x , 2004) EXT(EXT_texture_snorm , EXT_texture_snorm , GLL, GLC, x , x , 2009) diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 9a064ffd718..62c86eb5f03 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -174,6 +174,7 @@ static const struct internal_format_class_info compatible_internal_formats[] = { {GL_VIEW_CLASS_8_BITS, GL_R8I}, {GL_VIEW_CLASS_8_BITS, GL_R8}, {GL_VIEW_CLASS_8_BITS, GL_R8_SNORM}, + {GL_VIEW_CLASS_8_BITS, GL_SR8_EXT}, {GL_VIEW_CLASS_RGTC1_RED, GL_COMPRESSED_RED_RGTC1}, {GL_VIEW_CLASS_RGTC1_RED, GL_COMPRESSED_SIGNED_RED_RGTC1}, {GL_VIEW_CLASS_RGTC2_RG, GL_COMPRESSED_RG_RGTC2},