lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix demos compilation on Win32

Browse Source
This commit is contained in:
baldurk
2018-12-12 19:01:32 +00:00
parent ff20086e4c
commit caaa2bf144
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
Vendored
+2 -2
View File
@@ -10521,8 +10521,8 @@ void VmaRecorder::RecordCreatePool(uint32_t frameIndex, const VmaPoolCreateInfo&
createInfo.memoryTypeIndex,
createInfo.flags,
createInfo.blockSize,
createInfo.minBlockCount,
createInfo.maxBlockCount,
(uint64_t)createInfo.minBlockCount,
(uint64_t)createInfo.maxBlockCount,
createInfo.frameInUseCount,
pool);
Flush();
util/test/demos/d3d11/d3d11_video_textures.cpp
+4 -4
View File
@@ -187,9 +187,9 @@ float4 main(v2f IN) : SV_Target0
bool video_loaded = false;
// implement IUnknown
ULONG AddRef() { return 1; }
ULONG Release() { return 1; }
HRESULT QueryInterface(const IID &iid, void **obj)
ULONG STDMETHODCALLTYPE AddRef() { return 1; }
ULONG STDMETHODCALLTYPE Release() { return 1; }
HRESULT STDMETHODCALLTYPE QueryInterface(const IID &iid, void **obj)
{
if(iid == __uuidof(IUnknown))
{
@@ -205,7 +205,7 @@ float4 main(v2f IN) : SV_Target0
return E_NOINTERFACE;
}
// implement IMFMediaEngineNotify
HRESULT EventNotify(DWORD ev, DWORD_PTR param1, DWORD param2)
HRESULT STDMETHODCALLTYPE EventNotify(DWORD ev, DWORD_PTR param1, DWORD param2)
{
if(ev == MF_MEDIA_ENGINE_EVENT_CANPLAY)
video_loaded = true;
util/test/demos/d3d12/d3d12_video_textures.cpp
+1 -1
View File
@@ -338,7 +338,7 @@ float4 main(v2f IN) : SV_Target0
for(UINT row = 0; row < numrows[i]; row++)
{
memcpy(dstptr, srcptr, rowsizes[i]);
memcpy(dstptr, srcptr, (size_t)rowsizes[i]);
srcptr += rowsizes[i];
dstptr += layouts[i].Footprint.RowPitch;
}
util/test/demos/demos.vcxproj
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Development|x86">
<ProjectConfiguration Include="Development|Win32">
<Configuration>Development</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
@@ -9,7 +9,7 @@
<Configuration>Development</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>