From be79d4c0979ff3020766eb0097b8ed46e56b47ad Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Sat, 23 Nov 2019 16:38:08 +0000 Subject: [PATCH] removed platform defines from CommonInclude #54 --- Editor/LightWindow.cpp | 6 +- Editor/Translator.cpp | 12 +- WickedEngine/CommonInclude.h | 14 +- WickedEngine/Platform.h | 13 ++ WickedEngine/RenderPath3D_Deferred.cpp | 4 +- WickedEngine/RenderPath3D_Forward.cpp | 4 +- WickedEngine/RenderPath3D_TiledDeferred.cpp | 4 +- WickedEngine/RenderPath3D_TiledForward.cpp | 4 +- WickedEngine/WickedEngine.h | 1 - WickedEngine/WickedEngine_SHARED.vcxitems | 1 + .../WickedEngine_SHARED.vcxitems.filters | 3 + WickedEngine/wiAudio.cpp | 4 +- WickedEngine/wiDirectInput.cpp | 1 - WickedEngine/wiDirectInput.h | 1 + WickedEngine/wiEmittedParticle.cpp | 40 ++-- WickedEngine/wiFFTGenerator.cpp | 2 +- WickedEngine/wiFont.cpp | 16 +- WickedEngine/wiGPUBVH.cpp | 20 +- WickedEngine/wiGPUSortLib.cpp | 14 +- WickedEngine/wiGraphicsDevice_DX11.cpp | 8 +- WickedEngine/wiGraphicsDevice_DX12.cpp | 4 +- WickedEngine/wiGraphicsDevice_Vulkan.cpp | 24 +-- WickedEngine/wiGraphicsDevice_Vulkan.h | 2 +- WickedEngine/wiHairParticle.cpp | 12 +- WickedEngine/wiHelper.cpp | 2 +- WickedEngine/wiInput.cpp | 1 + WickedEngine/wiJobSystem.cpp | 1 + WickedEngine/wiMath.cpp | 2 +- WickedEngine/wiOcean.cpp | 4 +- WickedEngine/wiRenderer.cpp | 192 +++++++++--------- WickedEngine/wiTextureHelper.cpp | 2 +- WickedEngine/wiTimer.cpp | 1 + WickedEngine/wiVersion.cpp | 2 +- WickedEngine/wiWidget.cpp | 10 +- WickedEngine/wiWidget.h | 2 +- WickedEngine/wiWindowRegistration.h | 1 + 36 files changed, 218 insertions(+), 216 deletions(-) create mode 100644 WickedEngine/Platform.h diff --git a/Editor/LightWindow.cpp b/Editor/LightWindow.cpp index ffc1c779e..3ea7d072e 100644 --- a/Editor/LightWindow.cpp +++ b/Editor/LightWindow.cpp @@ -239,7 +239,7 @@ LightWindow::LightWindow(wiGUI* gui) : GUI(gui) lensflare_Label->SetSize(XMFLOAT2(140, 20)); lightWindow->AddWidget(lensflare_Label); - for (size_t i = 0; i < ARRAYSIZE(lensflare_Button); ++i) + for (size_t i = 0; i < arraysize(lensflare_Button); ++i) { lensflare_Button[i] = new wiButton("LensFlareSlot"); lensflare_Button[i]->SetText(""); @@ -333,7 +333,7 @@ void LightWindow::SetEntity(Entity entity) SetLightType(light->GetType()); - for (size_t i = 0; i < ARRAYSIZE(lensflare_Button); ++i) + for (size_t i = 0; i < arraysize(lensflare_Button); ++i) { if (light->lensFlareRimTextures.size() > i && light->lensFlareRimTextures[i] && !light->lensFlareNames[i].empty()) { @@ -361,7 +361,7 @@ void LightWindow::SetEntity(Entity entity) energySlider->SetEnabled(false); colorPicker->SetEnabled(false); - for (size_t i = 0; i < ARRAYSIZE(lensflare_Button); ++i) + for (size_t i = 0; i < arraysize(lensflare_Button); ++i) { lensflare_Button[i]->SetEnabled(false); } diff --git a/Editor/Translator.cpp b/Editor/Translator.cpp index 5e1a2c014..2d8b77472 100644 --- a/Editor/Translator.cpp +++ b/Editor/Translator.cpp @@ -84,7 +84,7 @@ Translator::Translator() XMFLOAT4(0,0,0,1), XMFLOAT4(1,1,1,1), XMFLOAT4(3,0,0,1), XMFLOAT4(1,1,1,1), }; - vertexCount_Axis = ARRAYSIZE(verts) / 2; + vertexCount_Axis = arraysize(verts) / 2; GPUBufferDesc bd; bd.Usage = USAGE_DEFAULT; @@ -112,7 +112,7 @@ Translator::Translator() XMFLOAT4(1,1,0,1), XMFLOAT4(1,1,1,1), XMFLOAT4(0,1,0,1), XMFLOAT4(1,1,1,1), }; - vertexCount_Plane = ARRAYSIZE(verts) / 2; + vertexCount_Plane = arraysize(verts) / 2; GPUBufferDesc bd; bd.Usage = USAGE_DEFAULT; @@ -169,7 +169,7 @@ Translator::Translator() XMFLOAT4(edge,edge,edge,1), XMFLOAT4(1,1,1,1), XMFLOAT4(-edge,edge,-edge,1), XMFLOAT4(1,1,1,1), }; - vertexCount_Origin = ARRAYSIZE(verts) / 2; + vertexCount_Origin = arraysize(verts) / 2; GPUBufferDesc bd; bd.Usage = USAGE_DEFAULT; @@ -466,7 +466,7 @@ void Translator::Draw(const CameraComponent& camera, CommandList cmd) const const UINT strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); } // xy @@ -502,7 +502,7 @@ void Translator::Draw(const CameraComponent& camera, CommandList cmd) const const UINT strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); } // x @@ -538,7 +538,7 @@ void Translator::Draw(const CameraComponent& camera, CommandList cmd) const const UINT strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); XMStoreFloat4x4(&sb.g_xTransform, mat); sb.g_xColor = state == TRANSLATOR_XYZ ? XMFLOAT4(1, 1, 1, 1) : XMFLOAT4(0.25f, 0.25f, 0.25f, 1); device->UpdateBuffer(wiRenderer::GetConstantBuffer(CBTYPE_MISC), &sb, cmd); diff --git a/WickedEngine/CommonInclude.h b/WickedEngine/CommonInclude.h index 2cf561186..7f6a467fb 100644 --- a/WickedEngine/CommonInclude.h +++ b/WickedEngine/CommonInclude.h @@ -11,6 +11,7 @@ using namespace DirectX; using namespace DirectX::PackedVector; +#define arraysize(a) (sizeof(a) / sizeof(a[0])) #define ALIGN_16 void* operator new(size_t i){return _mm_malloc(i, 16);} void operator delete(void* p){_mm_free(p);} #define SAFE_RELEASE(a) if((a)!=nullptr){(a)->Release();(a)=nullptr;} #define SAFE_DELETE(a) {delete (a);(a)=nullptr;} @@ -22,17 +23,4 @@ static const XMFLOAT4X4 IDENTITYMATRIX = XMFLOAT4X4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0 typedef uint64_t wiCPUHandle; static const wiCPUHandle WI_NULL_HANDLE = 0; - -// Platform specific parts: - -#ifdef _WIN32 -#define NOMINMAX -#include -#include -#endif // _WIN32 - -#ifdef WINSTORE_SUPPORT -#include -#endif // WINSTORE_SUPPORT - #endif //WICKEDENGINE_COMMONINCLUDE_H diff --git a/WickedEngine/Platform.h b/WickedEngine/Platform.h new file mode 100644 index 000000000..9fa86e4f6 --- /dev/null +++ b/WickedEngine/Platform.h @@ -0,0 +1,13 @@ +#pragma once + +#ifdef _WIN32 + +#define NOMINMAX +#include +#include + +#ifdef WINSTORE_SUPPORT +#include +#endif // WINSTORE_SUPPORT + +#endif // _WIN32 diff --git a/WickedEngine/RenderPath3D_Deferred.cpp b/WickedEngine/RenderPath3D_Deferred.cpp index 1fbe531c5..766ebed6e 100644 --- a/WickedEngine/RenderPath3D_Deferred.cpp +++ b/WickedEngine/RenderPath3D_Deferred.cpp @@ -180,7 +180,7 @@ void RenderPath3D_Deferred::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_DEPTHSTENCIL, IMAGE_LAYOUT_COPY_SRC), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_SHADER_RESOURCE, IMAGE_LAYOUT_COPY_DST) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } device->CopyResource(&depthBuffer_Copy, &depthBuffer, cmd); @@ -190,7 +190,7 @@ void RenderPath3D_Deferred::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_COPY_SRC, IMAGE_LAYOUT_DEPTHSTENCIL_READONLY), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_COPY_DST, IMAGE_LAYOUT_SHADER_RESOURCE) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } RenderLinearDepth(cmd); diff --git a/WickedEngine/RenderPath3D_Forward.cpp b/WickedEngine/RenderPath3D_Forward.cpp index f2f08aece..3e4f78d26 100644 --- a/WickedEngine/RenderPath3D_Forward.cpp +++ b/WickedEngine/RenderPath3D_Forward.cpp @@ -132,7 +132,7 @@ void RenderPath3D_Forward::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_DEPTHSTENCIL, IMAGE_LAYOUT_COPY_SRC), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_SHADER_RESOURCE, IMAGE_LAYOUT_COPY_DST) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } device->CopyResource(&depthBuffer_Copy, &depthBuffer, cmd); @@ -142,7 +142,7 @@ void RenderPath3D_Forward::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_COPY_SRC, IMAGE_LAYOUT_DEPTHSTENCIL_READONLY), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_COPY_DST, IMAGE_LAYOUT_SHADER_RESOURCE) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } } diff --git a/WickedEngine/RenderPath3D_TiledDeferred.cpp b/WickedEngine/RenderPath3D_TiledDeferred.cpp index 28b19a5b0..632c02809 100644 --- a/WickedEngine/RenderPath3D_TiledDeferred.cpp +++ b/WickedEngine/RenderPath3D_TiledDeferred.cpp @@ -78,7 +78,7 @@ void RenderPath3D_TiledDeferred::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_DEPTHSTENCIL, IMAGE_LAYOUT_COPY_SRC), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_SHADER_RESOURCE, IMAGE_LAYOUT_COPY_DST) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } device->CopyResource(&depthBuffer_Copy, &depthBuffer, cmd); @@ -88,7 +88,7 @@ void RenderPath3D_TiledDeferred::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_COPY_SRC, IMAGE_LAYOUT_DEPTHSTENCIL_READONLY), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_COPY_DST, IMAGE_LAYOUT_SHADER_RESOURCE) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } RenderLinearDepth(cmd); diff --git a/WickedEngine/RenderPath3D_TiledForward.cpp b/WickedEngine/RenderPath3D_TiledForward.cpp index 48c7dc26c..6e357c162 100644 --- a/WickedEngine/RenderPath3D_TiledForward.cpp +++ b/WickedEngine/RenderPath3D_TiledForward.cpp @@ -59,7 +59,7 @@ void RenderPath3D_TiledForward::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_DEPTHSTENCIL, IMAGE_LAYOUT_COPY_SRC), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_SHADER_RESOURCE, IMAGE_LAYOUT_COPY_DST) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } device->CopyResource(&depthBuffer_Copy, &depthBuffer, cmd); @@ -69,7 +69,7 @@ void RenderPath3D_TiledForward::Render() const GPUBarrier::Image(&depthBuffer, IMAGE_LAYOUT_COPY_SRC, IMAGE_LAYOUT_DEPTHSTENCIL_READONLY), GPUBarrier::Image(&depthBuffer_Copy, IMAGE_LAYOUT_COPY_DST, IMAGE_LAYOUT_SHADER_RESOURCE) }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); } } diff --git a/WickedEngine/WickedEngine.h b/WickedEngine/WickedEngine.h index 4196638c7..a2105f9a0 100644 --- a/WickedEngine/WickedEngine.h +++ b/WickedEngine/WickedEngine.h @@ -49,7 +49,6 @@ #include "wiGUI.h" #include "wiWidget.h" #include "wiHashString.h" -#include "wiWindowRegistration.h" #include "wiArchive.h" #include "wiSpinLock.h" #include "wiRectPacker.h" diff --git a/WickedEngine/WickedEngine_SHARED.vcxitems b/WickedEngine/WickedEngine_SHARED.vcxitems index e0a6359ee..98f2e6e41 100644 --- a/WickedEngine/WickedEngine_SHARED.vcxitems +++ b/WickedEngine/WickedEngine_SHARED.vcxitems @@ -229,6 +229,7 @@ + diff --git a/WickedEngine/WickedEngine_SHARED.vcxitems.filters b/WickedEngine/WickedEngine_SHARED.vcxitems.filters index e9c731abc..00ae63c1c 100644 --- a/WickedEngine/WickedEngine_SHARED.vcxitems.filters +++ b/WickedEngine/WickedEngine_SHARED.vcxitems.filters @@ -1134,6 +1134,9 @@ ENGINE\Scripting\LuaBindings + + ENGINE\Common + diff --git a/WickedEngine/wiAudio.cpp b/WickedEngine/wiAudio.cpp index 2c8042590..5189030b2 100644 --- a/WickedEngine/wiAudio.cpp +++ b/WickedEngine/wiAudio.cpp @@ -102,7 +102,7 @@ namespace wiAudio assert(SUCCEEDED(hr)); XAUDIO2_EFFECT_DESCRIPTOR effects[] = { { reverbEffect, TRUE, 1 } }; - XAUDIO2_EFFECT_CHAIN effectChain = { ARRAYSIZE(effects), effects }; + XAUDIO2_EFFECT_CHAIN effectChain = { arraysize(effects), effects }; hr = audioEngine->CreateSubmixVoice( &reverbSubmix, 1, // reverb is mono @@ -279,7 +279,7 @@ namespace wiAudio { XAUDIO2_SEND_USEFILTER, submixVoices[instance->type] }, { XAUDIO2_SEND_USEFILTER, reverbSubmix }, }; - XAUDIO2_VOICE_SENDS SFXSendList = { ARRAYSIZE(SFXSend), SFXSend }; + XAUDIO2_VOICE_SENDS SFXSendList = { arraysize(SFXSend), SFXSend }; hr = audioEngine->CreateSourceVoice(&instanceinternal->sourceVoice, &soundinternal->wfx, 0, XAUDIO2_DEFAULT_FREQ_RATIO, NULL, &SFXSendList, NULL); diff --git a/WickedEngine/wiDirectInput.cpp b/WickedEngine/wiDirectInput.cpp index 1b0546d8d..ab3a53bd0 100644 --- a/WickedEngine/wiDirectInput.cpp +++ b/WickedEngine/wiDirectInput.cpp @@ -1,5 +1,4 @@ #include "wiDirectInput.h" -#include "CommonInclude.h" namespace wiInput { diff --git a/WickedEngine/wiDirectInput.h b/WickedEngine/wiDirectInput.h index c9e4ddb7d..1ea1460a0 100644 --- a/WickedEngine/wiDirectInput.h +++ b/WickedEngine/wiDirectInput.h @@ -1,5 +1,6 @@ #pragma once #include "CommonInclude.h" +#include "Platform.h" // TODO REFACTOR diff --git a/WickedEngine/wiEmittedParticle.cpp b/WickedEngine/wiEmittedParticle.cpp index ecd73fd54..b1a3bc96d 100644 --- a/WickedEngine/wiEmittedParticle.cpp +++ b/WickedEngine/wiEmittedParticle.cpp @@ -313,13 +313,13 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat indirectBuffers.get(), distanceBuffer.get(), }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); GPUResource* resources[] = { mesh == nullptr ? nullptr : mesh->indexBuffer.get(), mesh == nullptr ? nullptr : (mesh->streamoutBuffer_POS != nullptr ? mesh->streamoutBuffer_POS.get() : mesh->vertexBuffer_POS.get()), }; - device->BindResources(CS, resources, TEXSLOT_ONDEMAND0, ARRAYSIZE(resources), cmd); + device->BindResources(CS, resources, TEXSLOT_ONDEMAND0, arraysize(resources), cmd); device->Barrier(&GPUBarrier::Buffer(indirectBuffers.get(), BUFFER_STATE_INDIRECT_ARGUMENT, BUFFER_STATE_UNORDERED_ACCESS), 1, cmd); @@ -356,11 +356,11 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat counterBuffer.get(), particleBuffer.get(), }; - device->BindResources(CS, res_partition, 0, ARRAYSIZE(res_partition), cmd); + device->BindResources(CS, res_partition, 0, arraysize(res_partition), cmd); GPUResource* uav_partition[] = { sphPartitionCellIndices.get(), }; - device->BindUAVs(CS, uav_partition, 0, ARRAYSIZE(uav_partition), cmd); + device->BindUAVs(CS, uav_partition, 0, arraysize(uav_partition), cmd); device->DispatchIndirect(indirectBuffers.get(), ARGUMENTBUFFER_OFFSET_DISPATCHSIMULATION, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); device->EventEnd(cmd); @@ -375,7 +375,7 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat GPUResource* uav_partitionoffsets[] = { sphPartitionCellOffsets.get(), }; - device->BindUAVs(CS, uav_partitionoffsets, 0, ARRAYSIZE(uav_partitionoffsets), cmd); + device->BindUAVs(CS, uav_partitionoffsets, 0, arraysize(uav_partitionoffsets), cmd); device->Dispatch((uint32_t)ceilf((float)SPH_PARTITION_BUCKET_COUNT / (float)THREADCOUNT_SIMULATION), 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); device->EventEnd(cmd); @@ -388,7 +388,7 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat counterBuffer.get(), sphPartitionCellIndices.get(), }; - device->BindResources(CS, res_partitionoffsets, 0, ARRAYSIZE(res_partitionoffsets), cmd); + device->BindResources(CS, res_partitionoffsets, 0, arraysize(res_partitionoffsets), cmd); device->DispatchIndirect(indirectBuffers.get(), ARGUMENTBUFFER_OFFSET_DISPATCHSIMULATION, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); device->EventEnd(cmd); @@ -406,11 +406,11 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat sphPartitionCellIndices.get(), sphPartitionCellOffsets.get(), }; - device->BindResources(CS, res_density, 0, ARRAYSIZE(res_density), cmd); + device->BindResources(CS, res_density, 0, arraysize(res_density), cmd); GPUResource* uav_density[] = { densityBuffer.get() }; - device->BindUAVs(CS, uav_density, 0, ARRAYSIZE(uav_density), cmd); + device->BindUAVs(CS, uav_density, 0, arraysize(uav_density), cmd); device->DispatchIndirect(indirectBuffers.get(), ARGUMENTBUFFER_OFFSET_DISPATCHSIMULATION, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); device->EventEnd(cmd); @@ -426,11 +426,11 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat sphPartitionCellIndices.get(), sphPartitionCellOffsets.get(), }; - device->BindResources(CS, res_force, 0, ARRAYSIZE(res_force), cmd); + device->BindResources(CS, res_force, 0, arraysize(res_force), cmd); GPUResource* uav_force[] = { particleBuffer.get(), }; - device->BindUAVs(CS, uav_force, 0, ARRAYSIZE(uav_force), cmd); + device->BindUAVs(CS, uav_force, 0, arraysize(uav_force), cmd); device->DispatchIndirect(indirectBuffers.get(), ARGUMENTBUFFER_OFFSET_DISPATCHSIMULATION, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); device->EventEnd(cmd); @@ -444,8 +444,8 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat } device->EventBegin("Simulate", cmd); - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); - device->BindResources(CS, resources, TEXSLOT_ONDEMAND0, ARRAYSIZE(resources), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); + device->BindResources(CS, resources, TEXSLOT_ONDEMAND0, arraysize(resources), cmd); // update CURRENT alive list, write NEW alive list if (IsSorted()) @@ -475,8 +475,8 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat device->EventEnd(cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); - device->UnbindResources(TEXSLOT_ONDEMAND0, ARRAYSIZE(resources), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); + device->UnbindResources(TEXSLOT_ONDEMAND0, arraysize(resources), cmd); device->EventEnd(cmd); @@ -559,18 +559,18 @@ void wiEmittedParticle::UpdateGPU(const TransformComponent& transform, const Mat GPUResource* res[] = { counterBuffer.get(), }; - device->BindResources(CS, res, 0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, 0, arraysize(res), cmd); GPUResource* uavs[] = { indirectBuffers.get(), }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch(1, 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); - device->UnbindResources(0, ARRAYSIZE(res), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); + device->UnbindResources(0, arraysize(res), cmd); device->EventEnd(cmd); } } @@ -599,13 +599,13 @@ void wiEmittedParticle::Draw(const CameraComponent& camera, const MaterialCompon GPUBarrier::Buffer(particleBuffer.get(), BUFFER_STATE_UNORDERED_ACCESS, BUFFER_STATE_SHADER_RESOURCE), GPUBarrier::Buffer(aliveList[1].get(), BUFFER_STATE_UNORDERED_ACCESS, BUFFER_STATE_SHADER_RESOURCE), }; - device->Barrier(barriers, ARRAYSIZE(barriers), cmd); + device->Barrier(barriers, arraysize(barriers), cmd); const GPUResource* res[] = { particleBuffer.get(), aliveList[1].get() // NEW aliveList }; - device->BindResources(VS, res, 0, ARRAYSIZE(res), cmd); + device->BindResources(VS, res, 0, arraysize(res), cmd); device->DrawInstancedIndirect(indirectBuffers.get(), ARGUMENTBUFFER_OFFSET_DRAWPARTICLES, cmd); diff --git a/WickedEngine/wiFFTGenerator.cpp b/WickedEngine/wiFFTGenerator.cpp index e022d2b06..88082a0ae 100644 --- a/WickedEngine/wiFFTGenerator.cpp +++ b/WickedEngine/wiFFTGenerator.cpp @@ -41,7 +41,7 @@ namespace wiFFTGenerator device->BindResources(CS, srvs, TEXSLOT_ONDEMAND0, 1, cmd); const GPUResource* uavs[1] = { &pUAV_Dst }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); // Shader if (istride > 1) diff --git a/WickedEngine/wiFont.cpp b/WickedEngine/wiFont.cpp index 7d7174f9d..bcd828e82 100644 --- a/WickedEngine/wiFont.cpp +++ b/WickedEngine/wiFont.cpp @@ -308,7 +308,7 @@ void wiFont::LoadShaders() }; vertexShader = static_cast(wiResourceManager::GetShaderManager().add(path + "fontVS.cso", wiResourceManager::VERTEXSHADER)); - wiRenderer::GetDevice()->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShader->code, &vertexLayout); + wiRenderer::GetDevice()->CreateInputLayout(layout, arraysize(layout), &vertexShader->code, &vertexLayout); pixelShader = static_cast(wiResourceManager::GetShaderManager().add(path + "fontPS.cso", wiResourceManager::PIXELSHADER)); @@ -500,7 +500,7 @@ void wiFont::Draw(CommandList cmd) const const uint32_t offsets[] = { mem.offset, }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); assert(text.length() * 4 < 65536 && "The index buffer currently only supports so many characters!"); device->BindIndexBuffer(&indexBuffer, INDEXFORMAT_16BIT, 0, cmd); @@ -610,13 +610,7 @@ wstring wiFont::GetText() const } string wiFont::GetTextA() const { -#ifdef WIN32 - if (text.empty()) return std::string(); - int size_needed = WideCharToMultiByte(CP_UTF8, 0, text.c_str(), (int)text.size(), NULL, 0, NULL, NULL); - std::string strTo(size_needed, 0); - WideCharToMultiByte(CP_UTF8, 0, text.c_str(), (int)text.size(), &strTo[0], size_needed, NULL, NULL); - return strTo; -#else - return string(text.begin(),text.end()); -#endif + string retval; + wiHelper::StringConvert(this->text, retval); + return retval; } diff --git a/WickedEngine/wiGPUBVH.cpp b/WickedEngine/wiGPUBVH.cpp index 7c10b7f22..da5f6d29d 100644 --- a/WickedEngine/wiGPUBVH.cpp +++ b/WickedEngine/wiGPUBVH.cpp @@ -381,7 +381,7 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) &primitiveDataBuffer, &primitiveMortonBuffer, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); for (size_t i = 0; i < scene.objects.GetCount(); ++i) { @@ -413,7 +413,7 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) mesh.vertexBuffer_UV1.get(), mesh.vertexBuffer_COL.get(), }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->Dispatch((cb.xBVHMeshTriangleCount + BVH_BUILDER_GROUPSIZE - 1) / BVH_BUILDER_GROUPSIZE, 1, 1, cmd); @@ -425,7 +425,7 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) } device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } device->UpdateBuffer(&primitiveCounterBuffer, &primitiveCount, cmd); device->EventEnd(cmd); @@ -442,19 +442,19 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) &bvhParentBuffer, &bvhFlagBuffer }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); GPUResource* res[] = { &primitiveCounterBuffer, &primitiveIDBuffer, &primitiveMortonBuffer, }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->Dispatch((primitiveCount + BVH_BUILDER_GROUPSIZE - 1) / BVH_BUILDER_GROUPSIZE, 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } device->EventEnd(cmd); @@ -467,7 +467,7 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) &bvhNodeBuffer, &bvhFlagBuffer, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); GPUResource* res[] = { &primitiveCounterBuffer, @@ -475,12 +475,12 @@ void wiGPUBVH::Build(const Scene& scene, CommandList cmd) &primitiveBuffer, &bvhParentBuffer, }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->Dispatch((primitiveCount + BVH_BUILDER_GROUPSIZE - 1) / BVH_BUILDER_GROUPSIZE, 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } device->EventEnd(cmd); @@ -584,7 +584,7 @@ void wiGPUBVH::Bind(SHADERSTAGE stage, CommandList cmd) const &primitiveDataBuffer, &bvhNodeBuffer, }; - device->BindResources(stage, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(stage, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); } void wiGPUBVH::LoadShaders() diff --git a/WickedEngine/wiGPUSortLib.cpp b/WickedEngine/wiGPUSortLib.cpp index c78eeae2b..428580a16 100644 --- a/WickedEngine/wiGPUSortLib.cpp +++ b/WickedEngine/wiGPUSortLib.cpp @@ -86,17 +86,17 @@ namespace wiGPUSortLib const GPUResource* res[] = { &counterBuffer_read, }; - device->BindResources(CS, res, 0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, 0, arraysize(res), cmd); const GPUResource* uavs[] = { &indirectBuffer, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch(1, 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); { GPUBarrier barrier; @@ -112,13 +112,13 @@ namespace wiGPUSortLib const GPUResource* uavs[] = { &indexBuffer_write, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); const GPUResource* resources[] = { &counterBuffer_read, &comparisonBuffer_read, }; - device->BindResources(CS, resources, 0, ARRAYSIZE(resources), cmd); + device->BindResources(CS, resources, 0, arraysize(resources), cmd); // initial sorting: bool bDone = true; @@ -196,8 +196,8 @@ namespace wiGPUSortLib presorted *= 2; } - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); - device->UnbindResources(0, ARRAYSIZE(resources), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); + device->UnbindResources(0, arraysize(resources), cmd); device->EventEnd(cmd); diff --git a/WickedEngine/wiGraphicsDevice_DX11.cpp b/WickedEngine/wiGraphicsDevice_DX11.cpp index 12d41f474..069299cc4 100644 --- a/WickedEngine/wiGraphicsDevice_DX11.cpp +++ b/WickedEngine/wiGraphicsDevice_DX11.cpp @@ -1115,14 +1115,14 @@ GraphicsDevice_DX11::GraphicsDevice_DX11(wiWindowRegistration::window_type windo D3D_DRIVER_TYPE_WARP, D3D_DRIVER_TYPE_REFERENCE, }; - uint32_t numDriverTypes = ARRAYSIZE(driverTypes); + uint32_t numDriverTypes = arraysize(driverTypes); D3D_FEATURE_LEVEL featureLevels[] = { D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0, }; - uint32_t numFeatureLevels = ARRAYSIZE(featureLevels); + uint32_t numFeatureLevels = arraysize(featureLevels); for (uint32_t driverTypeIndex = 0; driverTypeIndex < numDriverTypes; driverTypeIndex++) { @@ -2755,7 +2755,7 @@ void GraphicsDevice_DX11::BindUAVs(SHADERSTAGE stage, const GPUResource *const* } void GraphicsDevice_DX11::UnbindResources(uint32_t slot, uint32_t num, CommandList cmd) { - assert(num <= ARRAYSIZE(__nullBlob) && "Extend nullBlob to support more resource unbinding!"); + assert(num <= arraysize(__nullBlob) && "Extend nullBlob to support more resource unbinding!"); deviceContexts[cmd]->PSSetShaderResources(slot, num, (ID3D11ShaderResourceView**)__nullBlob); deviceContexts[cmd]->VSSetShaderResources(slot, num, (ID3D11ShaderResourceView**)__nullBlob); deviceContexts[cmd]->GSSetShaderResources(slot, num, (ID3D11ShaderResourceView**)__nullBlob); @@ -2765,7 +2765,7 @@ void GraphicsDevice_DX11::UnbindResources(uint32_t slot, uint32_t num, CommandLi } void GraphicsDevice_DX11::UnbindUAVs(uint32_t slot, uint32_t num, CommandList cmd) { - assert(num <= ARRAYSIZE(__nullBlob) && "Extend nullBlob to support more resource unbinding!"); + assert(num <= arraysize(__nullBlob) && "Extend nullBlob to support more resource unbinding!"); deviceContexts[cmd]->CSSetUnorderedAccessViews(slot, num, (ID3D11UnorderedAccessView**)__nullBlob, 0); raster_uavs_count[cmd] = 0; diff --git a/WickedEngine/wiGraphicsDevice_DX12.cpp b/WickedEngine/wiGraphicsDevice_DX12.cpp index 3da47f3c1..a0309fc04 100644 --- a/WickedEngine/wiGraphicsDevice_DX12.cpp +++ b/WickedEngine/wiGraphicsDevice_DX12.cpp @@ -3222,7 +3222,7 @@ namespace wiGraphics ID3D12DescriptorHeap* heaps[] = { GetFrameResources().descriptors[cmd]->resource_heap_GPU, GetFrameResources().descriptors[cmd]->sampler_heap_GPU }; - GetDirectCommandList(cmd)->SetDescriptorHeaps(ARRAYSIZE(heaps), heaps); + GetDirectCommandList(cmd)->SetDescriptorHeaps(arraysize(heaps), heaps); GetDirectCommandList(cmd)->SetGraphicsRootSignature(graphicsRootSig); GetDirectCommandList(cmd)->SetComputeRootSignature(computeRootSig); @@ -3272,7 +3272,7 @@ namespace wiGraphics } pipelines_global.clear(); - for (int i = 0; i < ARRAYSIZE(pipelines_worker); ++i) + for (int i = 0; i < arraysize(pipelines_worker); ++i) { for (auto& x : pipelines_worker[i]) { diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.cpp b/WickedEngine/wiGraphicsDevice_Vulkan.cpp index 5710497d6..49d1e8907 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.cpp +++ b/WickedEngine/wiGraphicsDevice_Vulkan.cpp @@ -912,10 +912,10 @@ namespace wiGraphics std::vector poolSizes; - poolSizes.reserve(ARRAYSIZE(tableLayout) * numTables); + poolSizes.reserve(arraysize(tableLayout) * numTables); for (uint32_t i = 0; i < numTables; ++i) { - for (int j = 0; j < ARRAYSIZE(tableLayout); ++j) + for (int j = 0; j < arraysize(tableLayout); ++j) { poolSizes.push_back(tableLayout[j]); } @@ -959,23 +959,23 @@ namespace wiGraphics } // Create null descriptor fillers: - for (int slot = 0; slot < ARRAYSIZE(null_bufferInfos); ++slot) + for (int slot = 0; slot < arraysize(null_bufferInfos); ++slot) { null_bufferInfos[slot].buffer = device->nullBuffer; null_bufferInfos[slot].offset = 0; null_bufferInfos[slot].range = VK_WHOLE_SIZE; } - for (int slot = 0; slot < ARRAYSIZE(null_imageInfos); ++slot) + for (int slot = 0; slot < arraysize(null_imageInfos); ++slot) { null_imageInfos[slot] = {}; null_imageInfos[slot].imageView = device->nullImageView; null_imageInfos[slot].imageLayout = VK_IMAGE_LAYOUT_GENERAL; } - for (int slot = 0; slot < ARRAYSIZE(null_texelBufferViews); ++slot) + for (int slot = 0; slot < arraysize(null_texelBufferViews); ++slot) { null_texelBufferViews[slot] = device->nullBufferView; } - for (int slot = 0; slot < ARRAYSIZE(null_samplerInfos); ++slot) + for (int slot = 0; slot < arraysize(null_samplerInfos); ++slot) { null_samplerInfos[slot] = {}; null_samplerInfos[slot].imageView = VK_NULL_HANDLE; @@ -3889,7 +3889,7 @@ namespace wiGraphics assert(res == VK_SUCCESS); VkViewport viewports[6]; - for (uint32_t i = 0; i < ARRAYSIZE(viewports); ++i) + for (uint32_t i = 0; i < arraysize(viewports); ++i) { viewports[i].x = 0; viewports[i].y = 0; @@ -3898,17 +3898,17 @@ namespace wiGraphics viewports[i].minDepth = 0; viewports[i].maxDepth = 1; } - vkCmdSetViewport(GetDirectCommandList(cmd), 0, ARRAYSIZE(viewports), viewports); + vkCmdSetViewport(GetDirectCommandList(cmd), 0, arraysize(viewports), viewports); VkRect2D scissors[8]; - for (int i = 0; i < ARRAYSIZE(scissors); ++i) + for (int i = 0; i < arraysize(scissors); ++i) { scissors[i].offset.x = 0; scissors[i].offset.y = 0; scissors[i].extent.width = 65535; scissors[i].extent.height = 65535; } - vkCmdSetScissor(GetDirectCommandList(cmd), 0, ARRAYSIZE(scissors), scissors); + vkCmdSetScissor(GetDirectCommandList(cmd), 0, arraysize(scissors), scissors); float blendConstants[] = { 1,1,1,1 }; vkCmdSetBlendConstants(GetDirectCommandList(cmd), blendConstants); @@ -3955,7 +3955,7 @@ namespace wiGraphics } pipelines_global.clear(); - for (int i = 0; i < ARRAYSIZE(pipelines_worker); ++i) + for (int i = 0; i < arraysize(pipelines_worker); ++i) { for (auto& x : pipelines_worker[i]) { @@ -4602,7 +4602,7 @@ namespace wiGraphics VkPipelineDynamicStateCreateInfo dynamicState = {}; dynamicState.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; - dynamicState.dynamicStateCount = ARRAYSIZE(dynamicStates); + dynamicState.dynamicStateCount = arraysize(dynamicStates); dynamicState.pDynamicStates = dynamicStates; pipelineInfo.pDynamicState = &dynamicState; diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.h b/WickedEngine/wiGraphicsDevice_Vulkan.h index 887f709a5..f74a7f39b 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.h +++ b/WickedEngine/wiGraphicsDevice_Vulkan.h @@ -14,7 +14,7 @@ #ifdef _WIN32 #define VK_USE_PLATFORM_WIN32_KHR -#endif // WIN32 +#endif // _WIN32 #include diff --git a/WickedEngine/wiHairParticle.cpp b/WickedEngine/wiHairParticle.cpp index ee557f10d..f3154fbaf 100644 --- a/WickedEngine/wiHairParticle.cpp +++ b/WickedEngine/wiHairParticle.cpp @@ -125,18 +125,18 @@ void wiHairParticle::UpdateGPU(const MeshComponent& mesh, const MaterialComponen particleBuffer.get(), simulationBuffer.get() }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); GPUResource* res[] = { mesh.indexBuffer.get(), mesh.streamoutBuffer_POS != nullptr ? mesh.streamoutBuffer_POS.get() : mesh.vertexBuffer_POS.get(), }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->Dispatch(hcb.xHairNumDispatchGroups, 1, 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); - device->UnbindResources(TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); + device->UnbindResources(TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->EventEnd(cmd); } @@ -169,8 +169,8 @@ void wiHairParticle::Draw(const CameraComponent& camera, const MaterialComponent const GPUResource* res[] = { material.GetBaseColorMap() }; - device->BindResources(PS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); - device->BindResources(VS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(PS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); + device->BindResources(VS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); } device->BindConstantBuffer(VS, cb.get(), CB_GETBINDSLOT(HairParticleCB), cmd); diff --git a/WickedEngine/wiHelper.cpp b/WickedEngine/wiHelper.cpp index c945550bb..94936ad2c 100644 --- a/WickedEngine/wiHelper.cpp +++ b/WickedEngine/wiHelper.cpp @@ -181,7 +181,7 @@ namespace wiHelper if (!initComplete) { CHAR fileName[1024] = {}; - GetModuleFileNameA(NULL, fileName, ARRAYSIZE(fileName)); + GetModuleFileNameA(NULL, fileName, arraysize(fileName)); appDir = GetDirectoryFromPath(fileName); initComplete = true; } diff --git a/WickedEngine/wiInput.cpp b/WickedEngine/wiInput.cpp index 1df8272e1..2f4717d5b 100644 --- a/WickedEngine/wiInput.cpp +++ b/WickedEngine/wiInput.cpp @@ -1,4 +1,5 @@ #include "wiInput.h" +#include "Platform.h" #include "wiXInput.h" #include "wiDirectInput.h" #include "wiRawInput.h" diff --git a/WickedEngine/wiJobSystem.cpp b/WickedEngine/wiJobSystem.cpp index b5ef652b3..608e7c448 100644 --- a/WickedEngine/wiJobSystem.cpp +++ b/WickedEngine/wiJobSystem.cpp @@ -2,6 +2,7 @@ #include "wiSpinLock.h" #include "wiBackLog.h" #include "wiContainers.h" +#include "Platform.h" #include #include diff --git a/WickedEngine/wiMath.cpp b/WickedEngine/wiMath.cpp index 1ffd0e3ce..1b4f4f027 100644 --- a/WickedEngine/wiMath.cpp +++ b/WickedEngine/wiMath.cpp @@ -413,7 +413,7 @@ namespace wiMath XMFLOAT4(0.9960937500f, 0.1495198903f, 0.0432000000f, 0.4635568513f), XMFLOAT4(0.0019531250f, 0.4828532236f, 0.2432000000f, 0.6064139942f), }; - return HALTON[idx % ARRAYSIZE(HALTON)]; + return HALTON[idx % arraysize(HALTON)]; } uint32_t CompressNormal(const XMFLOAT3& normal) diff --git a/WickedEngine/wiOcean.cpp b/WickedEngine/wiOcean.cpp index ff5e42115..5e0c3285a 100644 --- a/WickedEngine/wiOcean.cpp +++ b/WickedEngine/wiOcean.cpp @@ -260,10 +260,10 @@ void wiOcean::UpdateDisplacementMap(const WeatherComponent& weather, float time, &m_pBuffer_Float2_H0, &m_pBuffer_Float_Omega }; - device->BindResources(CS, cs0_srvs, TEXSLOT_ONDEMAND0, ARRAYSIZE(cs0_srvs), cmd); + device->BindResources(CS, cs0_srvs, TEXSLOT_ONDEMAND0, arraysize(cs0_srvs), cmd); const GPUResource* cs0_uavs[1] = { &m_pBuffer_Float2_Ht }; - device->BindUAVs(CS, cs0_uavs, 0, ARRAYSIZE(cs0_uavs), cmd); + device->BindUAVs(CS, cs0_uavs, 0, arraysize(cs0_uavs), cmd); Ocean_Simulation_PerFrameCB perFrameData; perFrameData.g_Time = time * params.time_scale; diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index d9807757a..4e280b70f 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -1249,15 +1249,15 @@ inline void CreateDirLightShadowCams(const LightComponent& light, CameraComponen // Compute cascade bounding sphere center: XMVECTOR center = XMVectorZero(); - for (int j = 0; j < ARRAYSIZE(corners); ++j) + for (int j = 0; j < arraysize(corners); ++j) { center = XMVectorAdd(center, corners[j]); } - center = center / float(ARRAYSIZE(corners)); + center = center / float(arraysize(corners)); // Compute cascade bounding sphere radius: float radius = 0; - for (int j = 0; j < ARRAYSIZE(corners); ++j) + for (int j = 0; j < arraysize(corners); ++j) { radius = std::max(radius, XMVectorGetX(XMVector3Length(XMVectorSubtract(corners[j], center)))); } @@ -1665,7 +1665,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ 0, instancedBatch.dataOffset }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); } break; case BOUNDVERTEXBUFFERTYPE::POSITION_TEXCOORD: @@ -1688,7 +1688,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ 0, instancedBatch.dataOffset }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); } break; case BOUNDVERTEXBUFFERTYPE::EVERYTHING: @@ -1720,7 +1720,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ 0, instancedBatch.dataOffset }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); } break; default: @@ -1747,7 +1747,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ const GPUResource* res[] = { material.GetBaseColorMap(), }; - device->BindResources(PS, res, TEXSLOT_RENDERER_BASECOLORMAP, ARRAYSIZE(res), cmd); + device->BindResources(PS, res, TEXSLOT_RENDERER_BASECOLORMAP, arraysize(res), cmd); } else { @@ -1759,7 +1759,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ material.GetEmissiveMap(), material.GetOcclusionMap(), }; - device->BindResources(PS, res, TEXSLOT_RENDERER_BASECOLORMAP, ARRAYSIZE(res), cmd); + device->BindResources(PS, res, TEXSLOT_RENDERER_BASECOLORMAP, arraysize(res), cmd); } if (tessellatorRequested) @@ -1767,7 +1767,7 @@ void RenderMeshes(const RenderQueue& renderQueue, RENDERPASS renderPass, uint32_ const GPUResource* res[] = { material.GetDisplacementMap(), }; - device->BindResources(DS, res, TEXSLOT_RENDERER_DISPLACEMENTMAP, ARRAYSIZE(res), cmd); + device->BindResources(DS, res, TEXSLOT_RENDERER_DISPLACEMENTMAP, arraysize(res), cmd); device->BindConstantBuffer(DS, material.constantBuffer.get(), CB_GETBINDSLOT(MaterialCB), cmd); } @@ -1870,7 +1870,7 @@ void LoadShaders() { "POSITION_NORMAL_SUBSETINDEX", 0, MeshComponent::Vertex_POS::FORMAT, 0, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_VERTEX_DATA, 0 }, }; vertexShaders[VSTYPE_OBJECT_DEBUG] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "objectVS_debug.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_OBJECT_DEBUG]->code, &vertexLayouts[VLTYPE_OBJECT_DEBUG]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_OBJECT_DEBUG]->code, &vertexLayouts[VLTYPE_OBJECT_DEBUG]); } { VertexLayoutDesc layout[] = @@ -1892,7 +1892,7 @@ void LoadShaders() { "INSTANCEATLAS", 0, FORMAT_R32G32B32A32_FLOAT, 6, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_OBJECT_COMMON] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "objectVS_common.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_OBJECT_COMMON]->code, &vertexLayouts[VLTYPE_OBJECT_ALL]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_OBJECT_COMMON]->code, &vertexLayouts[VLTYPE_OBJECT_ALL]); } { @@ -1906,7 +1906,7 @@ void LoadShaders() { "INSTANCECOLOR", 0, FORMAT_R32G32B32A32_FLOAT, 1, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_OBJECT_POSITIONSTREAM] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "objectVS_positionstream.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_OBJECT_POSITIONSTREAM]->code, &vertexLayouts[VLTYPE_OBJECT_POS]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_OBJECT_POSITIONSTREAM]->code, &vertexLayouts[VLTYPE_OBJECT_POS]); } { @@ -1922,7 +1922,7 @@ void LoadShaders() { "INSTANCECOLOR", 0, FORMAT_R32G32B32A32_FLOAT, 3, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_OBJECT_SIMPLE] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "objectVS_simple.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_OBJECT_SIMPLE]->code, &vertexLayouts[VLTYPE_OBJECT_POS_TEX]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_OBJECT_SIMPLE]->code, &vertexLayouts[VLTYPE_OBJECT_POS_TEX]); } { @@ -1936,7 +1936,7 @@ void LoadShaders() { "INSTANCECOLOR", 0, FORMAT_R32G32B32A32_FLOAT, 1, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_SHADOW] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "shadowVS.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_SHADOW]->code, &vertexLayouts[VLTYPE_SHADOW_POS]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_SHADOW]->code, &vertexLayouts[VLTYPE_SHADOW_POS]); } { @@ -1952,7 +1952,7 @@ void LoadShaders() { "INSTANCECOLOR", 0, FORMAT_R32G32B32A32_FLOAT, 3, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_SHADOW_ALPHATEST] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "shadowVS_alphatest.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_SHADOW_ALPHATEST]->code, &vertexLayouts[VLTYPE_SHADOW_POS_TEX]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_SHADOW_ALPHATEST]->code, &vertexLayouts[VLTYPE_SHADOW_POS_TEX]); vertexShaders[VSTYPE_SHADOW_TRANSPARENT] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "shadowVS_transparent.cso", wiResourceManager::VERTEXSHADER)); @@ -1966,7 +1966,7 @@ void LoadShaders() { "TEXCOORD", 0, FORMAT_R32G32B32A32_FLOAT, 0, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_VERTEX_DATA, 0 }, }; vertexShaders[VSTYPE_LINE] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "linesVS.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_LINE]->code, &vertexLayouts[VLTYPE_LINE]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_LINE]->code, &vertexLayouts[VLTYPE_LINE]); } @@ -1978,7 +1978,7 @@ void LoadShaders() { "TEXCOORD", 1, FORMAT_R32G32B32A32_FLOAT, 0, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_VERTEX_DATA, 0 }, }; vertexShaders[VSTYPE_TRAIL] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "trailVS.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_TRAIL]->code, &vertexLayouts[VLTYPE_TRAIL]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_TRAIL]->code, &vertexLayouts[VLTYPE_TRAIL]); } @@ -1993,7 +1993,7 @@ void LoadShaders() { "INSTANCEMATRIXPREV", 2, FORMAT_R32G32B32A32_FLOAT, 2, VertexLayoutDesc::APPEND_ALIGNED_ELEMENT, INPUT_PER_INSTANCE_DATA, 1 }, }; vertexShaders[VSTYPE_RENDERLIGHTMAP] = static_cast(wiResourceManager::GetShaderManager().add(SHADERPATH + "renderlightmapVS.cso", wiResourceManager::VERTEXSHADER)); - device->CreateInputLayout(layout, ARRAYSIZE(layout), &vertexShaders[VSTYPE_RENDERLIGHTMAP]->code, &vertexLayouts[VLTYPE_RENDERLIGHTMAP]); + device->CreateInputLayout(layout, arraysize(layout), &vertexShaders[VSTYPE_RENDERLIGHTMAP]->code, &vertexLayouts[VLTYPE_RENDERLIGHTMAP]); } @@ -4034,7 +4034,7 @@ void UpdateRenderData(CommandList cmd) const uint32_t strides[] = { 0,0,0,0,0,0,0,0 }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindComputeShader(computeShaders[CSTYPE_SKINNING_LDS], cmd); } @@ -4065,8 +4065,8 @@ void UpdateRenderData(CommandList cmd) mesh.streamoutBuffer_POS.get(), }; - device->BindResources(CS, vbs, SKINNINGSLOT_IN_VERTEX_POS, ARRAYSIZE(vbs), cmd); - device->BindUAVs(CS, so, 0, ARRAYSIZE(so), cmd); + device->BindResources(CS, vbs, SKINNINGSLOT_IN_VERTEX_POS, arraysize(vbs), cmd); + device->BindUAVs(CS, so, 0, arraysize(so), cmd); device->Dispatch(((uint32_t)mesh.vertex_positions.size() + SKINNING_COMPUTE_THREADCOUNT - 1) / SKINNING_COMPUTE_THREADCOUNT, 1, 1, cmd); } @@ -4192,7 +4192,7 @@ void OcclusionCulling_Render(CommandList cmd) continue; } - if (queryID >= ARRAYSIZE(occlusionQueries)) + if (queryID >= arraysize(occlusionQueries)) { object.occlusionQueryID = -1; // assign an invalid id from the pool continue; @@ -5141,7 +5141,7 @@ void DrawShadowmaps(const CameraComponent& camera, CommandList cmd, uint32_t lay }; CubemapRenderCB cb; - for (int shcam = 0; shcam < ARRAYSIZE(cameras); ++shcam) + for (int shcam = 0; shcam < arraysize(cameras); ++shcam) { XMStoreFloat4x4(&cb.xCubeShadowVP[shcam], cameras[shcam].getVP()); } @@ -5407,7 +5407,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(&wirecubeIB, INDEXFORMAT_16BIT, 0, cmd); MiscCB sb; @@ -5535,7 +5535,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t offsets[] = { mem.offset, }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); device->Draw(2 * j, 0, cmd); @@ -5584,7 +5584,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t offsets[] = { mem.offset, }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); device->Draw(2 * i, 0, cmd); @@ -5649,7 +5649,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t offsets[] = { mem.offset, }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); device->Draw(2 * i, 0, cmd); @@ -5670,7 +5670,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(&wirecubeIB, INDEXFORMAT_16BIT, 0, cmd); MiscCB sb; @@ -5732,7 +5732,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(&wirecubeIB, INDEXFORMAT_16BIT, 0, cmd); for (size_t i = 0; i < scene.probes.GetCount(); ++i) @@ -5794,7 +5794,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) verts[count++] = (j == a / 2 ? XMFLOAT4(1, 0, 0, 1) : XMFLOAT4(col, col, col, 1)); } - gridVertexCount = ARRAYSIZE(verts) / 2; + gridVertexCount = arraysize(verts) / 2; GPUBufferDesc bd; bd.Usage = USAGE_IMMUTABLE; @@ -5821,7 +5821,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->Draw(gridVertexCount, 0, cmd); device->EventEnd(cmd); @@ -5878,7 +5878,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(&wirecubeIB, INDEXFORMAT_16BIT, 0, cmd); device->DrawIndexed(24, 0, 0, cmd); } @@ -5892,7 +5892,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(MeshComponent::Vertex_POS), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(mesh->indexBuffer.get(), mesh->GetIndexFormat(), 0, cmd); device->DrawIndexed((uint32_t)mesh->indices.size(), 0, 0, cmd); @@ -5949,7 +5949,7 @@ void DrawDebugWorld(const CameraComponent& camera, CommandList cmd) const uint32_t strides[] = { sizeof(XMFLOAT4) + sizeof(XMFLOAT4), }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); device->BindIndexBuffer(&wirecubeIB, INDEXFORMAT_16BIT, 0, cmd); MiscCB sb; @@ -6121,7 +6121,7 @@ void ManageEnvProbes() { // need to take a free envmap texture slot: bool found = false; - for (int i = 0; i < ARRAYSIZE(envmapTaken); ++i) + for (int i = 0; i < arraysize(envmapTaken); ++i) { if (envmapTaken[i] == false) { @@ -6250,7 +6250,7 @@ void RefreshEnvProbes(CommandList cmd) }; CubemapRenderCB cb; - for (int i = 0; i < ARRAYSIZE(cameras); ++i) + for (int i = 0; i < arraysize(cameras); ++i) { XMStoreFloat4x4(&cb.xCubeShadowVP[i], cameras[i].getVP()); } @@ -6498,7 +6498,7 @@ void RefreshImpostors(CommandList cmd) 0, mem.offset }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); device->BindIndexBuffer(mesh.indexBuffer.get(), mesh.GetIndexFormat(), 0, cmd); @@ -6559,7 +6559,7 @@ void RefreshImpostors(CommandList cmd) material.GetNormalMap(), material.GetSurfaceMap(), }; - device->BindResources(PS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), cmd); + device->BindResources(PS, res, TEXSLOT_ONDEMAND0, arraysize(res), cmd); device->DrawIndexedInstanced(subset.indexCount, 1, subset.indexOffset, 0, 0, cmd); } @@ -6835,7 +6835,7 @@ void ComputeTiledLightCulling( GPUResource* uavs[] = { frustumBuffer }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->BindComputeShader(computeShaders[CSTYPE_TILEFRUSTUMS], cmd); DispatchParamsCB dispatchParams; @@ -6849,7 +6849,7 @@ void ComputeTiledLightCulling( device->BindConstantBuffer(CS, &constantBuffers[CBTYPE_DISPATCHPARAMS], CB_GETBINDSLOT(DispatchParamsCB), cmd); device->Dispatch(dispatchParams.xDispatchParams_numThreadGroups.x, dispatchParams.xDispatchParams_numThreadGroups.y, dispatchParams.xDispatchParams_numThreadGroups.z, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); } @@ -6913,14 +6913,14 @@ void ComputeTiledLightCulling( lightbuffer_diffuse, lightbuffer_specular, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); const GPUResource* res[] = { gbuffer0, gbuffer1, gbuffer2, }; - device->BindResources(CS, res, TEXSLOT_GBUFFER0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_GBUFFER0, arraysize(res), cmd); BindShadowmaps(CS, cmd); BindEnvironmentTextures(CS, cmd); @@ -6934,7 +6934,7 @@ void ComputeTiledLightCulling( &resourceBuffers[RBTYPE_ENTITYTILES_TRANSPARENT], &resourceBuffers[RBTYPE_ENTITYTILES_OPAQUE], }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch(dispatchParams.xDispatchParams_numThreadGroups.x, dispatchParams.xDispatchParams_numThreadGroups.y, dispatchParams.xDispatchParams_numThreadGroups.z, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); @@ -7372,7 +7372,7 @@ RayBuffers* GenerateScreenRayBuffers(const CameraComponent& camera, CommandList &screenRayBuffers.rayIndexBuffer[0], &screenRayBuffers.rayBuffer[0], }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (_width + RAYTRACING_LAUNCH_BLOCKSIZE - 1) / RAYTRACING_LAUNCH_BLOCKSIZE, @@ -7381,7 +7381,7 @@ RayBuffers* GenerateScreenRayBuffers(const CameraComponent& camera, CommandList cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); // write initial ray count: device->UpdateBuffer(&screenRayBuffers.rayCountBuffer[0], &screenRayBuffers.rayCapacity, cmd); @@ -7461,16 +7461,16 @@ void RayTraceScene( const GPUResource* res[] = { &rayBuffers->rayCountBuffer[__readBufferID], }; - device->BindResources(CS, res, TEXSLOT_UNIQUE0, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_UNIQUE0, arraysize(res), cmd); const GPUResource* uavs[] = { &rayBuffers->rayCountBuffer[__writeBufferID], &indirectBuffer, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch(1, 1, 1, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->Barrier(&GPUBarrier::Buffer(&indirectBuffer, BUFFER_STATE_UNORDERED_ACCESS, BUFFER_STATE_INDIRECT_ARGUMENT), 1, cmd); } @@ -7500,17 +7500,17 @@ void RayTraceScene( &rayBuffers->rayCountBuffer[__readBufferID], &rayBuffers->rayIndexBuffer[__readBufferID], }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND7, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND7, arraysize(res), cmd); const GPUResource* uavs[] = { &rayBuffers->rayBuffer[__readBufferID], result, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->DispatchIndirect(&indirectBuffer, 0, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); if (bounce == 1) { @@ -7542,19 +7542,19 @@ void RayTraceScene( &rayBuffers->rayIndexBuffer[__readBufferID], &rayBuffers->rayBuffer[__readBufferID], }; - device->BindResources(CS, res, TEXSLOT_ONDEMAND7, ARRAYSIZE(res), cmd); + device->BindResources(CS, res, TEXSLOT_ONDEMAND7, arraysize(res), cmd); const GPUResource* uavs[] = { &rayBuffers->rayCountBuffer[__writeBufferID], &rayBuffers->rayIndexBuffer[__writeBufferID], &rayBuffers->raySortBuffer, &rayBuffers->rayBuffer[__writeBufferID], }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->DispatchIndirect(&indirectBuffer, 0, cmd); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); if (bounce == 0 || bounce == 1) { @@ -7923,7 +7923,7 @@ void RenderObjectLightMap(const ObjectComponent& object, CommandList cmd) 0, mem.offset, }; - device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, cmd); + device->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, offsets, cmd); device->BindIndexBuffer(mesh.indexBuffer.get(), mesh.GetIndexFormat(), 0, cmd); RaytracingCB cb; @@ -8046,9 +8046,9 @@ void BindCommonResources(CommandList cmd) &resourceBuffers[RBTYPE_ENTITYARRAY], &resourceBuffers[RBTYPE_MATRIXARRAY], }; - device->BindResources(VS, resources, SBSLOT_ENTITYARRAY, ARRAYSIZE(resources), cmd); - device->BindResources(PS, resources, SBSLOT_ENTITYARRAY, ARRAYSIZE(resources), cmd); - device->BindResources(CS, resources, SBSLOT_ENTITYARRAY, ARRAYSIZE(resources), cmd); + device->BindResources(VS, resources, SBSLOT_ENTITYARRAY, arraysize(resources), cmd); + device->BindResources(PS, resources, SBSLOT_ENTITYARRAY, arraysize(resources), cmd); + device->BindResources(CS, resources, SBSLOT_ENTITYARRAY, arraysize(resources), cmd); } void UpdateFrameCB(CommandList cmd) @@ -8293,7 +8293,7 @@ const Texture* ComputeLuminance(const Texture& sourceImage, CommandList cmd) const GPUResource* uavs[] = { luminance_avg[i] }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); if (i > 0) { @@ -8407,7 +8407,7 @@ void Postprocess_Blur_Gaussian( const GPUResource* uavs[] = { &temp, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8417,7 +8417,7 @@ void Postprocess_Blur_Gaussian( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } // Vertical: @@ -8439,7 +8439,7 @@ void Postprocess_Blur_Gaussian( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8449,7 +8449,7 @@ void Postprocess_Blur_Gaussian( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } device->EventEnd(cmd); @@ -8516,7 +8516,7 @@ void Postprocess_Blur_Bilateral( const GPUResource* uavs[] = { &temp, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8526,7 +8526,7 @@ void Postprocess_Blur_Bilateral( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } // Vertical: @@ -8549,7 +8549,7 @@ void Postprocess_Blur_Bilateral( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8559,7 +8559,7 @@ void Postprocess_Blur_Bilateral( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); } device->EventEnd(cmd); @@ -8602,7 +8602,7 @@ void Postprocess_SSAO( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8612,7 +8612,7 @@ void Postprocess_SSAO( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); Postprocess_Blur_Bilateral(output, lineardepth, temp, output, cmd, blur, blur, 1.2f); @@ -8655,7 +8655,7 @@ void Postprocess_SSR( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( (desc.Width + POSTPROCESS_BLOCKSIZE - 1) / POSTPROCESS_BLOCKSIZE, @@ -8665,7 +8665,7 @@ void Postprocess_SSR( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); if (desc.MipLevels > 1) { @@ -8795,7 +8795,7 @@ void Postprocess_LightShafts( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -8806,7 +8806,7 @@ void Postprocess_LightShafts( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -8845,7 +8845,7 @@ void Postprocess_DepthOfField( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -8856,7 +8856,7 @@ void Postprocess_DepthOfField( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -8898,7 +8898,7 @@ void Postprocess_Outline( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -8909,7 +8909,7 @@ void Postprocess_Outline( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -8944,7 +8944,7 @@ void Postprocess_MotionBlur( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -8955,7 +8955,7 @@ void Postprocess_MotionBlur( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -8989,7 +8989,7 @@ void Postprocess_BloomSeparate( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9000,7 +9000,7 @@ void Postprocess_BloomSeparate( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9032,7 +9032,7 @@ void Postprocess_FXAA( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9043,7 +9043,7 @@ void Postprocess_FXAA( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -9080,7 +9080,7 @@ void Postprocess_TemporalAA( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9091,7 +9091,7 @@ void Postprocess_TemporalAA( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); wiProfiler::EndRange(range); device->EventEnd(cmd); @@ -9125,7 +9125,7 @@ void Postprocess_Colorgrade( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9136,7 +9136,7 @@ void Postprocess_Colorgrade( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9167,7 +9167,7 @@ void Postprocess_Lineardepth( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9178,7 +9178,7 @@ void Postprocess_Lineardepth( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9211,7 +9211,7 @@ void Postprocess_Sharpen( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9222,7 +9222,7 @@ void Postprocess_Sharpen( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9259,7 +9259,7 @@ void Postprocess_Tonemap( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9270,7 +9270,7 @@ void Postprocess_Tonemap( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9303,7 +9303,7 @@ void Postprocess_Chromatic_Aberration( const GPUResource* uavs[] = { &output, }; - device->BindUAVs(CS, uavs, 0, ARRAYSIZE(uavs), cmd); + device->BindUAVs(CS, uavs, 0, arraysize(uavs), cmd); device->Dispatch( @@ -9314,7 +9314,7 @@ void Postprocess_Chromatic_Aberration( ); device->Barrier(&GPUBarrier::Memory(), 1, cmd); - device->UnbindUAVs(0, ARRAYSIZE(uavs), cmd); + device->UnbindUAVs(0, arraysize(uavs), cmd); device->EventEnd(cmd); } @@ -9419,7 +9419,7 @@ void SetOcclusionCullingEnabled(bool value) GPUQueryDesc desc; desc.Type = GPU_QUERY_TYPE_OCCLUSION_PREDICATE; - for (int i = 0; i < ARRAYSIZE(occlusionQueries); ++i) + for (int i = 0; i < arraysize(occlusionQueries); ++i) { occlusionQueries[i].Create(GetDevice(), &desc); } diff --git a/WickedEngine/wiTextureHelper.cpp b/WickedEngine/wiTextureHelper.cpp index adfe2ba88..956e77df5 100644 --- a/WickedEngine/wiTextureHelper.cpp +++ b/WickedEngine/wiTextureHelper.cpp @@ -29,7 +29,7 @@ namespace wiTextureHelper // Random64x64 { uint8_t data[64 * 64 * 4]; - for (int i = 0; i < ARRAYSIZE(data); i += 4) + for (int i = 0; i < arraysize(data); i += 4) { data[i] = wiRandom::getRandom(0, 255); data[i + 1] = wiRandom::getRandom(0, 255); diff --git a/WickedEngine/wiTimer.cpp b/WickedEngine/wiTimer.cpp index 66f8b7b33..37deb7027 100644 --- a/WickedEngine/wiTimer.cpp +++ b/WickedEngine/wiTimer.cpp @@ -1,5 +1,6 @@ #include "wiTimer.h" #include "wiHelper.h" +#include "Platform.h" double wiTimer::PCFreq = 0; __int64 wiTimer::CounterStart = 0; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 6f32afaf4..2ec22063a 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 35; // minor bug fixes, alterations, refactors, updates - const int revision = 0; + const int revision = 1; long GetVersion() diff --git a/WickedEngine/wiWidget.cpp b/WickedEngine/wiWidget.cpp index 85615d9f2..7f5909f59 100644 --- a/WickedEngine/wiWidget.cpp +++ b/WickedEngine/wiWidget.cpp @@ -2057,7 +2057,7 @@ void wiColorPicker::Render(const wiGUI* gui, CommandList cmd) const const uint32_t strides[] = { sizeof(Vertex), }; - wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); wiRenderer::GetDevice()->Draw(vb_saturation.GetDesc().ByteWidth / sizeof(Vertex), 0, cmd); } @@ -2075,7 +2075,7 @@ void wiColorPicker::Render(const wiGUI* gui, CommandList cmd) const const uint32_t strides[] = { sizeof(Vertex), }; - wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); wiRenderer::GetDevice()->Draw(vb_hue.GetDesc().ByteWidth / sizeof(Vertex), 0, cmd); } @@ -2102,7 +2102,7 @@ void wiColorPicker::Render(const wiGUI* gui, CommandList cmd) const const uint32_t strides[] = { sizeof(Vertex), }; - wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); wiRenderer::GetDevice()->Draw(vb_picker_hue.GetDesc().ByteWidth / sizeof(Vertex), 0, cmd); } @@ -2153,7 +2153,7 @@ void wiColorPicker::Render(const wiGUI* gui, CommandList cmd) const const uint32_t strides[] = { sizeof(Vertex), }; - wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); wiRenderer::GetDevice()->Draw(vb_picker_saturation.GetDesc().ByteWidth / sizeof(Vertex), 0, cmd); } @@ -2171,7 +2171,7 @@ void wiColorPicker::Render(const wiGUI* gui, CommandList cmd) const const uint32_t strides[] = { sizeof(Vertex), }; - wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, cmd); + wiRenderer::GetDevice()->BindVertexBuffers(vbs, 0, arraysize(vbs), strides, nullptr, cmd); wiRenderer::GetDevice()->Draw(vb_preview.GetDesc().ByteWidth / sizeof(Vertex), 0, cmd); } diff --git a/WickedEngine/wiWidget.h b/WickedEngine/wiWidget.h index dc2c2052a..7da28fadc 100644 --- a/WickedEngine/wiWidget.h +++ b/WickedEngine/wiWidget.h @@ -58,7 +58,7 @@ protected: wiColor::White(), wiColor::Gray(), }; - static_assert(ARRAYSIZE(colors) == WIDGETSTATE_COUNT, "Every WIDGETSTATE needs a default color!"); + static_assert(arraysize(colors) == WIDGETSTATE_COUNT, "Every WIDGETSTATE needs a default color!"); wiColor textColor = wiColor(255, 255, 255, 255); wiColor textShadowColor = wiColor(0, 0, 0, 255); diff --git a/WickedEngine/wiWindowRegistration.h b/WickedEngine/wiWindowRegistration.h index 8114bdacd..6508d8933 100644 --- a/WickedEngine/wiWindowRegistration.h +++ b/WickedEngine/wiWindowRegistration.h @@ -1,5 +1,6 @@ #pragma once #include "CommonInclude.h" +#include "Platform.h" namespace wiWindowRegistration {