mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
compile Vulkan SPIR-V shaders in CMAKE_CURRENT_BINARY_DIR (#2055)
fixes #2040 * Compiles the Vulkan SPIR-V files in a directory based off of CMAKE_CURRENT_BINARY_DIR. * Changes the search path for the Vulkan SPIR-V files to this directory rather than a semi-arbitrary set of directories.
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include <memory>
|
||||
#include <string.h>
|
||||
#include "harness/errorHelpers.h"
|
||||
#include "harness/os_helpers.h"
|
||||
#include "deviceInfo.h"
|
||||
|
||||
#define MAX_BUFFERS 5
|
||||
@@ -115,7 +116,7 @@ int run_test_with_two_queue(
|
||||
|
||||
VulkanQueue &vkQueue = vkDevice.getQueue();
|
||||
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv");
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv", exe_dir());
|
||||
|
||||
VulkanShaderModule vkBufferShaderModule(vkDevice, vkBufferShader);
|
||||
VulkanDescriptorSetLayoutBindingList vkDescriptorSetLayoutBindingList;
|
||||
@@ -447,7 +448,8 @@ int run_test_with_one_queue(
|
||||
|
||||
VulkanQueue &vkQueue = vkDevice.getQueue();
|
||||
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv");
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv", exe_dir());
|
||||
|
||||
VulkanShaderModule vkBufferShaderModule(vkDevice, vkBufferShader);
|
||||
VulkanDescriptorSetLayoutBindingList vkDescriptorSetLayoutBindingList;
|
||||
vkDescriptorSetLayoutBindingList.addBinding(
|
||||
@@ -749,7 +751,7 @@ int run_test_with_multi_import_same_ctx(
|
||||
|
||||
VulkanQueue &vkQueue = vkDevice.getQueue();
|
||||
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv");
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv", exe_dir());
|
||||
|
||||
VulkanShaderModule vkBufferShaderModule(vkDevice, vkBufferShader);
|
||||
VulkanDescriptorSetLayoutBindingList vkDescriptorSetLayoutBindingList;
|
||||
@@ -1097,7 +1099,7 @@ int run_test_with_multi_import_diff_ctx(
|
||||
|
||||
VulkanQueue &vkQueue = vkDevice.getQueue();
|
||||
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv");
|
||||
std::vector<char> vkBufferShader = readFile("buffer.spv", exe_dir());
|
||||
|
||||
VulkanShaderModule vkBufferShaderModule(vkDevice, vkBufferShader);
|
||||
VulkanDescriptorSetLayoutBindingList vkDescriptorSetLayoutBindingList(
|
||||
|
||||
Reference in New Issue
Block a user