From cdcba00936d3cd62e1fe65193d0e7cb27d13c42b Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Mon, 23 Sep 2019 21:44:41 +0100 Subject: [PATCH] mipgen subresource fixes --- Editor/ModelImporter_GLTF.cpp | 2 +- WickedEngine/wiOcean.cpp | 2 +- WickedEngine/wiVersion.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Editor/ModelImporter_GLTF.cpp b/Editor/ModelImporter_GLTF.cpp index 6dfe6149f..5d09ae664 100644 --- a/Editor/ModelImporter_GLTF.cpp +++ b/Editor/ModelImporter_GLTF.cpp @@ -133,7 +133,7 @@ void RegisterTexture2D(tinygltf::Image *image, const string& type_name) int subresource_index; subresource_index = device->CreateSubresource(tex, SRV, 0, 1, i, 1); assert(subresource_index == i); - subresource_index = device->CreateSubresource(tex, SRV, 0, 1, i, 1); + subresource_index = device->CreateSubresource(tex, UAV, 0, 1, i, 1); assert(subresource_index == i); } diff --git a/WickedEngine/wiOcean.cpp b/WickedEngine/wiOcean.cpp index 1405c4ed7..52f9ffbca 100644 --- a/WickedEngine/wiOcean.cpp +++ b/WickedEngine/wiOcean.cpp @@ -108,7 +108,7 @@ void createTextureAndViews(UINT width, UINT height, FORMAT format, Texture2D* pT int subresource_index; subresource_index = device->CreateSubresource(pTex, SRV, 0, 1, i, 1); assert(subresource_index == i); - subresource_index = device->CreateSubresource(pTex, SRV, 0, 1, i, 1); + subresource_index = device->CreateSubresource(pTex, UAV, 0, 1, i, 1); assert(subresource_index == i); } } diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 27ee36a35..bb1ea7f53 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 28; // minor bug fixes, alterations, refactors, updates - const int revision = 24; + const int revision = 25; long GetVersion()