diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-10-26 04:53:22 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-10-26 04:54:58 -0400 |
| commit | 49b94e52858e5869ea2872ed75810ba075cfa0eb (patch) | |
| tree | 39f2911237486cd32287ea2b528710e5997ee22c /Source/Core/VideoBackends/OGL/TextureCache.cpp | |
| parent | f895648eb95369e2d302ba93cc4354d3880a7337 (diff) | |
OGL: Get rid of error macros
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 0915f24937..4170480336 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -60,13 +60,6 @@ bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtua glBindTexture(textarget, 0); TextureCache::SetStage(); - const GLenum err = GL_REPORT_ERROR(); - if (GL_NO_ERROR != err) - { - PanicAlert("Can't save texture, GL Error: %d", err); - return false; - } - return TextureToPng(data.data(), width * 4, filename, width, height, true); } @@ -91,7 +84,6 @@ TextureCache::TCacheEntry::~TCacheEntry() TextureCache::TCacheEntry::TCacheEntry() { glGenTextures(1, &texture); - GL_REPORT_ERRORD(); framebuffer = 0; } @@ -214,7 +206,6 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, //width, height, 0, expanded_width * expanded_height/2, temp); } TextureCache::SetStage(); - GL_REPORT_ERRORD(); } TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture( @@ -223,7 +214,6 @@ TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture( TCacheEntry *const entry = new TCacheEntry; glActiveTexture(GL_TEXTURE0+9); glBindTexture(GL_TEXTURE_2D, entry->texture); - GL_REPORT_ERRORD(); const GLenum gl_format = GL_RGBA, @@ -238,12 +228,9 @@ TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture( glGenFramebuffers(1, &entry->framebuffer); FramebufferManager::SetFramebuffer(entry->framebuffer); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, entry->texture, 0); - GL_REPORT_FBO_ERROR(); SetStage(); - GL_REPORT_ERRORD(); - return entry; } @@ -259,14 +246,10 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo FramebufferManager::ResolveAndGetDepthTarget(srcRect) : FramebufferManager::ResolveAndGetRenderTarget(srcRect); - GL_REPORT_ERRORD(); - if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { FramebufferManager::SetFramebuffer(framebuffer); - GL_REPORT_ERRORD(); - glActiveTexture(GL_TEXTURE0+9); glBindTexture(GL_TEXTURE_2D, read_texture); @@ -293,11 +276,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo TargetRectangle R = g_renderer->ConvertEFBRectangle(srcRect); glUniform4f(uniform_location, static_cast<float>(R.left), static_cast<float>(R.top), static_cast<float>(R.right), static_cast<float>(R.bottom)); - GL_REPORT_ERRORD(); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - GL_REPORT_ERRORD(); } if (false == g_ActiveConfig.bCopyEFBToTexture) @@ -325,8 +305,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo FramebufferManager::SetFramebuffer(0); - GL_REPORT_ERRORD(); - if (g_ActiveConfig.bDumpEFBTarget) { static int count = 0; |
