From 9a5672d7b8a155117a2c3f8375e3b8a5b43d91b7 Mon Sep 17 00:00:00 2001 From: Yong He Date: Sat, 24 Apr 2021 00:17:43 -0700 Subject: Remove resource `Usage` from `gfx` interface. (#1813) * Fix `model-viewer` crash when using Vulkan. Fixing an issue in shader object layout creation for to make sure a correct descriptor set layout is calculated for types that need an implicit constant buffer. * Fix formatting. * Fixes. * Fix memory leak in vulkan. * Remove resource `Usage` from `gfx` interface. --- tools/gfx/cpu/render-cpu.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tools/gfx/cpu/render-cpu.cpp') diff --git a/tools/gfx/cpu/render-cpu.cpp b/tools/gfx/cpu/render-cpu.cpp index 8dd1ccae6..af1641e60 100644 --- a/tools/gfx/cpu/render-cpu.cpp +++ b/tools/gfx/cpu/render-cpu.cpp @@ -1196,13 +1196,11 @@ public: } virtual SLANG_NO_THROW Result SLANG_MCALL createTextureResource( - IResource::Usage initialUsage, const ITextureResource::Desc& desc, const ITextureResource::SubresourceData* initData, ITextureResource** outResource) override { - TextureResource::Desc srcDesc(desc); - srcDesc.setDefaults(initialUsage); + TextureResource::Desc srcDesc = fixupTextureDesc(desc); RefPtr texture = new CPUTextureResource(srcDesc); @@ -1213,11 +1211,11 @@ public: } virtual SLANG_NO_THROW Result SLANG_MCALL createBufferResource( - IResource::Usage initialUsage, - const IBufferResource::Desc& desc, + const IBufferResource::Desc& descIn, const void* initData, IBufferResource** outResource) override { + auto desc = fixupBufferDesc(descIn); RefPtr resource = new CPUBufferResource(desc); SLANG_RETURN_ON_FAIL(resource->init()); if (initData) -- cgit v1.2.3