Merge remote-tracking branch 'public/master' into vulkan

2016-04-14 18:30:52 -07:00
parent 547032c56a eeff133158
commit 76fa7b16f4
6 changed files with 36 additions and 8 deletions
--- a/src/compiler/nir/nir_intrinsics.h
+++ b/src/compiler/nir/nir_intrinsics.h
@@ -179,7 +179,7 @@ INTRINSIC(image_samples, 0, ARR(0), true, 1, 1, 0, xx, xx, xx,
 * Vulkan descriptor set intrinsic
 *
 * The Vulkan API uses a different binding model from GL.  In the Vulkan
- * API, all external resources are represented by a tripple:
+ * API, all external resources are represented by a tuple:
 *
 * (descriptor set, binding, array index)
 *