Merge commit '8b0fb1c152fe191768953aa8c77b89034a377f83' into vulkan

This pulls in Rob Clark's const_index changes for NIR
2016-02-09 15:30:39 -08:00
parent 4c5dcccfba 8b0fb1c152
commit 768bd7f272
112 changed files with 4146 additions and 4234 deletions
@@ -27,6 +27,7 @@

 #include "main/core.h" /* for struct gl_context */
 #include "main/context.h"
+#include "main/debug_output.h"
 #include "main/shaderobj.h"
 #include "util/u_atomic.h" /* for p_atomic_cmpxchg */
 #include "util/ralloc.h"