From cd41a8197e55472a4d2303624380f2ceb7d7407f Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 31 Mar 2016 20:24:38 -0400 Subject: [PATCH] Clean-up extraneous glFlush(), it's all in the main thread on shared context.. --- src/ui/UITestContext.cpp | 4 ++-- src/visual/MeterContext.cpp | 4 ++-- src/visual/ModeSelectorContext.cpp | 4 ++-- src/visual/PrimaryGLContext.cpp | 4 ++-- src/visual/ScopeContext.cpp | 4 ++-- src/visual/TuningContext.cpp | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ui/UITestContext.cpp b/src/ui/UITestContext.cpp index bb91cdc..652bdbe 100644 --- a/src/ui/UITestContext.cpp +++ b/src/ui/UITestContext.cpp @@ -63,8 +63,8 @@ void UITestContext::Draw() { } void UITestContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/MeterContext.cpp b/src/visual/MeterContext.cpp index e1351bf..8387e64 100644 --- a/src/visual/MeterContext.cpp +++ b/src/visual/MeterContext.cpp @@ -44,8 +44,8 @@ void MeterContext::Draw(float r, float g, float b, float a, float level) { } void MeterContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/ModeSelectorContext.cpp b/src/visual/ModeSelectorContext.cpp index d92b06b..dde83bd 100644 --- a/src/visual/ModeSelectorContext.cpp +++ b/src/visual/ModeSelectorContext.cpp @@ -66,8 +66,8 @@ void ModeSelectorContext::DrawSelector(std::string label, int c, int cMax, bool } void ModeSelectorContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } diff --git a/src/visual/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp index 9a62538..9cbfd4f 100644 --- a/src/visual/PrimaryGLContext.cpp +++ b/src/visual/PrimaryGLContext.cpp @@ -483,9 +483,9 @@ void PrimaryGLContext::BeginDraw(float r, float g, float b) { } void PrimaryGLContext::EndDraw() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void PrimaryGLContext::setHoverAlpha(float hoverAlpha) { diff --git a/src/visual/ScopeContext.cpp b/src/visual/ScopeContext.cpp index 75741c4..89e8a7d 100644 --- a/src/visual/ScopeContext.cpp +++ b/src/visual/ScopeContext.cpp @@ -51,9 +51,9 @@ void ScopeContext::DrawDeviceName(std::string deviceName) { } void ScopeContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void ScopeContext::DrawDivider() { diff --git a/src/visual/TuningContext.cpp b/src/visual/TuningContext.cpp index d31a975..1ce70f8 100644 --- a/src/visual/TuningContext.cpp +++ b/src/visual/TuningContext.cpp @@ -59,9 +59,9 @@ void TuningContext::Draw(float r, float g, float b, float a, float p1, float p2) } void TuningContext::DrawEnd() { - glFlush(); +// glFlush(); - CheckGLError(); +// CheckGLError(); } void TuningContext::DrawTuner(long long freq, int count, float displayPos, float displayWidth) {