diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-29 11:05:44 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-29 11:05:44 +0100 |
| commit | 664c8d30a055f4762a2a60be77c1c8eaec1a5d85 (patch) | |
| tree | ad290b1f173ae3b3c70f4841efd8c46091409579 /Source/Core/VideoBackends | |
| parent | 92fc7c64d6980c8000f8b2a8c794c7968cb74da1 (diff) | |
Remove all trailing whitespaces from our codebase.
Diffstat (limited to 'Source/Core/VideoBackends')
9 files changed, 23 insertions, 23 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 6b6456435e..7c6bb7aeff 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -1582,7 +1582,7 @@ namespace GLExtensions const char* extensions = (const char*)glGetString(GL_EXTENSIONS); std::string tmp(extensions); std::istringstream buffer(tmp); - + while (buffer >> tmp) m_extension_list[tmp] = true; } diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index 5bd938f846..b7621ae78a 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -41,7 +41,7 @@ namespace GLExtensions // Function for checking if the hardware supports an extension // example: if (GLExtensions::Supports("GL_ARB_multi_map")) bool Supports(const std::string& name); - + // Returns OpenGL version in format 430 u32 Version(); } diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index a74ab6966a..cfc48f980a 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -372,7 +372,7 @@ Renderer::Renderer() g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION); InitDriverInfo(); - + // check for the max vertex attributes GLint numvertexattribs = 0; glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs); diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index 03d9d71de3..b3a663ef82 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -39,25 +39,25 @@ StreamBuffer::~StreamBuffer() } /* Shared synchronisation code for ring buffers - * + * * The next three functions are to create/delete/use the OpenGL synchronisation. * ARB_sync (OpenGL 3.2) is used and required. - * + * * To reduce overhead, the complete buffer is splitted up into SYNC_POINTS chunks. * For each of this chunks, there is a fence which checks if this chunk is still in use. - * + * * As our API allows to alloc more memory then it has to use, we have to catch how much is already written. - * + * * m_iterator - writing position * m_free_iterator - last position checked if free * m_used_iterator - last position known to be written - * + * * So on alloc, we have to wait for all slots between m_free_iterator and m_iterator (and set m_free_iterator to m_iterator afterwards). - * + * * We also assume that this buffer is accessed by the gpu between the Unmap and Map function, * so we may create the fences on the start of mapping. * Some here, new fences for the chunks between m_used_iterator and m_iterator (also update m_used_iterator). - * + * * As ring buffers have an ugly behavoir on rollover, have fun to read this code ;) */ @@ -133,7 +133,7 @@ void StreamBuffer::Align(u32 stride) * Described here: https://www.opengl.org/wiki/Buffer_Object_Streaming#Unsynchronized_buffer_mapping * Just do unsync appends until the buffer is full. * When it's full, orphan (alloc a new buffer and free the old one) - * + * * As reallocation is an overhead, this method isn't as fast as it is known to be. */ class MapAndOrphan : public StreamBuffer @@ -203,14 +203,14 @@ public: /* Streaming fifo without mapping ovearhead. * This one usually requires ARB_buffer_storage (OpenGL 4.4). * And is usually not available on OpenGL3 gpus. - * + * * ARB_buffer_storage allows us to render from a mapped buffer. * So we map it persistently in the initialization. - * + * * Unsync mapping sounds like an easy task, but it isn't for threaded drivers. * So every mapping on current close-source driver _will_ end in * at least a round trip time between two threads. - * + * * As persistently mapped buffer can't use orphaning, we also have to sync. */ class BufferStorage : public StreamBuffer @@ -224,9 +224,9 @@ public: // COHERENT_BIT is set so we don't have to use a MemoryBarrier on write // CLIENT_STORAGE_BIT is set since we access the buffer more frequently on the client side then server side glBufferStorage(m_buffertype, m_size, nullptr, - GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_CLIENT_STORAGE_BIT); + GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_CLIENT_STORAGE_BIT); m_pointer = (u8*)glMapBufferRange(m_buffertype, 0, m_size, - GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); + GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); } ~BufferStorage() { @@ -251,7 +251,7 @@ public: /* --- AMD only --- * Another streaming fifo without mapping overhead. * As we can't orphan without mapping, we have to sync. - * + * * This one uses AMD_pinned_memory which is available on all AMD gpus. * OpenGL 4.4 drivers should use BufferStorage. */ diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h index 78b73e1da3..7ebca5cf32 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h @@ -40,7 +40,7 @@ protected: const u32 m_buffertype; const size_t m_size; - + size_t m_iterator; size_t m_used_iterator; size_t m_free_iterator; diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 32225652f6..b27746ce22 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -180,8 +180,8 @@ void Init() glBindTexture(GL_TEXTURE_2D, s_dstTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, renderBufferWidth, renderBufferHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); - - + + FramebufferManager::SetFramebuffer(s_texConvFrameBuffer[0]); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, s_dstTexture, 0); FramebufferManager::SetFramebuffer(0); diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 1c1629fba8..4577987a42 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -157,7 +157,7 @@ void DumpDepth(const std::string& filename) { u32 depth = EfbInterface::GetDepth(x, y); // depth to rgba - *(writePtr++) = depth & 0xff; + *(writePtr++) = depth & 0xff; *(writePtr++) = (depth >> 8) & 0xff; *(writePtr++) = (depth >> 16) & 0xff; *(writePtr++) = 255; diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index 20ba425e22..83970ef6c4 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -13,7 +13,7 @@ namespace SWRenderer void Init(); void Prepare(); void Shutdown(); - + void SetScreenshot(const char *_szFilename); void RenderText(const char* pstr, int left, int top, u32 color); void DrawDebugText(); diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 8ee3715e03..9a57c9a475 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -516,7 +516,7 @@ void Tev::Draw() #if ALLOW_TEV_DUMPS if (g_SWVideoConfig.bDumpTevStages) { - u8 stage[4] = { + u8 stage[4] = { IndirectTex[stageNum][TextureSampler::ALP_SMP], IndirectTex[stageNum][TextureSampler::BLU_SMP], IndirectTex[stageNum][TextureSampler::GRN_SMP], |
