adding etc2 compression

examples/Demo/build_atlasses_etc2.bat

@@ -0,0 +1 @@
+..\..\tools\oxyresbuild -x xmls/res.xml --src_data data --dest_data data --compress etc2 -q best

oxygine/src/oxygine/Image.cpp

@@ -626,6 +626,11 @@ namespace oxygine
                         case 6:
                             tf = TF_ETC1;
                             break;
+                        case 23:
+                            tf = TF_ETC2;
+                            break;
+                        default:
+                            OX_ASSERT(!"unknown header format");
                     }
                     _image.format = tf;
                     _offset = sizeof(*header) + header->meta_data_size;

oxygine/src/oxygine/core/ImageData.cpp

@@ -32,6 +32,7 @@ namespace oxygine
             case TF_PVRTCII_2:
             case TF_PVRTCII_4:
             case TF_ETC1:
+            case TF_ETC2:
                 return 0;
             case TF_UNDEFINED:
                 return 0;
@@ -52,6 +53,7 @@ namespace oxygine
             case TF_PVRTCII_2:
             case TF_PVRTCII_4:
             case TF_ETC1:
+            case TF_ETC2:
                 return true;
             default:
                 break;
@@ -77,6 +79,7 @@ namespace oxygine
         CMP(PVRTCII_2, 0);
         CMP(PVRTCII_4, 0);
         CMP(ETC1, 0);
+        CMP(ETC2, 0);
 #undef  CMP
         OX_ASSERT(!"string2TextureFormat undefined format");
         return TF_UNDEFINED;
@@ -116,6 +119,8 @@ namespace oxygine
                 return "PVRTCII_4";
             case TF_ETC1:
                 return "ETC1";
+            case TF_ETC2:
+                return "ETC2";
             case TF_UNDEFINED:
                 return "undefined";
             default:

oxygine/src/oxygine/core/ImageData.h

@@ -25,6 +25,7 @@ namespace oxygine
         TF_PVRTCII_2,
         TF_PVRTCII_4,
         TF_ETC1,
+        TF_ETC2,
     };
 
 #define ALL_FORMATS_SWITCH(format) \

oxygine/src/oxygine/core/gl/NativeTextureGLES.cpp

@@ -7,6 +7,10 @@
 #include "../log.h"
 #include <stdio.h>
 
+#ifndef GL_COMPRESSED_RGBA8_ETC2_EAC
+#   define GL_COMPRESSED_RGBA8_ETC2_EAC      0x9278
+#endif
+
 namespace oxygine
 {
     struct glPixel
@@ -77,6 +81,11 @@ namespace oxygine
                 pixel.type = 0;
                 pixel.compressed = true;
                 break;
+            case TF_ETC2:
+                pixel.format = GL_COMPRESSED_RGBA8_ETC2_EAC;
+                pixel.type = 0;
+                pixel.compressed = true;
+                break;
             default:
                 logs::error("unknown format: %d\n", format);
                 OX_ASSERT(!"unknown format");

oxygine/src/oxygine/core/gl/oxgl.h

@@ -14,6 +14,7 @@
 
 #   define GL_ETC1_RGB8_OES                                        0x8D64
 
+
 extern "C"
 {
 //!--pfngl-begin--!

oxygine/src/oxygine/dev_tools/TexturesInspector.cpp

@@ -155,6 +155,9 @@ namespace oxygine
                         case TF_ETC1:
                             ram /= 2;
                             break;
+                        case TF_ETC2:
+                            ram /= 2;
+                            break;
                         default:
                             break;
                     }

tools/oxyresbuild.py

@@ -48,7 +48,7 @@ def get_parser():
                         action="store_true", default=False)
     parser.add_argument("-c", "--compression", help="type of image "
                         "compression. Defaults to pure rgba8888 packed to png",
-                        choices=["pvrtc", "pvrtc2", "etc1", "no"], default="")
+                        choices=["pvrtc", "pvrtc2", "etc1", "etc2", "no"], default="")
     parser.add_argument("--npot", help="Atlasses dimensions are not power of twos",
                         action="store_true", default=False)
     parser.add_argument("-q", "--quality", help="select quality to "

tools/resbuild/process_atlas.py

@@ -694,16 +694,21 @@ class atlas_Processor(process.Process):
                 if context.compression == "pvrtc":
                     ox_fmt = "PVRTC_4RGBA"
 
-                    compress(path, context.get_inner_dest(
-                        base_name + ".pvr"), "PVRTC1_4")
+                    compress(path, context.get_inner_dest(base_name + ".pvr"), "PVRTC1_4")
                     image_atlas_el.setAttribute("file", base_name + ".pvr")
                     os.remove(path)
 
                 if context.compression == "pvrtc2":
                     ox_fmt = "PVRTC2_4RGBA"
 
-                    compress(path, context.get_inner_dest(
-                        base_name + ".pvr"), "PVRTC2_4")
+                    compress(path, context.get_inner_dest(base_name + ".pvr"), "PVRTC2_4")
+                    image_atlas_el.setAttribute("file", base_name + ".pvr")
+                    os.remove(path)
+
+                if context.compression == "etc2":
+                    ox_fmt = "etc2"
+
+                    compress(path, context.get_inner_dest(base_name + ".pvr"), "ETC2_RGBA")
                     image_atlas_el.setAttribute("file", base_name + ".pvr")
                     os.remove(path)