summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPlamena Manolova <[email protected]>2017-01-24 12:39:06 +0000
committerLionel Landwerlin <[email protected]>2017-02-02 12:28:31 +0000
commit96123dbad9f0de74e9b08d08df9e2e75cbfcd745 (patch)
treeafa028e4b83bc08bd10958e66cf123b08e4f25b9 /src
parent6ee4665a774fa423ab53df9d59dc72227e6dec6a (diff)
mesa: Enable EXT_compressed_ETC1_RGB8_sub_texture
Since we already have the functionality in place and games like Game of Thrones seem to depend on this extension, I think it makes sense to enable it by making it part of the extension string even though it's still a draft: https://www.khronos.org/registry/gles/extensions/EXT/EXT_compressed_ETC1_RGB8_sub_texture.txt Note: OES_compressed_ETC1_RGB8_sub_texture seems to be listed in gl2ext.h, but there's no documentation for it in the KHR registry Signed-off-by: Plamena Manolova <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/extensions_table.h1
-rw-r--r--src/mesa/main/teximage.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index b12a9afdd80..75f432bae96 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -199,6 +199,7 @@ EXT(EXT_buffer_storage , ARB_buffer_storage
EXT(EXT_clip_cull_distance , ARB_cull_distance , x , x , x , 30, 2016)
EXT(EXT_color_buffer_float , dummy_true , x , x , x , 30, 2013)
EXT(EXT_compiled_vertex_array , dummy_true , GLL, x , x , x , 1996)
+EXT(EXT_compressed_ETC1_RGB8_sub_texture , OES_compressed_ETC1_RGB8_texture , x , x , ES1, ES2, 2014)
EXT(EXT_copy_image , OES_copy_image , x , x , x , 30, 2014)
EXT(EXT_copy_texture , dummy_true , GLL, x , x , x , 1995)
EXT(EXT_depth_bounds_test , EXT_depth_bounds_test , GLL, GLC, x , x , 2002)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2dc657bcc34..25c5f82a6c6 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1322,7 +1322,6 @@ static bool
compressedteximage_only_format(const struct gl_context *ctx, GLenum format)
{
switch (format) {
- case GL_ETC1_RGB8_OES:
case GL_PALETTE4_RGB8_OES:
case GL_PALETTE4_RGBA8_OES:
case GL_PALETTE4_R5_G6_B5_OES: