diff options
| author | Greg Hartman <ghartman@google.com> | 2017-02-01 17:42:33 -0800 |
|---|---|---|
| committer | Greg Hartman <ghartman@google.com> | 2017-02-01 17:44:40 -0800 |
| commit | d710bdcbe9d8258ad86dfa3549eb9d9b2c24cdf1 (patch) | |
| tree | d441a579fad3948b822b192f8f8c29ecca33facd | |
| parent | 7605e634f13f05d451206d6ccce8ec3975ae7fca (diff) | |
| download | swiftshader-d710bdcbe9d8258ad86dfa3549eb9d9b2c24cdf1.tar.gz | |
Bring master back in sync with mirror.
This preserves:
The README.google and README.version files
commit 8e6b6f9accfd5642c2ddf6fd977b61302bc47b75
Author: Jorge E. Moreira <jemoreira@google.com>
Date: Fri Dec 2 17:03:54 2016 -0800
Modified MutexLock to use a pthread mutex on Android.
ChangeId: I26b64c86db620739671373fd0d82085744d34fa8
Test: local
Change-Id: Icd7baecf29b46f617cd38626e0fa18488901c002
Test: local
Change-Id: Ia428fc5354ceca4f86b4fb8976f30570fbd3a23d
| -rw-r--r-- | src/OpenGL/libEGL/Display.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/OpenGL/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp index 85dfc7368..82259da09 100644 --- a/src/OpenGL/libEGL/Display.cpp +++ b/src/OpenGL/libEGL/Display.cpp @@ -39,17 +39,20 @@ #include <vector> #include <map> -class Guard { - public: - explicit Guard(sw::BackoffLock* in) : mMutex(in) { - mMutex->lock(); - } - - ~Guard() { - mMutex->unlock(); - } - protected: - sw::BackoffLock* mMutex; +class Guard +{ +public: + explicit Guard(sw::BackoffLock* in) : mMutex(in) + { + mMutex->lock(); + } + + ~Guard() + { + mMutex->unlock(); + } +protected: + sw::BackoffLock* mMutex; }; namespace egl |