diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-28 23:08:56 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-28 23:08:56 +0100 |
| commit | bc844a168fe54174cd4de04e17ef23849e1fcccb (patch) | |
| tree | 1293208fb1072c1f13cdf16006190a18a7882dfd /Source/Core/VideoBackends | |
| parent | 1a7e3b3227070fcac6499e6e9eaa8d8ad3ef3e49 (diff) | |
| parent | 892012dc02d13229e88db1809f7b785fc3516787 (diff) | |
Merge pull request #100 from Tilka/misc_fixes
Misc fixes
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/StreamBuffer.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.h | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/DebugUtil.cpp | 6 |
5 files changed, 8 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 2fe48f3a06..77ed8e9899 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -154,8 +154,6 @@ bool VideoBackend::Initialize(void *&window_handle) frameCount = 0; - const SCoreStartupParameter& core_params = SConfig::GetInstance().m_LocalCoreStartupParameter; - g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini").c_str()); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index 7c9348d157..775f0c93f3 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -272,6 +272,7 @@ public: glBindBuffer(m_buffertype, 0); glFinish(); // ogl pipeline must be flushed, else this buffer can be in use FreeAlignedMemory(m_pointer); + m_pointer = NULL; } std::pair<u8*, size_t> Map(size_t size, u32 stride) { diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 37d96b88e7..cf17125f97 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -55,7 +55,7 @@ static u32 s_DepthCbufid; static u32 s_Textures[8]; static u32 s_ActiveTexture; -bool SaveTexture(const std::string filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level) +bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level) { if (GLInterface->GetMode() != GLInterfaceMode::MODE_OPENGL) return false; @@ -121,7 +121,7 @@ void TextureCache::TCacheEntry::Bind(unsigned int stage) } } -bool TextureCache::TCacheEntry::Save(const std::string filename, unsigned int level) +bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int level) { return SaveTexture(filename, GL_TEXTURE_2D, texture, virtual_width, virtual_height, level); } diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index b358695534..1f75ae2846 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -48,7 +48,7 @@ private: const float *colmat) override; void Bind(unsigned int stage) override; - bool Save(const std::string filename, unsigned int level); + bool Save(const std::string& filename, unsigned int level); }; ~TextureCache(); @@ -59,6 +59,6 @@ private: TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) override; }; -bool SaveTexture(const std::string filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level); +bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level); } diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 95303d4c2f..6b5b1f7c7d 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -44,7 +44,7 @@ void Init() } } -void SaveTexture(const std::string filename, u32 texmap, s32 mip) +void SaveTexture(const std::string& filename, u32 texmap, s32 mip) { FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1]; u8 subTexmap = texmap & 3; @@ -123,7 +123,7 @@ void DumpActiveTextures() } } -void DumpEfb(const std::string filename) +void DumpEfb(const std::string& filename) { u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4]; u8 *writePtr = data; @@ -146,7 +146,7 @@ void DumpEfb(const std::string filename) delete[] data; } -void DumpDepth(const std::string filename) +void DumpDepth(const std::string& filename) { u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4]; u8 *writePtr = data; |
