From ab1347121448bc9c27ec895e6a2663faa9fc1ef8 Mon Sep 17 00:00:00 2001 From: emakarov Date: Tue, 29 Oct 2024 11:13:45 +0800 Subject: [PATCH] updateTextureTilesMappings -> updateTextureTileMappings changed SDK requirements from 10.0.19041.0 to 10.0.22621.0 --- .github/workflows/build.yml | 2 +- README.md | 2 +- include/nvrhi/nvrhi.h | 2 +- src/d3d11/d3d11-backend.h | 2 +- src/d3d11/d3d11-device.cpp | 2 +- src/d3d12/d3d12-backend.h | 2 +- src/d3d12/d3d12-device.cpp | 2 +- src/validation/validation-backend.h | 2 +- src/validation/validation-device.cpp | 4 ++-- src/vulkan/vulkan-backend.h | 4 ++-- src/vulkan/vulkan-queue.cpp | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9067ab0..6fbafb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: submodules: true - name: Configure - run: cmake -B ${{github.workspace}}/build "-DCMAKE_SYSTEM_VERSION=10.0.19041.0" -DNVRHI_WITH_RTXMU=${{matrix.rtxmu}} -DNVRHI_BUILD_SHARED=ON -DNVRHI_INSTALL=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install + run: cmake -B ${{github.workspace}}/build "-DCMAKE_SYSTEM_VERSION=10.0.22621.0" -DNVRHI_WITH_RTXMU=${{matrix.rtxmu}} -DNVRHI_BUILD_SHARED=ON -DNVRHI_INSTALL=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/README.md b/README.md index 30556e4..9fc669e 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Various early versions of NVRHI have been used in various projects created at NV * Windows or Linux (x64 or ARM64) * CMake 3.10 * A C++ 17 compiler (Visual Studio 2019, GCC 8 or Clang 6) -* Windows SDK version 10.0.19041.0 or later for DX12 support +* Windows SDK version 10.0.22621.0 or later for DX12 support ## Building NVRHI diff --git a/include/nvrhi/nvrhi.h b/include/nvrhi/nvrhi.h index 1ed0128..8fd9214 100644 --- a/include/nvrhi/nvrhi.h +++ b/include/nvrhi/nvrhi.h @@ -2742,7 +2742,7 @@ namespace nvrhi virtual void unmapStagingTexture(IStagingTexture* tex) = 0; virtual void getTextureTiling(ITexture* texture, uint32_t* numTiles, PackedMipDesc* desc, TileShape* tileShape, uint32_t* subresourceTilingsNum, SubresourceTiling* subresourceTilings) = 0; - virtual void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) = 0; + virtual void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) = 0; virtual BufferHandle createBuffer(const BufferDesc& d) = 0; virtual void *mapBuffer(IBuffer* buffer, CpuAccessMode cpuAccess) = 0; diff --git a/src/d3d11/d3d11-backend.h b/src/d3d11/d3d11-backend.h index 95c842d..33dd665 100644 --- a/src/d3d11/d3d11-backend.h +++ b/src/d3d11/d3d11-backend.h @@ -443,7 +443,7 @@ namespace nvrhi::d3d11 void unmapStagingTexture(IStagingTexture* tex) override; void getTextureTiling(ITexture* texture, uint32_t* numTiles, PackedMipDesc* desc, TileShape* tileShape, uint32_t* subresourceTilingsNum, SubresourceTiling* subresourceTilings) override; - void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; + void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; BufferHandle createBuffer(const BufferDesc& d) override; void *mapBuffer(IBuffer* b, CpuAccessMode mapFlags) override; diff --git a/src/d3d11/d3d11-device.cpp b/src/d3d11/d3d11-device.cpp index 53057c0..da5e093 100644 --- a/src/d3d11/d3d11-device.cpp +++ b/src/d3d11/d3d11-device.cpp @@ -184,7 +184,7 @@ namespace nvrhi::d3d11 utils::NotSupported(); } - void Device::updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) + void Device::updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) { (void)texture; (void)tileMappings; diff --git a/src/d3d12/d3d12-backend.h b/src/d3d12/d3d12-backend.h index f482667..368eb34 100644 --- a/src/d3d12/d3d12-backend.h +++ b/src/d3d12/d3d12-backend.h @@ -1097,7 +1097,7 @@ namespace nvrhi::d3d12 void unmapStagingTexture(IStagingTexture* tex) override; void getTextureTiling(ITexture* texture, uint32_t* numTiles, PackedMipDesc* desc, TileShape* tileShape, uint32_t* subresourceTilingsNum, SubresourceTiling* subresourceTilings) override; - void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; + void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; SamplerFeedbackTextureHandle createSamplerFeedbackTexture(ITexture* pairedTexture, const SamplerFeedbackTextureDesc& desc) override; SamplerFeedbackTextureHandle createSamplerFeedbackForNativeTexture(ObjectType objectType, Object texture, ITexture* pairedTexture) override; diff --git a/src/d3d12/d3d12-device.cpp b/src/d3d12/d3d12-device.cpp index 3dfa551..0a08f7d 100644 --- a/src/d3d12/d3d12-device.cpp +++ b/src/d3d12/d3d12-device.cpp @@ -421,7 +421,7 @@ namespace nvrhi::d3d12 } } - void Device::updateTextureTilesMappings(ITexture* _texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) + void Device::updateTextureTileMappings(ITexture* _texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) { Queue* queue = getQueue(executionQueue); Texture* texture = checked_cast(_texture); diff --git a/src/validation/validation-backend.h b/src/validation/validation-backend.h index 4072794..b38a9e6 100644 --- a/src/validation/validation-backend.h +++ b/src/validation/validation-backend.h @@ -261,7 +261,7 @@ namespace nvrhi::validation void unmapStagingTexture(IStagingTexture* tex) override; void getTextureTiling(ITexture* texture, uint32_t* numTiles, PackedMipDesc* desc, TileShape* tileShape, uint32_t* subresourceTilingsNum, SubresourceTiling* subresourceTilings) override; - void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; + void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; BufferHandle createBuffer(const BufferDesc& d) override; void *mapBuffer(IBuffer* b, CpuAccessMode mapFlags) override; diff --git a/src/validation/validation-device.cpp b/src/validation/validation-device.cpp index 32919a1..bf177d6 100644 --- a/src/validation/validation-device.cpp +++ b/src/validation/validation-device.cpp @@ -246,9 +246,9 @@ namespace nvrhi::validation m_Device->getTextureTiling(texture, numTiles, desc, tileShape, subresourceTilingsNum, subresourceTilings); } - void DeviceWrapper::updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) + void DeviceWrapper::updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) { - m_Device->updateTextureTilesMappings(texture, tileMappings, numTileMappings, executionQueue); + m_Device->updateTextureTileMappings(texture, tileMappings, numTileMappings, executionQueue); } MemoryRequirements DeviceWrapper::getTextureMemoryRequirements(ITexture* texture) diff --git a/src/vulkan/vulkan-backend.h b/src/vulkan/vulkan-backend.h index dff5a6b..a1599e9 100644 --- a/src/vulkan/vulkan-backend.h +++ b/src/vulkan/vulkan-backend.h @@ -251,7 +251,7 @@ namespace nvrhi::vulkan // submits a command buffer to this queue, returns submissionID uint64_t submit(ICommandList* const* ppCmd, size_t numCmd); - void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings); + void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings); // retire any command buffers that have finished execution from the pending execution list void retireCommandBuffers(); @@ -1080,7 +1080,7 @@ namespace nvrhi::vulkan void unmapStagingTexture(IStagingTexture* tex) override; void getTextureTiling(ITexture* texture, uint32_t* numTiles, PackedMipDesc* desc, TileShape* tileShape, uint32_t* subresourceTilingsNum, SubresourceTiling* subresourceTilings) override; - void updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; + void updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue = CommandQueue::Graphics) override; BufferHandle createBuffer(const BufferDesc& d) override; void *mapBuffer(IBuffer* b, CpuAccessMode mapFlags) override; diff --git a/src/vulkan/vulkan-queue.cpp b/src/vulkan/vulkan-queue.cpp index f39b1e0..ebd5552 100644 --- a/src/vulkan/vulkan-queue.cpp +++ b/src/vulkan/vulkan-queue.cpp @@ -183,7 +183,7 @@ namespace nvrhi::vulkan return m_LastSubmittedID; } - void Queue::updateTextureTilesMappings(ITexture* _texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings) + void Queue::updateTextureTileMappings(ITexture* _texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings) { Texture* texture = checked_cast(_texture); @@ -339,11 +339,11 @@ namespace nvrhi::vulkan queueWaitForSemaphore(waitQueueID, getQueueSemaphore(executionQueueID), instance); } - void Device::updateTextureTilesMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) + void Device::updateTextureTileMappings(ITexture* texture, const TextureTilesMapping* tileMappings, uint32_t numTileMappings, CommandQueue executionQueue) { Queue& queue = *m_Queues[uint32_t(executionQueue)]; - queue.updateTextureTilesMappings(texture, tileMappings, numTileMappings); + queue.updateTextureTileMappings(texture, tileMappings, numTileMappings); } uint64_t Device::queueGetCompletedInstance(CommandQueue queue)