diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 18:30:52 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 18:30:52 -0700 |
| commit | 76fa7b16f474253356d3bf59adc91769dc51f184 (patch) | |
| tree | c56b9ef93489818ceb280106471446c76af7c8ec /src/compiler | |
| parent | 547032c56ab032f51781b8fb5808e911a18cc87e (diff) | |
| parent | eeff13315858fcb09eefba9a94e6bae5820572e0 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_intrinsics.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_print.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index 3cb4f95394c..bd00fbbe6cc 100644 --- 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) * diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index bbb4edf3260..84e926905b4 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -518,6 +518,8 @@ print_intrinsic_instr(nir_intrinsic_instr *instr, print_state *state) [NIR_INTRINSIC_STREAM_ID] = "stream-id", [NIR_INTRINSIC_UCP_ID] = "ucp-id", [NIR_INTRINSIC_RANGE] = "range", + [NIR_INTRINSIC_DESC_SET] = "desc-set", + [NIR_INTRINSIC_BINDING] = "binding", }; for (unsigned idx = 1; idx < NIR_INTRINSIC_NUM_INDEX_FLAGS; idx++) { if (!info->index_map[idx]) |