From 423e7a55cce647811dc2d7b5c03bc35e9e7fac45 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 27 Oct 2015 13:43:25 -0700 Subject: [PATCH] Revert "nir/intrinsics: Add new Vulkan load/store intrinsics" This reverts commit 24bcc89c8fa326b838e9fea002065a40d4d04314. Now that we have the new vulkan_resource_index intrinsic, these variants of the classic UBO/SSBO instrinsics aren't needed. --- src/glsl/nir/nir_intrinsics.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h index 9ef8f5bc6eb..e13951081e9 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/glsl/nir/nir_intrinsics.h @@ -248,14 +248,11 @@ SYSTEM_VALUE(num_work_groups, 3, 0) true, 0, 0, indices, flags) LOAD(uniform, 0, 2, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) -LOAD(ubo, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) +LOAD(ubo, 1, 2, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) LOAD(input, 0, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) LOAD(per_vertex_input, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) LOAD(ssbo, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE) -LOAD(ubo_vk, 1, 3, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) -LOAD(ssbo_vk, 1, 3, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) - /* * Stores work the same way as loads, except now the first register input is * the value or array to store and the optional second input is the indirect @@ -274,6 +271,4 @@ LOAD(ssbo_vk, 1, 3, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) STORE(output, 0, 0, 0, 0) STORE(ssbo, 1, 1, 1, 0) -STORE(ssbo_vk, 1, 1, 3, 0) - -LAST_INTRINSIC(store_ssbo_vk_indirect) +LAST_INTRINSIC(store_ssbo_indirect) -- 2.30.2