updateTextureTilesMappings -> updateTextureTileMappings

changed SDK requirements from 10.0.19041.0 to 10.0.22621.0
NVIDIAGameWorks · Oct 29, 2024 · ab13471 · ab13471
1 parent 4e32b91
commit ab13471
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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*>(_texture);

diff --git 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
@@ -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
@@ -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
@@ -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*>(_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)