Merge branch '319_memory_blit_scale_fix' into 'vulkan-cts-1.0'
Fixes ImageBlitFromImage tests scaling blit verification code
Fixes #319
See merge request !456
diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index efa530d..ea47fee 100644
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -174,7 +174,7 @@
"spirv-tools"),
GitRepo(
"https://github.com/KhronosGroup/glslang.git",
- "5184353326ae52d63a1d7c7fccd66269aab768f7",
+ "8e3f4c2d6681eacdc9c976a59b917313f3d073fc",
"glslang"),
]
diff --git a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
index cd08bd1..813e8f7 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
@@ -225,8 +225,12 @@
};
const Unique<VkCommandPool> cmdPool (createCommandPool(vk, vkDevice, &cmdPoolParams));
- // create a minimal amount of command buffers - is there any minimal amount in spec?
+ // \todo Determining the minimum number of command buffers should be a function of available system memory and driver capabilities.
+#if (DE_PTR_SIZE == 4)
+ const unsigned minCommandBuffer = 1024;
+#else
const unsigned minCommandBuffer = 10000;
+#endif
// Command buffer
const VkCommandBufferAllocateInfo cmdBufParams =
@@ -326,8 +330,12 @@
};
const Unique<VkCommandPool> cmdPool (createCommandPool(vk, vkDevice, &cmdPoolParams));
- // create a minimal amount of command buffers - is there any minimal amount in spec?
+ // \todo Determining the minimum number of command buffers should be a function of available system memory and driver capabilities.
+#if (DE_PTR_SIZE == 4)
+ const unsigned minCommandBuffer = 1024;
+#else
const unsigned minCommandBuffer = 10000;
+#endif
// Command buffer
const VkCommandBufferAllocateInfo cmdBufParams =
diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index ba3dc12..3e709bc 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -1861,7 +1861,12 @@
static deUint32 getMaxConcurrent (Context&)
{
+ // \todo Scale this based on available system memory
+#if (DE_PTR_SIZE == 4)
+ return 1024;
+#else
return DEFAULT_MAX_CONCURRENT_OBJECTS;
+#endif
}
struct Parameters
