Vulkan Refactoring - Eliminated KRTextureManager::m_boundTextures and KRTextureManager::m_boundTextureHandles
This commit is contained in:
@@ -44,10 +44,6 @@ KRTextureManager::KRTextureManager(KRContext& context) : KRResourceManager(conte
|
||||
{
|
||||
m_textureMemUsed = 0;
|
||||
|
||||
for (int iTexture = 0; iTexture < KRENGINE_MAX_TEXTURE_UNITS; iTexture++) {
|
||||
m_boundTextures[iTexture] = NULL;
|
||||
m_boundTextureHandles[iTexture] = 0;
|
||||
}
|
||||
m_memoryTransferredThisFrame = 0;
|
||||
m_streamerComplete = true;
|
||||
|
||||
@@ -231,14 +227,8 @@ KRTexture* KRTextureManager::getTexture(const std::string& name)
|
||||
|
||||
bool KRTextureManager::selectTexture(GLenum target, int iTextureUnit, int iTextureHandle)
|
||||
{
|
||||
if (m_boundTextureHandles[iTextureUnit] != iTextureHandle) {
|
||||
m_boundTextureHandles[iTextureUnit] = iTextureHandle;
|
||||
_setActiveTexture(iTextureUnit);
|
||||
glBindTexture(target, iTextureHandle);
|
||||
// TODO - Vulkan Refactoring
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
long KRTextureManager::getMemUsed()
|
||||
@@ -298,11 +288,7 @@ void KRTextureManager::startFrame(float deltaTime)
|
||||
|
||||
void KRTextureManager::endFrame(float deltaTime)
|
||||
{
|
||||
for (int iTexture = 0; iTexture < KRENGINE_MAX_TEXTURE_UNITS; iTexture++) {
|
||||
if (m_boundTextures[iTexture]) {
|
||||
m_boundTextures[iTexture]->resetPoolExpiry(0.0f, KRTexture::TEXTURE_USAGE_NONE); // Even if the same texture is bound, ensure that they don't expire from the texture pool while in use
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void KRTextureManager::doStreaming(long& memoryRemaining, long& memoryRemainingThisFrame)
|
||||
|
||||
@@ -92,11 +92,8 @@ private:
|
||||
|
||||
unordered_map<std::string, KRTexture*> m_textures;
|
||||
|
||||
KRTexture* m_boundTextures[KRENGINE_MAX_TEXTURE_UNITS];
|
||||
int m_boundTextureHandles[KRENGINE_MAX_TEXTURE_UNITS];
|
||||
float m_maxAnisotropy;
|
||||
|
||||
|
||||
std::set<KRTexture*> m_activeTextures;
|
||||
|
||||
std::vector<std::pair<float, KRTexture*> > m_activeTextures_streamer;
|
||||
|
||||
Reference in New Issue
Block a user