From 8fac785a13799defd55ffe278f8341533410c8b0 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Wed, 16 Dec 2015 11:27:10 -0800 Subject: [PATCH] Fix a few warnings --- external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp | 2 +- .../modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp index 2d7249e..ec18b27 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp @@ -659,7 +659,7 @@ void FragmentOutExecutor::addAttribute (const Context& ctx, Allocator& memAlloc, de::MovePtr alloc = memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *buffer), MemoryRequirement::HostVisible); VK_CHECK(vk.bindBufferMemory(vkDevice, *buffer, alloc->getMemory(), alloc->getOffset())); - deMemcpy(alloc->getHostPtr(), dataPtr, inputSize); + deMemcpy(alloc->getHostPtr(), dataPtr, (size_t)inputSize); flushMappedMemoryRange(vk, vkDevice, alloc->getMemory(), alloc->getOffset(), inputSize); m_vertexBuffers.push_back(de::SharedPtr >(new Unique(buffer))); diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 94eafa9..0a7a8a2 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -362,7 +362,6 @@ tcu::TestCaseGroup* createNoContractionGroup (tcu::TestContext& testCtx) { de::MovePtr group (new tcu::TestCaseGroup(testCtx, "nocontraction", "Test the NoContraction decoration")); vector cases; - de::Random rnd (deStringHash(group->getName())); const int numElements = 100; vector inputFloats1 (numElements, 0); vector inputFloats2 (numElements, 0); @@ -2146,7 +2145,6 @@ bool compareNan (const std::vector&, const vector& outpu tcu::TestCaseGroup* createOpQuantizeToF16Group (tcu::TestContext& testCtx) { de::MovePtr group (new tcu::TestCaseGroup(testCtx, "opquantize", "Tests the OpQuantizeToF16 instruction")); - de::Random rnd (deStringHash(group->getName())); const std::string shader ( string(s_ShaderPreamble) + -- 2.7.4