diff --git a/source/core/slang-memory-arena.h b/source/core/slang-memory-arena.h index 89a82db4592..f08541ddb72 100644 --- a/source/core/slang-memory-arena.h +++ b/source/core/slang-memory-arena.h @@ -382,9 +382,8 @@ inline const char* MemoryArena::allocateString(const char* chars, size_t numChar template SLANG_FORCE_INLINE T* MemoryArena::allocate() { - void* mem = (alignof(T) <= kMinAlignment) - ? allocate(sizeof(T)) - : allocateAligned(sizeof(T), alignof(T)); + void* mem = (alignof(T) <= kMinAlignment) ? allocate(sizeof(T)) + : allocateAligned(sizeof(T), alignof(T)); return reinterpret_cast(mem); } @@ -392,9 +391,8 @@ SLANG_FORCE_INLINE T* MemoryArena::allocate() template SLANG_FORCE_INLINE T* MemoryArena::allocateArray(size_t numElems) { - return (numElems > 0) - ? reinterpret_cast(allocateAligned(sizeof(T) * numElems, alignof(T))) - : nullptr; + return (numElems > 0) ? reinterpret_cast(allocateAligned(sizeof(T) * numElems, alignof(T))) + : nullptr; } // -------------------------------------------------------------------------- diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp index 831c384a572..3982b579dc4 100644 --- a/source/slang/slang-type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -1195,60 +1195,41 @@ struct CPUObjectLayoutRulesImpl : ObjectLayoutRulesImpl case ShaderParameterKind::ConstantBuffer: case ShaderParameterKind::ParameterBlock: // It's a pointer to the actual uniform data - return SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*), - alignof(void*)); + return SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*), alignof(void*)); case ShaderParameterKind::MutableTexture: case ShaderParameterKind::TextureUniformBuffer: case ShaderParameterKind::Texture: // It's a pointer to a texture interface - return SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*), - alignof(void*)); + return SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*), alignof(void*)); case ShaderParameterKind::StructuredBuffer: case ShaderParameterKind::MutableStructuredBuffer: case ShaderParameterKind::AppendConsumeStructuredBuffer: // It's a ptr and a size of the amount of elements - return SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*) * 2, - alignof(void*)); + return SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*) * 2, alignof(void*)); case ShaderParameterKind::RawBuffer: case ShaderParameterKind::Buffer: case ShaderParameterKind::MutableRawBuffer: case ShaderParameterKind::MutableBuffer: // It's a pointer and a size in bytes - return SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*) * 2, - alignof(void*)); + return SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*) * 2, alignof(void*)); case ShaderParameterKind::ShaderStorageBuffer: case ShaderParameterKind::AccelerationStructure: case ShaderParameterKind::SamplerState: // It's a pointer - return SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*), - alignof(void*)); + return SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*), alignof(void*)); case ShaderParameterKind::TextureSampler: case ShaderParameterKind::MutableTextureSampler: { ObjectLayoutInfo info; - info.layoutInfos.add(SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*), - alignof(void*))); - info.layoutInfos.add(SimpleLayoutInfo( - LayoutResourceKind::Uniform, - sizeof(void*), - alignof(void*))); + info.layoutInfos.add( + SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*), alignof(void*))); + info.layoutInfos.add( + SimpleLayoutInfo(LayoutResourceKind::Uniform, sizeof(void*), alignof(void*))); return info; } case ShaderParameterKind::InputRenderTarget: