summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/TextureCache.cpp
diff options
context:
space:
mode:
authorMarkus Wick <markus+github@selfnet.de>2015-01-11 01:01:18 +0100
committerMarkus Wick <markus+github@selfnet.de>2015-01-11 01:01:18 +0100
commit6c46f27709f314f2552d2ed6316ae79ed8d0c692 (patch)
tree7da54376d616cc5f6a089b02aef657402c4104bf /Source/Core/VideoBackends/OGL/TextureCache.cpp
parent5dd93fd62b491b2d6752645c8adb5ce8948c44f7 (diff)
parent38f42da55aa49d438fda123ccd7c7126e23714f4 (diff)
Merge pull request #1501 from degasus/texture_creation
D3D: remove load texture on creation optimization
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/TextureCache.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp
index 9d4f713d96..bb80b863e8 100644
--- a/Source/Core/VideoBackends/OGL/TextureCache.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp
@@ -108,8 +108,7 @@ bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int l
return SaveTexture(filename, GL_TEXTURE_2D_ARRAY, texture, virtual_width, virtual_height, level);
}
-TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
- unsigned int height, unsigned int expanded_width,
+TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, unsigned int height,
unsigned int tex_levels, PC_TexFormat pcfmt)
{
int gl_format = 0,
@@ -175,10 +174,7 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
glBindTexture(GL_TEXTURE_2D_ARRAY, entry.texture);
glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, tex_levels - 1);
- entry.Load(width, height, expanded_width, 0);
-
- // This isn't needed as Load() also reset the stage in the end
- //TextureCache::SetStage();
+ TextureCache::SetStage();
return &entry;
}