OSDN Git Service

Always wait for the debugger.
authorNicolas Capens <capn@google.com>
Thu, 12 Feb 2015 19:05:44 +0000 (14:05 -0500)
committerNicolas Capens <capn@google.com>
Thu, 12 Feb 2015 22:25:57 +0000 (22:25 +0000)
Bug 19354873

Change-Id: I2f39ccdd6c5ce10fb583eda500e9da7a6c111d9b
Reviewed-on: https://swiftshader-review.googlesource.com/2250
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
src/OpenGL/libEGL/main.cpp
src/OpenGL/libGL/main.cpp
src/Radiance/libRAD/main.cpp

index 7e4e09a..a7cf892 100644 (file)
@@ -173,10 +173,9 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
     switch(reason)\r
     {\r
     case DLL_PROCESS_ATTACH:\r
-               if(false)\r
-               {\r
+               #ifndef NDEBUG\r
                        WaitForDebugger(instance);\r
-               }\r
+               #endif\r
         return eglAttachProcess();\r
         break;\r
     case DLL_THREAD_ATTACH:\r
index 653b67d..4a09aa5 100644 (file)
@@ -137,10 +137,9 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
     switch(reason)\r
     {\r
     case DLL_PROCESS_ATTACH:\r
-               if(false)\r
-               {\r
+               #ifndef NDEBUG\r
                        WaitForDebugger(instance);\r
-               }\r
+               #endif\r
         return glAttachProcess();\r
         break;\r
     case DLL_THREAD_ATTACH:\r
index ccb0cef..dbc126b 100644 (file)
@@ -136,10 +136,9 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
        switch(reason)\r
        {\r
        case DLL_PROCESS_ATTACH:\r
-               if(false)\r
-               {\r
+               #ifndef NDEBUG\r
                        WaitForDebugger(instance);\r
-               }\r
+               #endif\r
                eglAttachProcess();\r
                break;\r
        case DLL_THREAD_ATTACH:\r