commit a569a50e85d51b0dff1b16cfd2c64222f921b6da
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Apr 29 17:16:21 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri May 01 17:26:57 2015 -0600
tree be493a25c19e0161ce0e74c1080138991e466df3
parent da4a99e924e8152a834a6ee41ed98f60e133438a

bug-13690: Clarification on vkFlushMappedMemory

Bug 13690 - Clarification on the behavior of vkFlushMappedMemory
svn ID: 30914 & 30888

icd/intel/cmd_barrier.c

diff --git a/icd/intel/cmd_barrier.c b/icd/intel/cmd_barrier.c
index 8a097f5..2fe3cc2 100644
--- a/icd/intel/cmd_barrier.c
+++ b/icd/intel/cmd_barrier.c
@@ -245,7 +245,7 @@
         flush_flags |= GEN6_PIPE_CONTROL_DEPTH_CACHE_FLUSH;
     }
 
-    /* CPU write is cache coherent, so VK_MEMORY_OUTPUT_CPU_WRITE_BIT needs no flush. */
+    /* CPU write is cache coherent, so VK_MEMORY_OUTPUT_HOST_WRITE_BIT needs no flush. */
     /* Meta handles flushes, so VK_MEMORY_OUTPUT_TRANSFER_BIT needs no flush. */
 
     if (input_mask & (VK_MEMORY_INPUT_SHADER_READ_BIT | VK_MEMORY_INPUT_UNIFORM_READ_BIT)) {
@@ -261,7 +261,7 @@
     }
 
     /* These bits have no corresponding cache invalidate operation.
-     * VK_MEMORY_INPUT_CPU_READ_BIT
+     * VK_MEMORY_INPUT_HOST_READ_BIT
      * VK_MEMORY_INPUT_INDIRECT_COMMAND_BIT
      * VK_MEMORY_INPUT_INDEX_FETCH_BIT
      * VK_MEMORY_INPUT_COLOR_ATTACHMENT_BIT

icd/intel/intel.h

diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index cb4c743..6a7c1e2 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -57,7 +57,7 @@
 #define INTEL_MAX_RENDER_TARGETS 8
 
 #define INTEL_MEMORY_PROPERTY_ALL (VK_MEMORY_PROPERTY_DEVICE_ONLY | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |\
-    VK_MEMORY_PROPERTY_HOST_DEVICE_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT |\
+    VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT |\
     VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT | VK_MEMORY_PROPERTY_PREFER_HOST_LOCAL |\
     VK_MEMORY_PROPERTY_SHAREABLE_BIT)
 

icd/intel/mem.c

diff --git a/icd/intel/mem.c b/icd/intel/mem.c
index 5b8b37f..b143733 100644
--- a/icd/intel/mem.c
+++ b/icd/intel/mem.c
@@ -157,11 +157,18 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkFlushMappedMemory(
+ICD_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges(
     VkDevice                                  device,
-    VkDeviceMemory                            mem_,
-    VkDeviceSize                              offset,
-    VkDeviceSize                              size)
+    uint32_t                                  memRangeCount,
+    const VkMappedMemoryRange*                pMemRanges)
+{
+    return VK_SUCCESS;
+}
+
+ICD_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(
+    VkDevice                                  device,
+    uint32_t                                  memRangeCount,
+    const VkMappedMemoryRange*                pMemRanges)
 {
     return VK_SUCCESS;
 }