Add a hook into the PVRTexLib compressor if it's been found via cmake.

Core/CMakeLists.txt

@@ -76,7 +76,9 @@ ENDIF()
 
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include )
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR} )
+
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/PVRTCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/PVRTCEncoder/include)
 
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/BPTCEncoder/include )
 INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/BPTCEncoder/include )

PVRTCEncoder/CMakeLists.txt

@@ -69,6 +69,19 @@ SET( SOURCES
   src/Image.cpp
 )
 
+CONFIGURE_FILE(
+  "config/PVRTCDefines.h.in"
+  "include/PVRTCDefines.h"
+)
+
+IF( PVRTEXLIB_FOUND )
+  INCLUDE_DIRECTORIES( ${PVRTEXLIB_INCLUDE_DIRS} )
+  SET( SOURCES
+    ${SOURCES}
+    src/CompressorPVRLib.cpp
+  )
+ENDIF()
+
 ADD_LIBRARY( PVRTCEncoder
   ${HEADERS}
   ${SOURCES}
@@ -76,3 +89,7 @@ ADD_LIBRARY( PVRTCEncoder
 
 TARGET_LINK_LIBRARIES( PVRTCEncoder FasTCCore )
 TARGET_LINK_LIBRARIES( PVRTCEncoder FasTCIO )
+
+IF( PVRTEXLIB_FOUND )
+  TARGET_LINK_LIBRARIES( PVRTCEncoder ${PVRTEXLIB_LIBRARIES} )
+ENDIF( PVRTEXLIB_FOUND )

PVRTCEncoder/config/PVRTCDefines.h.in

@@ -0,0 +1,53 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+#cmakedefine PVRTEXLIB_FOUND

PVRTCEncoder/include/PVRTCCompressor.h

@@ -54,6 +54,7 @@
 #define PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
 
 #include "CompressionJob.h"
+#include "PVRTCDefines.h"
 
 namespace PVRTCC {
 
@@ -80,6 +81,12 @@ namespace PVRTCC {
                 bool bTwoBitMode = false,
                 const EWrapMode wrapMode = eWrapMode_Wrap);
 
+#ifdef PVRTEXLIB_FOUND
+  void CompressPVRLib(const CompressionJob &,
+                      bool bTwoBitMode = false,
+                      const EWrapMode wrapMode = eWrapMode_Wrap);
+#endif
+
   static const uint32 kBlockSize = sizeof(uint64);
 
 }  // namespace PVRTCC

PVRTCEncoder/src/CompressorPVRLib.cpp

@@ -0,0 +1,85 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+// Our library include...
+#include "PVRTCCompressor.h"
+
+// PVRLib library include...
+#include "PVRTextureUtilities.h"
+
+#include <cassert>
+
+namespace PVRTCC {
+
+  void CompressPVRLib(const CompressionJob &cj,
+                  bool bTwoBitMode,
+                  const EWrapMode) {
+    pvrtexture::CPVRTextureHeader pvrTexHdr;
+    pvrTexHdr.setPixelFormat(pvrtexture::PVRStandard8PixelType);
+    pvrTexHdr.setWidth(cj.width);
+    pvrTexHdr.setHeight(cj.height);
+    pvrTexHdr.setIsFileCompressed(false);
+    pvrTexHdr.setIsPreMultiplied(false);
+
+    pvrtexture::CPVRTexture pvrTex = pvrtexture::CPVRTexture(pvrTexHdr, cj.inBuf);
+    bool result = pvrtexture::Transcode(pvrTex,
+                                        ePVRTPF_PVRTCI_4bpp_RGBA,
+                                        ePVRTVarTypeUnsignedByte,
+                                        ePVRTCSpacelRGB,
+                                        pvrtexture::ePVRTCFast);
+    assert(result);
+    (void)result;
+
+    memcpy(cj.outBuf, static_cast<uint8 *>(pvrTex.getDataPtr()), cj.width * cj.height / 2);
+  }
+
+}  // namespace PVRTCC

PVRTCEncoder/test/CMakeLists.txt

@@ -50,6 +50,7 @@
 # <http://gamma.cs.unc.edu/FasTC/>
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/PVRTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/src)
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)