Memory: Do process and 1st thread tear down.

Addresses #928, #389, and 1st item in #976. Overlaps #916. This had been dropped, when moving away from the old Win32 DLL model. Issue: per-thread tear down for other threads.

Memory: Do process and 1st thread tear down.
ff8e59f5 · John Kessenich · 4ceaab16 · ff8e59f5 · ff8e59f5
Commit ff8e59f5 authored Nov 12, 2017 by John Kessenich
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

InitializeDll.cpp OGLCompilersDLL/InitializeDll.cpp +0 -2

ShaderLang.cpp glslang/MachineIndependent/ShaderLang.cpp +1 -1

No files found.
--- a/OGLCompilersDLL/InitializeDll.cpp
+++ b/OGLCompilersDLL/InitializeDll.cpp
@@ -148,8 +148,6 @@ bool DetachProcess()
    if (ThreadInitializeIndex == OS_INVALID_TLS_INDEX)
        return true;

-    ShFinalize();
-
    success = DetachThread();

    FreePoolIndex();

--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -1299,7 +1299,7 @@ int __fastcall ShFinalize()
    glslang::HlslScanContext::deleteKeywordMap();
 #endif

-    return 1;
+    return DetachProcess() ? 1 : 0;
 }

 //