Merge pull request #88053 from akien-mga/thorvg-reenable-thread-support
thorvg: Re-enable thread support, made opt-in upstream
This commit is contained in:
commit
36e943b6b2
3 changed files with 5 additions and 3 deletions
1
thirdparty/thorvg/inc/config.h
vendored
1
thirdparty/thorvg/inc/config.h
vendored
|
@ -5,6 +5,7 @@
|
|||
#define THORVG_SVG_LOADER_SUPPORT
|
||||
#define THORVG_PNG_LOADER_SUPPORT
|
||||
#define THORVG_JPG_LOADER_SUPPORT
|
||||
#define THORVG_THREAD_SUPPORT
|
||||
|
||||
// For internal debugging:
|
||||
//#define THORVG_LOG_ENABLED
|
||||
|
|
6
thirdparty/thorvg/src/common/tvgLock.h
vendored
6
thirdparty/thorvg/src/common/tvgLock.h
vendored
|
@ -38,10 +38,10 @@ namespace tvg {
|
|||
{
|
||||
Key* key = nullptr;
|
||||
|
||||
ScopedLock(Key& key)
|
||||
ScopedLock(Key& p_key)
|
||||
{
|
||||
key.mtx.lock();
|
||||
this->key = &key;
|
||||
p_key.mtx.lock();
|
||||
key = &p_key;
|
||||
}
|
||||
|
||||
~ScopedLock()
|
||||
|
|
1
thirdparty/thorvg/update-thorvg.sh
vendored
1
thirdparty/thorvg/update-thorvg.sh
vendored
|
@ -38,6 +38,7 @@ cat << EOF > ../inc/config.h
|
|||
#define THORVG_SVG_LOADER_SUPPORT
|
||||
#define THORVG_PNG_LOADER_SUPPORT
|
||||
#define THORVG_JPG_LOADER_SUPPORT
|
||||
#define THORVG_THREAD_SUPPORT
|
||||
|
||||
// For internal debugging:
|
||||
//#define THORVG_LOG_ENABLED
|
||||
|
|
Loading…
Reference in a new issue