From 559df3766e493b2a6ec42b9e02ecf97794e2003d Mon Sep 17 00:00:00 2001 From: kearwood Date: Sat, 16 Jul 2022 00:17:25 -0700 Subject: [PATCH] KRTexture::createGLTexture renamed to createGPUTexture. Updated all child classes. --- kraken/KRTexture.cpp | 2 +- kraken/KRTexture.h | 2 +- kraken/KRTexture2D.cpp | 2 +- kraken/KRTexture2D.h | 2 +- kraken/KRTextureAnimated.cpp | 2 +- kraken/KRTextureAnimated.h | 2 +- kraken/KRTextureCube.cpp | 2 +- kraken/KRTextureCube.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kraken/KRTexture.cpp b/kraken/KRTexture.cpp index 5dcf153..11111f8 100755 --- a/kraken/KRTexture.cpp +++ b/kraken/KRTexture.cpp @@ -110,7 +110,7 @@ void KRTexture::resize(int max_dim) getContext().getTextureManager()->memoryChanged(m_newTextureMemUsed); getContext().getTextureManager()->addMemoryTransferredThisFrame(m_newTextureMemUsed); - if(!createGLTexture(target_dim)) { + if(!createGPUTexture(target_dim)) { getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed); m_newTextureMemUsed = 0; assert(false); // Failed to create the texture diff --git a/kraken/KRTexture.h b/kraken/KRTexture.h index d13253b..8b0e90b 100755 --- a/kraken/KRTexture.h +++ b/kraken/KRTexture.h @@ -88,7 +88,7 @@ public: void _swapHandles(); protected: - virtual bool createGLTexture(int lod_max_dim) = 0; + virtual bool createGPUTexture(int lod_max_dim) = 0; GLuint getHandle(); struct TextureHandle { diff --git a/kraken/KRTexture2D.cpp b/kraken/KRTexture2D.cpp index 32cf727..4887811 100755 --- a/kraken/KRTexture2D.cpp +++ b/kraken/KRTexture2D.cpp @@ -41,7 +41,7 @@ KRTexture2D::~KRTexture2D() { delete m_pData; } -bool KRTexture2D::createGLTexture(int lod_max_dim) { +bool KRTexture2D::createGPUTexture(int lod_max_dim) { if (m_haveNewHandles) { return true; } diff --git a/kraken/KRTexture2D.h b/kraken/KRTexture2D.h index c3d5ac6..42e764e 100755 --- a/kraken/KRTexture2D.h +++ b/kraken/KRTexture2D.h @@ -52,5 +52,5 @@ public: protected: KRDataBlock *m_pData; - virtual bool createGLTexture(int lod_max_dim); + bool createGPUTexture(int lod_max_dim) override; }; diff --git a/kraken/KRTextureAnimated.cpp b/kraken/KRTextureAnimated.cpp index 5bceb30..b5b132c 100755 --- a/kraken/KRTextureAnimated.cpp +++ b/kraken/KRTextureAnimated.cpp @@ -80,7 +80,7 @@ KRTextureAnimated::~KRTextureAnimated() } -bool KRTextureAnimated::createGLTexture(int lod_max_dim) +bool KRTextureAnimated::createGPUTexture(int lod_max_dim) { return true; } diff --git a/kraken/KRTextureAnimated.h b/kraken/KRTextureAnimated.h index 1816aa9..aa3f3a7 100755 --- a/kraken/KRTextureAnimated.h +++ b/kraken/KRTextureAnimated.h @@ -52,7 +52,7 @@ public: virtual void resize(int max_dim); private: - virtual bool createGLTexture(int lod_max_dim); + bool createGPUTexture(int lod_max_dim) override; float m_frame_rate; int m_frame_count; diff --git a/kraken/KRTextureCube.cpp b/kraken/KRTextureCube.cpp index b3e48c0..e35edc5 100755 --- a/kraken/KRTextureCube.cpp +++ b/kraken/KRTextureCube.cpp @@ -56,7 +56,7 @@ KRTextureCube::~KRTextureCube() { } -bool KRTextureCube::createGLTexture(int lod_max_dim) +bool KRTextureCube::createGPUTexture(int lod_max_dim) { assert(m_iNewHandle == m_iHandle); // Only allow one resize per frame diff --git a/kraken/KRTextureCube.h b/kraken/KRTextureCube.h index 91009dd..e9adeaf 100755 --- a/kraken/KRTextureCube.h +++ b/kraken/KRTextureCube.h @@ -48,7 +48,7 @@ public: // virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage); private: - virtual bool createGLTexture(int lod_max_dim); + bool createGPUTexture(int lod_max_dim) override; const GLenum TARGETS[6] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X,