commit 922a9fb33629a1c41f90dd4f7a8609dea69e9505
author Austin Kinross <aukinros@microsoft.com> Tue Oct 21 14:26:33 2014 -0700
committer Geoff Lang <geofflang@chromium.org> Thu Oct 30 13:32:41 2014 +0000
tree 1f6d3ee44a02ea4fc5ce11b808b249211a2f58e4
parent 409078f1e7c4ec79a1cbc58e3d0b3c399831ac5b

Use D3D11 Debug Annotations when D3D9 is unavailable

Change-Id: I37ac5fe7f0b2fe5e71bd7f0afca55e9894f3463c
Reviewed-on: https://chromium-review.googlesource.com/224512
Tested-by: Austin Kinross <aukinros@microsoft.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/main.cpp

diff --git a/src/libGLESv2/main.cpp b/src/libGLESv2/main.cpp
index 2135d8b..7557348 100644
--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -85,6 +85,10 @@
             {
                 return FALSE;
             }
+
+#ifdef ANGLE_ENABLE_DEBUG_ANNOTATIONS
+            gl::InitializeDebugAnnotations();
+#endif
         }
         // Fall through to initialize index
       case DLL_THREAD_ATTACH:
@@ -101,6 +105,10 @@
         {
             gl::DeallocateCurrent();
             gl::DestroyThreadLocalIndex();
+
+#ifdef ANGLE_ENABLE_DEBUG_ANNOTATIONS
+            gl::UninitializeDebugAnnotations();
+#endif
         }
         break;
       default: