aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-04-14 19:07:06 -0600
committerChia-I Wu <olv@lunarg.com>2015-04-16 17:48:18 +0800
commit783eeb111cd15f134f4ce75a76b12904ceb32e40 (patch)
tree5b92be7df189d4746de6b00e1471c5e7850cd646
parent28c4d5fba7ea129dcbbc7b63b8f62bb3e686f021 (diff)
downloadusermoji-783eeb111cd15f134f4ce75a76b12904ceb32e40.tar.xz
Fixed Windows compilation/link errors ...
without Glave auto-gen changes.
-rw-r--r--BUILD.md2
-rw-r--r--icd/nulldrv/nulldrv.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/BUILD.md b/BUILD.md
index 926cf878..7ea0367f 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -168,7 +168,7 @@ cd _out64
cmake -G "Visual Studio 12 Win64" -DCMAKE_BUILD_TYPE=Debug ..
```
-At this point, you can use Windows Explorer to launch Visual Studio by double-clicking on the "VK.sln" file in the _out64 folder. Once Visual Studio comes up, you can select "Debug" or "Release" from a drop-down list. You can start a build with either the menu (Build->Build Solution), or a keyboard shortcut (Ctrl+Shift+B). As part of the build process, Python scripts will create additional Visual Studio files and projects, along with additional source files. All of these auto-generated files are under the "_out64" folder.
+At this point, you can use Windows Explorer to launch Visual Studio by double-clicking on the "VULKAN.sln" file in the _out64 folder. Once Visual Studio comes up, you can select "Debug" or "Release" from a drop-down list. You can start a build with either the menu (Build->Build Solution), or a keyboard shortcut (Ctrl+Shift+B). As part of the build process, Python scripts will create additional Visual Studio files and projects, along with additional source files. All of these auto-generated files are under the "_out64" folder.
VK programs must be able to find and use the VK.dll libary. Make sure it is either installed in the C:\Windows\System32 folder, or the PATH enviroment variable includes the folder that it is located in.
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 41de195d..7aac1704 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1312,6 +1312,15 @@ ICD_EXPORT VK_RESULT VKAPI vkGetFenceStatus(
return VK_SUCCESS;
}
+ICD_EXPORT VK_RESULT VKAPI vkResetFences(
+ VK_DEVICE device,
+ uint32_t fenceCount,
+ VK_FENCE* pFences)
+{
+ NULLDRV_LOG_FUNC;
+ return VK_SUCCESS;
+}
+
ICD_EXPORT VK_RESULT VKAPI vkWaitForFences(
VK_DEVICE device,
uint32_t fenceCount,