diff --git a/kraken/KRTextureCube.cpp b/kraken/KRTextureCube.cpp index 149a5d7..f732f8b 100755 --- a/kraken/KRTextureCube.cpp +++ b/kraken/KRTextureCube.cpp @@ -106,14 +106,16 @@ bool KRTextureCube::createGPUTexture(int lod_max_dim) success = false; break; } - } - for(int i=0; i<6; i++) { + for (int i = 0; i < 6; i++) { std::string faceName = getName() + SUFFIXES[i]; - if(m_textures[i]) { - if(m_textures[i]->hasMipmaps()) bMipMaps = true; - m_textures[i]->uploadTexture(/* TARGETS[i], */lod_max_dim, m_new_lod_max_dim); + if (m_textures[i]) { + /* TODO - Vulkan refactoring... + incorporate TARGETS[i], + */ + m_textures[i]->uploadTexture(device, lod_max_dim, m_new_lod_max_dim); } + } } if (!success) { diff --git a/kraken/KRTextureKTX.cpp b/kraken/KRTextureKTX.cpp index 87b7b86..9ab3e93 100755 --- a/kraken/KRTextureKTX.cpp +++ b/kraken/KRTextureKTX.cpp @@ -158,7 +158,7 @@ long KRTextureKTX::getMemRequiredForSize(int max_dim) return memoryRequired; } -bool KRTextureKTX::uploadTexture(int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) +bool KRTextureKTX::uploadTexture(KRDevice& device, int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) { int target_dim = lod_max_dim; if(target_dim < (int)m_min_lod_max_dim) target_dim = m_min_lod_max_dim; @@ -168,8 +168,8 @@ bool KRTextureKTX::uploadTexture(int lod_max_dim, int ¤t_lod_max_dim, bool } // Determine how much memory will be consumed - int width = m_header.pixelWidth; - int height = m_header.pixelHeight; + int width = m_header.pixelWidth; + int height = m_header.pixelHeight; long memoryRequired = 0; long memoryTransferred = 0; diff --git a/kraken/KRTextureKTX.h b/kraken/KRTextureKTX.h index afeb6b7..cf56b54 100755 --- a/kraken/KRTextureKTX.h +++ b/kraken/KRTextureKTX.h @@ -41,7 +41,7 @@ public: virtual ~KRTextureKTX(); virtual std::string getExtension(); - bool uploadTexture(int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; + bool uploadTexture(KRDevice& device, int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; virtual long getMemRequiredForSize(int max_dim); virtual Vector2i getDimensions() const override; diff --git a/kraken/KRTexturePVR.cpp b/kraken/KRTexturePVR.cpp index c7f6ae1..fec71b5 100755 --- a/kraken/KRTexturePVR.cpp +++ b/kraken/KRTexturePVR.cpp @@ -178,7 +178,7 @@ long KRTexturePVR::getMemRequiredForSize(int max_dim) return memoryRequired; } -bool KRTexturePVR::uploadTexture(int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) +bool KRTexturePVR::uploadTexture(KRDevice& device, int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) { int target_dim = lod_max_dim; if(target_dim < (int)m_min_lod_max_dim) target_dim = m_min_lod_max_dim; diff --git a/kraken/KRTexturePVR.h b/kraken/KRTexturePVR.h index c892dbe..fde3858 100755 --- a/kraken/KRTexturePVR.h +++ b/kraken/KRTexturePVR.h @@ -40,7 +40,7 @@ public: virtual ~KRTexturePVR(); virtual std::string getExtension(); - bool uploadTexture(int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; + bool uploadTexture(KRDevice& device, int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; virtual long getMemRequiredForSize(int max_dim); virtual Vector2i getDimensions() const override; diff --git a/kraken/KRTextureTGA.cpp b/kraken/KRTextureTGA.cpp index 2469ec0..a2b7c8f 100755 --- a/kraken/KRTextureTGA.cpp +++ b/kraken/KRTextureTGA.cpp @@ -114,7 +114,7 @@ KRTextureTGA::~KRTextureTGA() } -bool KRTextureTGA::uploadTexture(int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) +bool KRTextureTGA::uploadTexture(KRDevice& device, int lod_max_dim, int ¤t_lod_max_dim, bool compress, bool premultiply_alpha) { m_pData->lock(); TGA_HEADER *pHeader = (TGA_HEADER *)m_pData->getStart(); @@ -349,6 +349,12 @@ bool KRTextureTGA::uploadTexture(int lod_max_dim, int ¤t_lod_max_dim, bool KRTexture *KRTextureTGA::compress(bool premultiply_alpha) { + // TODO - Vulkan refactoring... + assert(false); + return nullptr; + /* + * TODO - Vulkan refactoring... + m_pData->lock(); std::list blocks; @@ -373,12 +379,6 @@ KRTexture *KRTextureTGA::compress(bool premultiply_alpha) GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height)); GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format)); - /* - int texture_base_level = 0; - int texture_max_level = 0; - GLDEBUG(glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, &texture_base_level)); - GLDEBUG(glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, &texture_max_level)); - */ switch(internal_format) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: @@ -423,6 +423,7 @@ KRTexture *KRTextureTGA::compress(bool premultiply_alpha) } return new_texture; + */ } #endif diff --git a/kraken/KRTextureTGA.h b/kraken/KRTextureTGA.h index 165bf04..10ce468 100755 --- a/kraken/KRTextureTGA.h +++ b/kraken/KRTextureTGA.h @@ -40,7 +40,7 @@ public: virtual ~KRTextureTGA(); virtual std::string getExtension(); - bool uploadTexture(int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; + bool uploadTexture(KRDevice& device, int lod_max_dim, int& current_lod_max_dim, bool compress = false, bool premultiply_alpha = false) override; #if !TARGET_OS_IPHONE && !defined(ANDROID) virtual KRTexture *compress(bool premultiply_alpha = false);