diff --git a/examples/Animometer.cpp b/examples/Animometer.cpp index cd58968982..240b966464 100644 --- a/examples/Animometer.cpp +++ b/examples/Animometer.cpp @@ -113,12 +113,12 @@ void init() { shaderData.resize(10000); for (auto& data : shaderData) { - data.scale = RandomFloat(0.2, 0.4); + data.scale = RandomFloat(0.2f, 0.4f); data.time = 0.0; - data.offsetX = RandomFloat(-0.9, 0.9); - data.offsetY = RandomFloat(-0.9, 0.9); - data.scalar = RandomFloat(0.5, 2.0); - data.scalarOffset = RandomFloat(0.0, 10.0); + data.offsetX = RandomFloat(-0.9f, 0.9f); + data.offsetY = RandomFloat(-0.9f, 0.9f); + data.scalar = RandomFloat(0.5f, 2.0f); + data.scalarOffset = RandomFloat(0.0f, 10.0f); } } diff --git a/examples/ComputeBoids.cpp b/examples/ComputeBoids.cpp index 1d6a2e449f..dd0d012d1e 100644 --- a/examples/ComputeBoids.cpp +++ b/examples/ComputeBoids.cpp @@ -66,7 +66,7 @@ void initBuffers() { }; modelBuffer = utils::CreateFrozenBufferFromData(device, model, sizeof(model), nxt::BufferUsageBit::Vertex); - SimParams params = { 0.04, 0.1, 0.025, 0.025, 0.02, 0.05, 0.005, kNumParticles }; + SimParams params = { 0.04f, 0.1f, 0.025f, 0.025f, 0.02f, 0.05f, 0.005f, kNumParticles }; updateParams = utils::CreateFrozenBufferFromData(device, ¶ms, sizeof(params), nxt::BufferUsageBit::Uniform); std::vector initialParticles(kNumParticles); diff --git a/examples/HelloDepthStencil.cpp b/examples/HelloDepthStencil.cpp index f376089a79..176762ba79 100644 --- a/examples/HelloDepthStencil.cpp +++ b/examples/HelloDepthStencil.cpp @@ -257,7 +257,7 @@ void init() { struct {uint32_t a; float b;} s; void frame() { s.a = (s.a + 1) % 256; - s.b += 0.01; + s.b += 0.01f; if (s.b >= 1.0f) {s.b = 0.0f;} static const uint32_t vertexBufferOffsets[1] = {0}; diff --git a/examples/HelloTriangle.cpp b/examples/HelloTriangle.cpp index 7c69bf705b..ffe328b0d0 100644 --- a/examples/HelloTriangle.cpp +++ b/examples/HelloTriangle.cpp @@ -66,7 +66,7 @@ void initTextures() { } - nxt::Buffer stagingBuffer = utils::CreateFrozenBufferFromData(device, data.data(), data.size(), nxt::BufferUsageBit::TransferSrc); + nxt::Buffer stagingBuffer = utils::CreateFrozenBufferFromData(device, data.data(), static_cast(data.size()), nxt::BufferUsageBit::TransferSrc); nxt::CommandBuffer copy = device.CreateCommandBufferBuilder() .TransitionTextureUsage(texture, nxt::TextureUsageBit::TransferDst) .CopyBufferToTexture(stagingBuffer, 0, texture, 0, 0, 0, 1024, 1024, 1, 0) @@ -139,7 +139,7 @@ void init() { struct {uint32_t a; float b;} s; void frame() { s.a = (s.a + 1) % 256; - s.b += 0.02; + s.b += 0.02f; if (s.b >= 1.0f) {s.b = 0.0f;} static const uint32_t vertexBufferOffsets[1] = {0}; nxt::CommandBuffer commands = device.CreateCommandBufferBuilder() diff --git a/examples/HelloUBO.cpp b/examples/HelloUBO.cpp index 5ea5ac0b28..251ca830a9 100644 --- a/examples/HelloUBO.cpp +++ b/examples/HelloUBO.cpp @@ -86,7 +86,7 @@ void init() { void frame() { s.a = (s.a + 1) % 256; - s.b += 0.02; + s.b += 0.02f; if (s.b >= 1.0f) {s.b = 0.0f;} buffer.TransitionUsage(nxt::BufferUsageBit::TransferDst); diff --git a/examples/SampleUtils.cpp b/examples/SampleUtils.cpp index 5af9b0da8a..6a8ce80154 100644 --- a/examples/SampleUtils.cpp +++ b/examples/SampleUtils.cpp @@ -15,6 +15,13 @@ #include "utils/BackendBinding.h" #include "../src/wire/TerribleCommandBuffer.h" +// Include Windows.h before GLFW to avoid a redefinition of APIENTRY +#ifdef _WIN32 + #include +#else + #include +#endif + #include #include #include "GLFW/glfw3.h" @@ -22,12 +29,6 @@ #include #include -#ifdef _WIN32 - #include -#else - #include -#endif - void PrintDeviceError(const char* message, nxt::CallbackUserdata) { std::cout << "Device error: " << message << std::endl; } @@ -171,7 +172,7 @@ void DoSwapBuffers() { #ifdef _WIN32 void USleep(uint64_t usecs) { - Sleep(usecs / 1000); + Sleep(static_cast(usecs / 1000)); } #else void USleep(uint64_t usecs) { diff --git a/examples/glTFViewer/glTFViewer.cpp b/examples/glTFViewer/glTFViewer.cpp index 1919c4fd2e..ccb5ae2200 100644 --- a/examples/glTFViewer/glTFViewer.cpp +++ b/examples/glTFViewer/glTFViewer.cpp @@ -29,11 +29,12 @@ #include #include -#include "GLFW/glfw3.h" #define TINYGLTF_LOADER_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION #include +#include "GLFW/glfw3.h" + #include "Camera.inl" namespace gl { @@ -146,20 +147,20 @@ namespace { } const auto& iBuffer = scene.buffers.at(iBufferView.buffer); - uint32_t iBufferViewSize = + size_t iBufferViewSize = iBufferView.byteLength ? iBufferView.byteLength : (iBuffer.data.size() - iBufferView.byteOffset); - auto oBuffer = utils::CreateFrozenBufferFromData(device, &iBuffer.data.at(iBufferView.byteOffset), iBufferViewSize, usage); + auto oBuffer = utils::CreateFrozenBufferFromData(device, &iBuffer.data.at(iBufferView.byteOffset), static_cast(iBufferViewSize), usage); buffers[iBufferViewID] = std::move(oBuffer); } } - const MaterialInfo& getMaterial(const std::string& iMaterialID, uint32_t stridePos, uint32_t strideNor, uint32_t strideTxc) { - static std::map, MaterialInfo> materials; + const MaterialInfo& getMaterial(const std::string& iMaterialID, size_t stridePos, size_t strideNor, size_t strideTxc) { + static std::map, MaterialInfo> materials; auto key = make_tuple(iMaterialID, stridePos, strideNor, strideTxc); - auto it = materials.find(key); - if (it != materials.end()) { - return it->second; + auto materialIterator = materials.find(key); + if (materialIterator != materials.end()) { + return materialIterator->second; } const auto& iMaterial = scene.materials.at(iMaterialID); @@ -218,22 +219,22 @@ namespace { } if (iParameter.semantic == "POSITION") { builder.SetAttribute(0, 0, format, 0); - builder.SetInput(0, stridePos, nxt::InputStepMode::Vertex); + builder.SetInput(0, static_cast(stridePos), nxt::InputStepMode::Vertex); slotsSet.set(0); } else if (iParameter.semantic == "NORMAL") { builder.SetAttribute(1, 1, format, 0); - builder.SetInput(1, strideNor, nxt::InputStepMode::Vertex); + builder.SetInput(1, static_cast(strideNor), nxt::InputStepMode::Vertex); slotsSet.set(1); } else if (iParameter.semantic == "TEXCOORD_0") { builder.SetAttribute(2, 2, format, 0); - builder.SetInput(2, strideTxc, nxt::InputStepMode::Vertex); + builder.SetInput(2, static_cast(strideTxc), nxt::InputStepMode::Vertex); slotsSet.set(2); } else { fprintf(stderr, "unsupported technique attribute semantic %s\n", iParameter.semantic.c_str()); } // TODO: use iAttributeParameter.node? } - for (size_t i = 0; i < slotsSet.size(); i++) { + for (uint32_t i = 0; i < slotsSet.size(); i++) { if (slotsSet[i]) { continue; } @@ -478,7 +479,7 @@ namespace { glm::inverseTranspose(model), }; - uint32_t strides[3] = {0}; + size_t strides[3] = {0}; for (const auto& s : slotSemantics) { if (s.first < 3) { auto it = iPrim.attributes.find(s.second); @@ -516,11 +517,11 @@ namespace { continue; } - if (!vertexCount) { - vertexCount = iAccessor.count; + if (vertexCount == 0) { + vertexCount = static_cast(iAccessor.count); } const auto& oBuffer = buffers.at(iAccessor.bufferView); - uint32_t iBufferOffset = iAccessor.byteOffset; + uint32_t iBufferOffset = static_cast(iAccessor.byteOffset); cmd.SetVertexBuffers(slot, 1, &oBuffer, &iBufferOffset); } @@ -532,8 +533,8 @@ namespace { continue; } const auto& oIndicesBuffer = buffers.at(iIndices.bufferView); - cmd.SetIndexBuffer(oIndicesBuffer, iIndices.byteOffset, nxt::IndexFormat::Uint16); - cmd.DrawElements(iIndices.count, 1, 0, 0); + cmd.SetIndexBuffer(oIndicesBuffer, static_cast(iIndices.byteOffset), nxt::IndexFormat::Uint16); + cmd.DrawElements(static_cast(iIndices.count), 1, 0, 0); } else { // DrawArrays cmd.DrawArrays(vertexCount, 1, 0, 0); @@ -592,23 +593,23 @@ namespace { } void cursorPosCallback(GLFWwindow*, double mouseX, double mouseY) { - static float oldX, oldY; - float dX = mouseX - oldX; - float dY = mouseY - oldY; + static double oldX, oldY; + float dX = static_cast(mouseX - oldX); + float dY = static_cast(mouseY - oldY); oldX = mouseX; oldY = mouseY; if (buttons[2] || (buttons[0] && buttons[1])) { - camera.pan(-dX * 0.002, dY * 0.002); + camera.pan(-dX * 0.002f, dY * 0.002f); } else if (buttons[0]) { - camera.rotate(dX * -0.01, dY * 0.01); + camera.rotate(dX * -0.01f, dY * 0.01f); } else if (buttons[1]) { - camera.zoom(dY * -0.005); + camera.zoom(dY * -0.005f); } } void scrollCallback(GLFWwindow*, double, double yoffset) { - camera.zoom(yoffset * 0.04); + camera.zoom(static_cast(yoffset) * 0.04f); } } diff --git a/src/backend/BindGroup.cpp b/src/backend/BindGroup.cpp index 04555f8301..0946c14d01 100644 --- a/src/backend/BindGroup.cpp +++ b/src/backend/BindGroup.cpp @@ -110,7 +110,7 @@ namespace backend { const auto& layoutInfo = layout->GetBindingInfo(); for (size_t i = start, j = 0; i < start + count; ++i, ++j) { - nxt::BufferUsageBit requiredBit; + nxt::BufferUsageBit requiredBit = nxt::BufferUsageBit::None; switch (layoutInfo.types[i]) { case nxt::BindingType::UniformBuffer: requiredBit = nxt::BufferUsageBit::Uniform; diff --git a/src/backend/CommandBuffer.cpp b/src/backend/CommandBuffer.cpp index 95564eb293..fae5ec855c 100644 --- a/src/backend/CommandBuffer.cpp +++ b/src/backend/CommandBuffer.cpp @@ -71,7 +71,7 @@ namespace backend { bool ComputeTextureCopyBufferSize(CommandBufferBuilder*, const TextureCopyLocation& location, uint32_t* bufferSize) { // TODO(cwallez@chromium.org): check for overflows - uint32_t pixelSize = TextureFormatPixelSize(location.texture->GetFormat()); + uint32_t pixelSize = static_cast(TextureFormatPixelSize(location.texture->GetFormat())); *bufferSize = location.width * location.height * location.depth * pixelSize; return true; diff --git a/src/backend/CommandBufferStateTracker.cpp b/src/backend/CommandBufferStateTracker.cpp index d2de413b75..d5a5437340 100644 --- a/src/backend/CommandBufferStateTracker.cpp +++ b/src/backend/CommandBufferStateTracker.cpp @@ -488,8 +488,7 @@ namespace backend { break; default: - ASSERT(false); - return false; + UNREACHABLE(); } auto buffer = group->GetBindingAsBufferView(i)->GetBuffer(); @@ -535,13 +534,13 @@ namespace backend { } void CommandBufferStateTracker::UnsetPipeline() { - constexpr ValidationAspects pipelineDependentAspectsInverse = - ~(1 << VALIDATION_ASPECT_RENDER_PIPELINE | - 1 << VALIDATION_ASPECT_COMPUTE_PIPELINE | - 1 << VALIDATION_ASPECT_BIND_GROUPS | - 1 << VALIDATION_ASPECT_VERTEX_BUFFERS | - 1 << VALIDATION_ASPECT_INDEX_BUFFER); - aspects &= pipelineDependentAspectsInverse; + constexpr ValidationAspects pipelineDependentAspects = + 1 << VALIDATION_ASPECT_RENDER_PIPELINE | + 1 << VALIDATION_ASPECT_COMPUTE_PIPELINE | + 1 << VALIDATION_ASPECT_BIND_GROUPS | + 1 << VALIDATION_ASPECT_VERTEX_BUFFERS | + 1 << VALIDATION_ASPECT_INDEX_BUFFER; + aspects &= ~pipelineDependentAspects; bindgroups.fill(nullptr); } } diff --git a/src/backend/RenderPass.cpp b/src/backend/RenderPass.cpp index 526174646e..9765a4532f 100644 --- a/src/backend/RenderPass.cpp +++ b/src/backend/RenderPass.cpp @@ -28,7 +28,7 @@ namespace backend { } uint32_t RenderPassBase::GetAttachmentCount() const { - return attachments.size(); + return static_cast(attachments.size()); } const RenderPassBase::AttachmentInfo& RenderPassBase::GetAttachmentInfo(uint32_t attachment) const { @@ -37,7 +37,7 @@ namespace backend { } uint32_t RenderPassBase::GetSubpassCount() const { - return subpasses.size(); + return static_cast(subpasses.size()); } const RenderPassBase::SubpassInfo& RenderPassBase::GetSubpassInfo(uint32_t subpass) const { diff --git a/src/backend/d3d12/CommandBufferD3D12.cpp b/src/backend/d3d12/CommandBufferD3D12.cpp index 4a9a6371b1..5de2b5b029 100644 --- a/src/backend/d3d12/CommandBufferD3D12.cpp +++ b/src/backend/d3d12/CommandBufferD3D12.cpp @@ -273,7 +273,8 @@ namespace d3d12 { D3D12_RECT scissorRect = { 0, 0, static_cast(width), static_cast(height) }; commandList->RSSetViewports(1, &viewport); commandList->RSSetScissorRects(1, &scissorRect); - commandList->OMSetRenderTargets(1, &device->GetCurrentRenderTargetDescriptor(), FALSE, nullptr); + D3D12_CPU_DESCRIPTOR_HANDLE rtv = device->GetCurrentRenderTargetDescriptor(); + commandList->OMSetRenderTargets(1, &rtv, FALSE, nullptr); } break; @@ -381,7 +382,7 @@ namespace d3d12 { case Command::EndRenderPass: { - EndRenderPassCmd* cmd = commands.NextCommand(); + commands.NextCommand(); } break; @@ -426,13 +427,13 @@ namespace d3d12 { case Command::SetPushConstants: { - SetPushConstantsCmd* cmd = commands.NextCommand(); + commands.NextCommand(); } break; case Command::SetStencilReference: { - SetStencilReferenceCmd* cmd = commands.NextCommand(); + commands.NextCommand(); } break; diff --git a/src/backend/d3d12/D3D12Backend.cpp b/src/backend/d3d12/D3D12Backend.cpp index c87ad5970b..b330bcebe8 100644 --- a/src/backend/d3d12/D3D12Backend.cpp +++ b/src/backend/d3d12/D3D12Backend.cpp @@ -200,10 +200,10 @@ namespace d3d12 { pendingCommands.open = false; lists[0] = pendingCommands.commandList.Get(); std::copy(commandLists.begin(), commandLists.end(), lists.begin() + 1); - commandQueue->ExecuteCommandLists(commandLists.size() + 1, lists.data()); + commandQueue->ExecuteCommandLists(static_cast(commandLists.size() + 1), lists.data()); } else { std::vector lists(commandLists); - commandQueue->ExecuteCommandLists(commandLists.size(), lists.data()); + commandQueue->ExecuteCommandLists(static_cast(commandLists.size()), lists.data()); } } diff --git a/src/backend/d3d12/InputStateD3D12.cpp b/src/backend/d3d12/InputStateD3D12.cpp index 73b3acbce5..a02cd73332 100644 --- a/src/backend/d3d12/InputStateD3D12.cpp +++ b/src/backend/d3d12/InputStateD3D12.cpp @@ -14,6 +14,8 @@ #include "backend/d3d12/InputStateD3D12.h" +#include "common/BitSetIterator.h" + namespace backend { namespace d3d12 { @@ -48,8 +50,8 @@ namespace d3d12 { const auto& attributesSetMask = GetAttributesSetMask(); - size_t count = 0; - for (size_t i = 0; i < attributesSetMask.size(); ++i) { + unsigned int count = 0; + for (auto i : IterateBitSet(attributesSetMask)) { if (!attributesSetMask[i]) { continue; } @@ -60,7 +62,7 @@ namespace d3d12 { // If the HLSL semantic is TEXCOORDN the SemanticName should be "TEXCOORD" and the SemanticIndex N inputElementDescriptor.SemanticName = "TEXCOORD"; - inputElementDescriptor.SemanticIndex = i; + inputElementDescriptor.SemanticIndex = static_cast(i); inputElementDescriptor.Format = VertexFormatType(attribute.format); inputElementDescriptor.InputSlot = attribute.bindingSlot; diff --git a/src/backend/d3d12/TextureD3D12.cpp b/src/backend/d3d12/TextureD3D12.cpp index 432b5b859e..49a08b9d96 100644 --- a/src/backend/d3d12/TextureD3D12.cpp +++ b/src/backend/d3d12/TextureD3D12.cpp @@ -89,8 +89,8 @@ namespace d3d12 { resourceDescriptor.Alignment = 0; resourceDescriptor.Width = GetWidth(); resourceDescriptor.Height = GetHeight(); - resourceDescriptor.DepthOrArraySize = GetDepth(); - resourceDescriptor.MipLevels = GetNumMipLevels(); + resourceDescriptor.DepthOrArraySize = static_cast(GetDepth()); + resourceDescriptor.MipLevels = static_cast(GetNumMipLevels()); resourceDescriptor.Format = D3D12TextureFormat(GetFormat()); resourceDescriptor.SampleDesc.Count = 1; resourceDescriptor.SampleDesc.Quality = 0; diff --git a/src/backend/opengl/CommandBufferGL.cpp b/src/backend/opengl/CommandBufferGL.cpp index 27a756883d..2af08c1379 100644 --- a/src/backend/opengl/CommandBufferGL.cpp +++ b/src/backend/opengl/CommandBufferGL.cpp @@ -243,10 +243,10 @@ namespace opengl { case Command::SetBindGroup: { SetBindGroupCmd* cmd = commands.NextCommand(); - size_t index = cmd->index; + size_t groupIndex = cmd->index; BindGroup* group = ToBackend(cmd->group.Get()); - const auto& indices = ToBackend(lastPipeline->GetLayout())->GetBindingIndexInfo()[index]; + const auto& indices = ToBackend(lastPipeline->GetLayout())->GetBindingIndexInfo()[groupIndex]; const auto& layout = group->GetLayout()->GetBindingInfo(); // TODO(cwallez@chromium.org): iterate over the layout bitmask instead @@ -260,18 +260,18 @@ namespace opengl { { BufferView* view = ToBackend(group->GetBindingAsBufferView(binding)); GLuint buffer = ToBackend(view->GetBuffer())->GetHandle(); - GLuint index = indices[binding]; + GLuint uboIndex = indices[binding]; - glBindBufferRange(GL_UNIFORM_BUFFER, index, buffer, view->GetOffset(), view->GetSize()); + glBindBufferRange(GL_UNIFORM_BUFFER, uboIndex, buffer, view->GetOffset(), view->GetSize()); } break; case nxt::BindingType::Sampler: { GLuint sampler = ToBackend(group->GetBindingAsSampler(binding))->GetHandle(); - GLuint index = indices[binding]; + GLuint samplerIndex = indices[binding]; - for (auto unit : lastPipeline->GetTextureUnitsForSampler(index)) { + for (auto unit : lastPipeline->GetTextureUnitsForSampler(samplerIndex)) { glBindSampler(unit, sampler); } } @@ -283,9 +283,9 @@ namespace opengl { Texture* texture = ToBackend(view->GetTexture()); GLuint handle = texture->GetHandle(); GLenum target = texture->GetGLTarget(); - GLuint index = indices[binding]; + GLuint textureIndex = indices[binding]; - for (auto unit : lastPipeline->GetTextureUnitsForTexture(index)) { + for (auto unit : lastPipeline->GetTextureUnitsForTexture(textureIndex)) { glActiveTexture(GL_TEXTURE0 + unit); glBindTexture(target, handle); } @@ -296,9 +296,9 @@ namespace opengl { { BufferView* view = ToBackend(group->GetBindingAsBufferView(binding)); GLuint buffer = ToBackend(view->GetBuffer())->GetHandle(); - GLuint index = indices[binding]; + GLuint ssboIndex = indices[binding]; - glBindBufferRange(GL_SHADER_STORAGE_BUFFER, index, buffer, view->GetOffset(), view->GetSize()); + glBindBufferRange(GL_SHADER_STORAGE_BUFFER, ssboIndex, buffer, view->GetOffset(), view->GetSize()); } break; } diff --git a/src/tests/end2end/InputStateTests.cpp b/src/tests/end2end/InputStateTests.cpp index ea05ee836d..dc1db5daaf 100644 --- a/src/tests/end2end/InputStateTests.cpp +++ b/src/tests/end2end/InputStateTests.cpp @@ -28,9 +28,9 @@ using nxt::VertexFormat; // The predetermined values are "K * gl_VertexID + componentIndex" for vertex-indexed buffers, and // "K * gl_InstanceID + componentIndex" for instance-indexed buffers. -constexpr static int kRTSize = 400; -constexpr static int kRTCellOffset = 50; -constexpr static int kRTCellSize = 100; +constexpr static unsigned int kRTSize = 400; +constexpr static unsigned int kRTCellOffset = 50; +constexpr static unsigned int kRTCellSize = 100; class InputStateTest : public NXTTest { protected: @@ -175,7 +175,7 @@ class InputStateTest : public NXTTest { template nxt::Buffer MakeVertexBuffer(std::vector data) { - return utils::CreateFrozenBufferFromData(device, data.data(), data.size() * sizeof(T), nxt::BufferUsageBit::Vertex); + return utils::CreateFrozenBufferFromData(device, data.data(), static_cast(data.size() * sizeof(T)), nxt::BufferUsageBit::Vertex); } struct DrawVertexBuffer { @@ -183,8 +183,8 @@ class InputStateTest : public NXTTest { nxt::Buffer* buffer; }; void DoTestDraw(const nxt::Pipeline& pipeline, unsigned int triangles, unsigned int instances, std::vector vertexBuffers) { - EXPECT_LE(triangles, 4); - EXPECT_LE(instances, 4); + EXPECT_LE(triangles, 4u); + EXPECT_LE(instances, 4u); nxt::CommandBufferBuilder builder = device.CreateCommandBufferBuilder(); @@ -207,10 +207,10 @@ class InputStateTest : public NXTTest { // Check that the center of each triangle is pure green, so that if a single vertex shader // instance fails, linear interpolation makes the pixel check fail. - for (size_t triangle = 0; triangle < 4; triangle++) { - for (size_t instance = 0; instance < 4; instance++) { - int x = kRTCellOffset + kRTCellSize * triangle; - int y = kRTCellOffset + kRTCellSize * instance; + for (unsigned int triangle = 0; triangle < 4; triangle++) { + for (unsigned int instance = 0; instance < 4; instance++) { + unsigned int x = kRTCellOffset + kRTCellSize * triangle; + unsigned int y = kRTCellOffset + kRTCellSize * instance; if (triangle < triangles && instance < instances) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(0, 255, 0, 255), renderTarget, x, y); } else { diff --git a/src/tests/unittests/CommandAllocatorTests.cpp b/src/tests/unittests/CommandAllocatorTests.cpp index faccdff434..8c0bb27e8c 100644 --- a/src/tests/unittests/CommandAllocatorTests.cpp +++ b/src/tests/unittests/CommandAllocatorTests.cpp @@ -160,9 +160,11 @@ TEST(CommandAllocator, MultipleIterations) { uint32_t myFirst = 42; uint32_t myCount = 16; - CommandDraw* draw = allocator.Allocate(CommandType::Draw); - draw->first = myFirst; - draw->count = myCount; + { + CommandDraw* draw = allocator.Allocate(CommandType::Draw); + draw->first = myFirst; + draw->count = myCount; + } { CommandIterator iterator(std::move(allocator)); @@ -235,7 +237,7 @@ TEST(CommandAllocator, ManySmallCommands) { // Stay under max representable uint16_t const int kCommandCount = 50000; - int count = 0; + uint16_t count = 0; for (int i = 0; i < kCommandCount; i++) { CommandSmall* small = allocator.Allocate(CommandType::Small); small->data = count ++; diff --git a/src/tests/unittests/MathTests.cpp b/src/tests/unittests/MathTests.cpp index 6fd7446709..ae4c7838a8 100644 --- a/src/tests/unittests/MathTests.cpp +++ b/src/tests/unittests/MathTests.cpp @@ -63,7 +63,7 @@ TEST(Math, Align) { char* aligned = Align(unaligned, kTestAlignment); ASSERT_GE(aligned - unaligned, 0); - ASSERT_LT(aligned - unaligned, kTestAlignment); + ASSERT_LT(static_cast(aligned - unaligned), kTestAlignment); ASSERT_EQ(reinterpret_cast(aligned) & (kTestAlignment -1), 0); } } diff --git a/src/tests/unittests/validation/ValidationTest.cpp b/src/tests/unittests/validation/ValidationTest.cpp index dadc6005a3..8f80525a5d 100644 --- a/src/tests/unittests/validation/ValidationTest.cpp +++ b/src/tests/unittests/validation/ValidationTest.cpp @@ -51,7 +51,7 @@ void ValidationTest::TearDown() { ASSERT_TRUE(expectation.gotStatus) << "Didn't get a status for " << name; - ASSERT_NE(NXT_BUILDER_ERROR_STATUS_UNKNOWN, expectation.gotStatus) << "Got unknown status for " << name; + ASSERT_NE(NXT_BUILDER_ERROR_STATUS_UNKNOWN, expectation.status) << "Got unknown status for " << name; bool wasSuccess = expectation.status == NXT_BUILDER_ERROR_STATUS_SUCCESS; ASSERT_EQ(expectation.expectSuccess, wasSuccess) diff --git a/src/utils/D3D12Binding.cpp b/src/utils/D3D12Binding.cpp index f15fe9717d..4c4e5e3c8e 100644 --- a/src/utils/D3D12Binding.cpp +++ b/src/utils/D3D12Binding.cpp @@ -142,7 +142,6 @@ namespace utils { resourceBarrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; commandList->ResourceBarrier(1, &resourceBarrier); ASSERT_SUCCESS(commandList->Close()); - ID3D12CommandList* commandLists[] = { commandList.Get() }; backend::d3d12::ExecuteCommandLists(backendDevice, { commandList.Get() }); backend::d3d12::NextSerial(backendDevice); @@ -166,7 +165,6 @@ namespace utils { resourceBarrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; commandList->ResourceBarrier(1, &resourceBarrier); ASSERT_SUCCESS(commandList->Close()); - ID3D12CommandList* commandLists[] = { commandList.Get() }; backend::d3d12::ExecuteCommandLists(backendDevice, { commandList.Get() }); } @@ -184,7 +182,6 @@ namespace utils { resourceBarrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; commandList->ResourceBarrier(1, &resourceBarrier); ASSERT_SUCCESS(commandList->Close()); - ID3D12CommandList* commandLists[] = { commandList.Get() }; backend::d3d12::ExecuteCommandLists(backendDevice, { commandList.Get() }); } diff --git a/src/utils/NXTHelpers.cpp b/src/utils/NXTHelpers.cpp index 595d073fe0..d2f7eca54e 100644 --- a/src/utils/NXTHelpers.cpp +++ b/src/utils/NXTHelpers.cpp @@ -51,7 +51,7 @@ namespace utils { } size_t size = (result.cend() - result.cbegin()); - builder.SetSource(size, result.cbegin()); + builder.SetSource(static_cast(size), result.cbegin()); #ifdef DUMP_SPIRV_ASSEMBLY {