Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
dzhdanNV committed Dec 24, 2024
1 parent ffe40bb commit 91aca09
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 21 deletions.
1 change: 0 additions & 1 deletion Source/D3D11/CommandBufferEmuD3D11.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -747,4 +747,3 @@ NRI_INLINE void CommandBufferEmuD3D11::Annotation(const char* name, uint32_t bgr
Push(m_PushBuffer, name, len);
Push(m_PushBuffer, name, bgra);
}

2 changes: 1 addition & 1 deletion Source/D3D11/DeviceD3D11.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct DeviceD3D11 final : public DeviceBase {
// DeviceBase
//================================================================================================================

inline const DeviceDesc& GetDesc() const override{
inline const DeviceDesc& GetDesc() const override {
return m_Desc;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/D3D12/DeviceD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct DeviceD3D12 final : public DeviceBase {
// DeviceBase
//================================================================================================================

inline const DeviceDesc& GetDesc() const override{
inline const DeviceDesc& GetDesc() const override {
return m_Desc;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/D3DExt.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct AgsFuncTable {
AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINSTANCEDINDIRECTCOUNTINDIRECT DrawIndirectCount;
AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINDEXEDINSTANCEDINDIRECTCOUNTINDIRECT DrawIndexedIndirectCount;

#else
# else

AGS_DRIVEREXTENSIONSDX12_CREATEDEVICE CreateDeviceD3D12;
AGS_DRIVEREXTENSIONSDX12_DESTROYDEVICE DestroyDeviceD3D12;
Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/SharedExternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef nri::AllocationCallbacks AllocationCallbacks;

// Annotations for NVIDIA Nsight Systems
#if NRI_USE_NVTX
#include "NVTX/c/include/nvtx3/nvToolsExt.h"
# include "NVTX/c/include/nvtx3/nvToolsExt.h"
#endif

// Consts
Expand Down
6 changes: 3 additions & 3 deletions Source/Shared/SharedExternal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -793,9 +793,9 @@ nri::Format VKFormatToNRIFormat(uint32_t format) {
}

constexpr std::array<const char*, (size_t)nri::Message::MAX_NUM> MESSAGE_TYPE_NAME = {
"INFO", // INFO,
"WARNING", // WARNING,
"ERROR", // ERROR
"INFO", // INFO,
"WARNING", // WARNING,
"ERROR", // ERROR
};

static void MessageCallback(nri::Message messageType, const char* file, uint32_t line, const char* message, void* userArg) {
Expand Down
2 changes: 1 addition & 1 deletion Source/VK/DescriptorSetVK.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ NRI_INLINE void DescriptorSetVK::UpdateDescriptorRanges(uint32_t rangeOffset, ui
uint32_t writeMaxNum = std::min<uint32_t>(writesPerIteration, rangeNum);
Scratch<VkWriteDescriptorSet> writes = AllocateScratch(m_Device, VkWriteDescriptorSet, writeMaxNum);

Scratch<uint8_t> slabScratch = AllocateScratch(m_Device, uint8_t, slabSize);
Scratch<uint8_t> slabScratch = AllocateScratch(m_Device, uint8_t, slabSize);
SlabAllocator slab(slabScratch, slabSize);

uint32_t j = 0;
Expand Down
2 changes: 1 addition & 1 deletion Source/VK/DeviceVK.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct DeviceVK final : public DeviceBase {
// DeviceBase
//================================================================================================================

inline const DeviceDesc& GetDesc() const override{
inline const DeviceDesc& GetDesc() const override {
return m_Desc;
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Validation/DeviceVal.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ struct DeviceVal final : public DeviceBase {
//================================================================================================================
// DeviceBase
//================================================================================================================
const DeviceDesc& GetDesc() const override{

const DeviceDesc& GetDesc() const override {
return ((DeviceBase&)m_Device).GetDesc();
}

Expand Down
18 changes: 9 additions & 9 deletions Source/Validation/SharedVal.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ inline DeviceVal& GetDeviceVal(T& object) {
uint64_t GetMemorySizeD3D12(const MemoryD3D12Desc& memoryD3D12Desc);

constexpr std::array<const char*, (size_t)nri::DescriptorType::MAX_NUM> DESCRIPTOR_TYPE_NAME = {
"SAMPLER", // SAMPLER,
"CONSTANT_BUFFER", // CONSTANT_BUFFER,
"TEXTURE", // TEXTURE,
"STORAGE_TEXTURE", // STORAGE_TEXTURE,
"BUFFER", // BUFFER,
"STORAGE_BUFFER", // STORAGE_BUFFER,
"STRUCTURED_BUFFER", // STRUCTURED_BUFFER,
"STORAGE_STRUCTURED_BUFFER", // STORAGE_STRUCTURED_BUFFER,
"ACCELERATION_STRUCTURE", // ACCELERATION_STRUCTURE
"SAMPLER", // SAMPLER,
"CONSTANT_BUFFER", // CONSTANT_BUFFER,
"TEXTURE", // TEXTURE,
"STORAGE_TEXTURE", // STORAGE_TEXTURE,
"BUFFER", // BUFFER,
"STORAGE_BUFFER", // STORAGE_BUFFER,
"STRUCTURED_BUFFER", // STRUCTURED_BUFFER,
"STORAGE_STRUCTURED_BUFFER", // STORAGE_STRUCTURED_BUFFER,
"ACCELERATION_STRUCTURE", // ACCELERATION_STRUCTURE
};

constexpr const char* GetDescriptorTypeName(nri::DescriptorType descriptorType) {
Expand Down

0 comments on commit 91aca09

Please sign in to comment.