From 638006c0fdab93b4ca7e99c9321e6580a08e5d8d Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 10 Sep 2014 10:28:01 +0100 Subject: [PATCH] (VSyncMonitor) Fixed build break for UBUNTU profile Change-Id: Ie4fe3d883bf2402a722d854eed3213bed2e4f688 --- adaptors/ubuntu/vsync-monitor-ubuntu.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/adaptors/ubuntu/vsync-monitor-ubuntu.cpp b/adaptors/ubuntu/vsync-monitor-ubuntu.cpp index d91aa71..4379025 100644 --- a/adaptors/ubuntu/vsync-monitor-ubuntu.cpp +++ b/adaptors/ubuntu/vsync-monitor-ubuntu.cpp @@ -38,10 +38,6 @@ namespace Adaptor namespace { -#if defined(DEBUG_ENABLED) -Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VSYNC_MONITOR"); -#endif - const int FD_NONE( -1 ); } // unnamed namespace @@ -49,7 +45,7 @@ const int FD_NONE( -1 ); VSyncMonitor::VSyncMonitor() : mFileDescriptor( FD_NONE ), mUseHardwareVSync( false ), - mHardwareVsyncAvailable( false ) + mHardwareVSyncAvailable( false ) { } @@ -58,14 +54,14 @@ VSyncMonitor::~VSyncMonitor() Terminate(); } -void VSyncMonitor::SetUseHardwareVsync( bool useHardware ) +void VSyncMonitor::SetUseHardwareVSync( bool useHardware ) { mUseHardwareVSync = useHardware; } void VSyncMonitor::SetHardwareVSyncAvailable( bool hardwareVSyncAvailable ) { - mHardwareVsyncAvailable = hardwareVSyncAvailable; + mHardwareVSyncAvailable = hardwareVSyncAvailable; } void VSyncMonitor::Initialize() @@ -90,7 +86,7 @@ void VSyncMonitor::Terminate() bool VSyncMonitor::UseHardware() { - return mUseHardware && (FD_NONE != mFileDescriptor ); + return mUseHardwareVSync && mHardwareVSyncAvailable && (FD_NONE != mFileDescriptor ); } -- 2.7.4