ETC2 decoder

src/Android.mk

@@ -45,6 +45,7 @@ COMMON_SRC_FILES += \
 	Renderer/Clipper.cpp \
 	Renderer/Color.cpp \
 	Renderer/Context.cpp \
+	Renderer/ETC_Decoder.cpp \
 	Renderer/Matrix.cpp \
 	Renderer/PixelProcessor.cpp \
 	Renderer/Plane.cpp \

src/OpenGL/libGLES_CM/libGLES_CM.cbp

@@ -199,6 +199,8 @@
 		<Unit filename="../../Renderer/Color.hpp" />
 		<Unit filename="../../Renderer/Context.cpp" />
 		<Unit filename="../../Renderer/Context.hpp" />
+		<Unit filename="../../Renderer/ETC_Decoder.cpp" />
+		<Unit filename="../../Renderer/ETC_Decoder.hpp" />
 		<Unit filename="../../Renderer/LRUCache.hpp" />
 		<Unit filename="../../Renderer/Matrix.cpp" />
 		<Unit filename="../../Renderer/Matrix.hpp" />

src/OpenGL/libGLESv2/libGLESv2.cbp

@@ -198,6 +198,8 @@
 		<Unit filename="../../Renderer/Color.hpp" />
 		<Unit filename="../../Renderer/Context.cpp" />
 		<Unit filename="../../Renderer/Context.hpp" />
+		<Unit filename="../../Renderer/ETC_Decoder.cpp" />
+		<Unit filename="../../Renderer/ETC_Decoder.hpp" />
 		<Unit filename="../../Renderer/LRUCache.hpp" />
 		<Unit filename="../../Renderer/Matrix.cpp" />
 		<Unit filename="../../Renderer/Matrix.hpp" />

src/Renderer/ETC_Decoder.hpp

+// SwiftShader Software Renderer
+//
+// Copyright(c) 2015 Google Inc.
+//
+// All rights reserved. No part of this software may be copied, distributed, transmitted,
+// transcribed, stored in a retrieval system, translated into any human or computer
+// language by any means, or disclosed to third parties without the explicit written
+// agreement of Google Inc. Without such an agreement, no rights or licenses, express
+// or implied, including but not limited to any patent rights, are granted to you.
+//
+
+class ETC_Decoder
+{
+public:
+	enum InputType
+	{
+		ETC_R_SIGNED,
+		ETC_R_UNSIGNED,
+		ETC_RG_SIGNED,
+		ETC_RG_UNSIGNED,
+		ETC_RGB,
+		ETC_RGB_PUNCHTHROUGH_ALPHA,
+		ETC_RGBA
+	};
+
+	/// ETC_Decoder::Decode - Decodes 1 to 4 channel images to 8 bit output
+	/// @param src            Pointer to ETC2 encoded image
+	/// @param dst            Pointer to BGRA, 8 bit output
+	/// @param w              src image width
+	/// @param h              src image height
+	/// @param dstW           dst image width
+	/// @param dstH           dst image height
+	/// @param dstPitch       dst image pitch (bytes per row)
+	/// @param dstBpp         dst image bytes per pixel
+	/// @param inputType      src's format
+	/// @return               true if the decoding was performed
+	static bool Decode(const unsigned char* src, unsigned char *dst, int w, int h, int dstW, int dstH, int dstPitch, int dstBpp, InputType inputType);
+};

src/Renderer/Surface.hpp

@@ -401,7 +401,6 @@ namespace sw
 		#endif
 		static void decodeATI1(Buffer &internal, const Buffer &external);
 		static void decodeATI2(Buffer &internal, const Buffer &external);
-		static void decodeETC1(Buffer &internal, const Buffer &external);
 		static void decodeEAC(Buffer &internal, const Buffer &external, int nbChannels, bool isSigned);
 		static void decodeETC2(Buffer &internal, const Buffer &external, int nbAlphaBits, bool isSRGB);
 		static void decodeASTC(Buffer &internal, const Buffer &external, int xSize, int ySize, int zSize, bool isSRGB);

src/SwiftShader/SwiftShader.vcxproj

@@ -320,6 +320,7 @@
     <ClCompile Include="..\Main\crc.cpp" />
     <ClCompile Include="..\Main\FrameBufferWin.cpp" />
     <ClCompile Include="..\Main\Register.cpp" />
+    <ClCompile Include="..\Renderer\ETC_Decoder.cpp" />
     <ClCompile Include="..\Shader\Constants.cpp" />
     <ClCompile Include="..\Shader\PixelPipeline.cpp" />
     <ClCompile Include="..\Shader\PixelProgram.cpp" />
@@ -391,6 +392,7 @@
     <ClInclude Include="..\Common\Version.h" />
     <ClInclude Include="..\Main\FrameBufferWin.hpp" />
     <ClInclude Include="..\Main\Register.hpp" />
+    <ClInclude Include="..\Renderer\ETC_Decoder.hpp" />
     <ClInclude Include="..\Renderer\RoutineCache.hpp" />
     <ClInclude Include="..\Shader\PixelPipeline.hpp" />
     <ClInclude Include="..\Shader\PixelProgram.hpp" />

src/SwiftShader/SwiftShader.vcxproj.filters

@@ -185,6 +185,9 @@
     <ClCompile Include="..\Shader\PixelProgram.cpp">
       <Filter>Source Files\Shader</Filter>
     </ClCompile>
+    <ClCompile Include="..\Renderer\ETC_Decoder.cpp">
+      <Filter>Source Files\Renderer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MemoryManager.hpp">
@@ -368,6 +371,9 @@
     <ClInclude Include="..\Shader\PixelPipeline.hpp">
       <Filter>Header Files\Shader</Filter>
     </ClInclude>
+    <ClInclude Include="..\Renderer\ETC_Decoder.hpp">
+      <Filter>Header Files\Renderer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SwiftShader.ini" />