diff --git a/qrenderdoc/Styles/RDStyle/RDStyle.cpp b/qrenderdoc/Styles/RDStyle/RDStyle.cpp index a5fd2e280..a96e86326 100644 --- a/qrenderdoc/Styles/RDStyle/RDStyle.cpp +++ b/qrenderdoc/Styles/RDStyle/RDStyle.cpp @@ -841,7 +841,7 @@ int RDStyle::styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidg return QFrame::StyledPanel | QFrame::Plain; if(stylehint == QStyle::SH_ComboBox_Popup) - return false; + return 0; if(stylehint == SH_ToolTipLabel_Opacity) return 255; diff --git a/qrenderdoc/Windows/TimelineBar.cpp b/qrenderdoc/Windows/TimelineBar.cpp index 304009238..cce9f6efd 100644 --- a/qrenderdoc/Windows/TimelineBar.cpp +++ b/qrenderdoc/Windows/TimelineBar.cpp @@ -260,7 +260,8 @@ void TimelineBar::layout() qreal virtualSize = m_dataArea.width() * m_zoom; - while(virtualSize > 0 && (maxEID / m_eidAxisLabelStep) * m_eidAxisLabelWidth > virtualSize) + while(virtualSize > 0 && + (qreal(maxEID) / qreal(m_eidAxisLabelStep)) * m_eidAxisLabelWidth > virtualSize) { // increment 1, 2, 5, 10, 20, 50, 100, ... if(stepSize == 1) diff --git a/renderdoc/driver/d3d11/d3d11_rendermesh.cpp b/renderdoc/driver/d3d11/d3d11_rendermesh.cpp index b0f44e635..1b236b159 100644 --- a/renderdoc/driver/d3d11/d3d11_rendermesh.cpp +++ b/renderdoc/driver/d3d11/d3d11_rendermesh.cpp @@ -414,8 +414,8 @@ void D3D11Replay::RenderMesh(uint32_t eventId, const rdcarray &secon HRESULT hr = S_OK; UINT strides[] = {sizeof(Vec4f)}; UINT offsets[] = {0}; - m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.TriHighlightHelper, - (UINT *)&strides, (UINT *)&offsets); + m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.TriHighlightHelper, strides, + offsets); //////////////////////////////////////////////////////////////// // render primitives @@ -568,8 +568,7 @@ void D3D11Replay::RenderMesh(uint32_t eventId, const rdcarray &secon // we want this to clip m_pImmediateContext->OMSetDepthStencilState(m_MeshRender.LessEqualDepthState, 0); - m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.TriHighlightHelper, - (UINT *)&strides, (UINT *)&offsets); + m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.TriHighlightHelper, strides, offsets); m_pImmediateContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST); m_pImmediateContext->IASetInputLayout(m_MeshRender.GenericLayout); @@ -591,8 +590,7 @@ void D3D11Replay::RenderMesh(uint32_t eventId, const rdcarray &secon vertexData.ModelViewProj = projMat.Mul(camMat.Mul(guessProjInv)); GetDebugManager()->FillCBuffer(vsCBuf, &vertexData, sizeof(vertexData)); - m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.FrustumHelper, (UINT *)&strides, - (UINT *)&offsets); + m_pImmediateContext->IASetVertexBuffers(0, 1, &m_MeshRender.FrustumHelper, strides, offsets); m_pImmediateContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST); m_pImmediateContext->IASetInputLayout(m_MeshRender.GenericLayout); diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp index 758842d81..bea2903d9 100644 --- a/renderdoc/driver/d3d12/d3d12_common.cpp +++ b/renderdoc/driver/d3d12/d3d12_common.cpp @@ -60,7 +60,7 @@ void D3D12MarkerRegion::Begin(ID3D12GraphicsCommandList *list, const rdcstr &mar // display one less character than specified by the size. Append a space to pad the // output without visibly changing the event marker for other debuggers. rdcwstr text = StringFormat::UTF82Wide(marker + " "); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); list->BeginEvent(0, text.c_str(), size); } } @@ -70,7 +70,7 @@ void D3D12MarkerRegion::Begin(ID3D12CommandQueue *queue, const rdcstr &marker) if(queue) { rdcwstr text = StringFormat::UTF82Wide(marker + " "); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); queue->BeginEvent(0, text.c_str(), size); } } @@ -80,7 +80,7 @@ void D3D12MarkerRegion::Set(ID3D12GraphicsCommandList *list, const rdcstr &marke if(list) { rdcwstr text = StringFormat::UTF82Wide(marker + " "); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); list->SetMarker(0, text.c_str(), size); } } @@ -90,7 +90,7 @@ void D3D12MarkerRegion::Set(ID3D12CommandQueue *queue, const rdcstr &marker) if(queue) { rdcwstr text = StringFormat::UTF82Wide(marker + " "); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); queue->SetMarker(0, text.c_str(), size); } } diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index c402b1efe..2588fb08f 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -3383,7 +3383,7 @@ void WrappedID3D12Device::ReplayLog(uint32_t startEventID, uint32_t endEventID, ID3D12GraphicsCommandList *beginList = GetNewList(); { rdcwstr text = StringFormat::UTF82Wide(AMDRGPControl::GetBeginMarker()); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); beginList->SetMarker(0, text.c_str(), size); } beginList->Close(); @@ -3448,7 +3448,7 @@ void WrappedID3D12Device::ReplayLog(uint32_t startEventID, uint32_t endEventID, ID3D12GraphicsCommandList *list = GetNewList(); { rdcwstr text = StringFormat::UTF82Wide(AMDRGPControl::GetEndMarker()); - UINT size = (UINT)text.length() * sizeof(wchar_t); + UINT size = UINT(text.length() * sizeof(wchar_t)); list->SetMarker(0, text.c_str(), size); } diff --git a/renderdoc/driver/gl/gl_postvs.cpp b/renderdoc/driver/gl/gl_postvs.cpp index 3cd0298c7..541da4d2d 100644 --- a/renderdoc/driver/gl/gl_postvs.cpp +++ b/renderdoc/driver/gl/gl_postvs.cpp @@ -268,7 +268,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) { drv.glShaderBinary(1, &tmpShaders[i], eGL_SHADER_BINARY_FORMAT_SPIR_V, shadDetails.spirvWords.data(), - (GLsizei)shadDetails.spirvWords.size() * sizeof(uint32_t)); + GLsizei(shadDetails.spirvWords.size() * sizeof(uint32_t))); drv.glSpecializeShader(tmpShaders[i], shadDetails.entryPoint.c_str(), (GLuint)shadDetails.specIDs.size(), @@ -1524,15 +1524,17 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) { drv.glDrawElementsInstancedBaseVertexBaseInstance( drawtopo, drawcall->numIndices, idxType, - (const void *)uintptr_t(drawcall->indexOffset * drawcall->indexByteWidth), inst, - drawcall->baseVertex, drawcall->instanceOffset); + (const void *)(uintptr_t(drawcall->indexOffset) * + uintptr_t(drawcall->indexByteWidth)), + inst, drawcall->baseVertex, drawcall->instanceOffset); } else { drv.glDrawElementsInstancedBaseVertex( drawtopo, drawcall->numIndices, idxType, - (const void *)uintptr_t(drawcall->indexOffset * drawcall->indexByteWidth), inst, - drawcall->baseVertex); + (const void *)(uintptr_t(drawcall->indexOffset) * + uintptr_t(drawcall->indexByteWidth)), + inst, drawcall->baseVertex); } } @@ -1565,14 +1567,16 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) { drv.glDrawElementsInstancedBaseVertexBaseInstance( drawtopo, drawcall->numIndices, idxType, - (const void *)uintptr_t(drawcall->indexOffset * drawcall->indexByteWidth), + (const void *)(uintptr_t(drawcall->indexOffset) * + uintptr_t(drawcall->indexByteWidth)), drawcall->numInstances, drawcall->baseVertex, drawcall->instanceOffset); } else { drv.glDrawElementsInstancedBaseVertex( drawtopo, drawcall->numIndices, idxType, - (const void *)uintptr_t(drawcall->indexOffset * drawcall->indexByteWidth), + (const void *)(uintptr_t(drawcall->indexOffset) * + uintptr_t(drawcall->indexByteWidth)), drawcall->numInstances, drawcall->baseVertex); } } @@ -1594,7 +1598,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) { drv.glDrawElementsBaseVertex( drawtopo, drawcall->numIndices, idxType, - (const void *)uintptr_t(drawcall->indexOffset * drawcall->indexByteWidth), + (const void *)(uintptr_t(drawcall->indexOffset) * uintptr_t(drawcall->indexByteWidth)), drawcall->baseVertex); } diff --git a/renderdoc/driver/gl/wgl_hooks.cpp b/renderdoc/driver/gl/wgl_hooks.cpp index 0bfde2c7e..df721d81a 100644 --- a/renderdoc/driver/gl/wgl_hooks.cpp +++ b/renderdoc/driver/gl/wgl_hooks.cpp @@ -125,7 +125,7 @@ GLInitParams WGLHook::GetInitParamsForDC(HDC dc) ret.width = (r.right - r.left); ret.height = (r.bottom - r.top); - ret.isSRGB = true; + ret.isSRGB = 1; if(WGL.wglGetPixelFormatAttribivARB) { diff --git a/renderdoc/driver/ihv/intel/intel_counters.cpp b/renderdoc/driver/ihv/intel/intel_counters.cpp index 25696d948..14713eba1 100644 --- a/renderdoc/driver/ihv/intel/intel_counters.cpp +++ b/renderdoc/driver/ihv/intel/intel_counters.cpp @@ -389,7 +389,7 @@ void IntelCounters::EndSample() uint32_t calculatedReportCount = 0; TCompletionCode res = m_subscribedMetricSets[m_passIndex]->CalculateMetrics( (const unsigned char *)counter_data, metricSetParams->QueryReportSize, m_queryResult.data(), - (uint32_t)m_queryResult.size() * sizeof(TTypedValue_1_0), &calculatedReportCount, false); + uint32_t(m_queryResult.size() * sizeof(TTypedValue_1_0)), &calculatedReportCount, false); if(res != TCompletionCode::CC_OK) { diff --git a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp index eb98e24b7..58de08cc0 100644 --- a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp +++ b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp @@ -544,7 +544,7 @@ TEST_CASE("Check LLVM bitreader", "[llvm]") b.SeekBit(0); uint32_t read; - INFO("Bit width: " << (i + 1)); + INFO("Bit width: " << uint32_t(i + 1)); read = b.fixed(i + 1); CHECK(read == expected[i][0]); @@ -596,7 +596,7 @@ TEST_CASE("Check LLVM bitreader", "[llvm]") for(size_t i = 2; i <= 8; i++) { - INFO("VBR group size: " << i); + INFO("VBR group size: " << uint32_t(i)); b.SeekByte(i); uint64_t val = b.vbr(i); @@ -657,7 +657,7 @@ TEST_CASE("Check LLVM bitreader", "[llvm]") for(size_t i = 2; i <= 8; i++) { - INFO("VBR group size: " << i); + INFO("VBR group size: " << uint32_t(i)); b.SeekByte(i * 2); uint64_t val = b.vbr(i); @@ -717,7 +717,7 @@ TEST_CASE("Check LLVM bitreader", "[llvm]") for(size_t i = 2; i <= 8; i++) { - INFO("VBR group size: " << i); + INFO("VBR group size: " << uint32_t(i)); b.SeekByte(i * 5); uint64_t val = b.vbr(i); diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 94b3283d2..d70abf69c 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -1389,7 +1389,7 @@ void WrappedVulkan::SubmitExtQBarriers(uint32_t queueFamilyIndex, VkResult vkr = ObjDisp(extQCmd)->BeginCommandBuffer(Unwrap(extQCmd), &beginInfo); RDCASSERTEQUAL(vkr, VK_SUCCESS); - DoPipelineBarrier(extQCmd, (uint32_t)queueFamilyBarriers.size(), queueFamilyBarriers.data()); + DoPipelineBarrier(extQCmd, queueFamilyBarriers.size(), queueFamilyBarriers.data()); vkr = ObjDisp(extQCmd)->EndCommandBuffer(Unwrap(extQCmd)); RDCASSERTEQUAL(vkr, VK_SUCCESS); diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp index 2efee41a3..071f4427d 100644 --- a/renderdoc/driver/vulkan/vk_manager.cpp +++ b/renderdoc/driver/vulkan/vk_manager.cpp @@ -445,7 +445,7 @@ void VulkanResourceManager::SerialiseImageStates(SerialiserType &ser, if(layouts.subresourceStates.size() > 1 && layouts.subresourceStates[0].subresourceRange.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT && - layouts.subresourceStates.size() == size_t(imageInfo.layerCount * imageInfo.levelCount)) + layouts.subresourceStates.size() == size_t(imageInfo.layerCount) * size_t(imageInfo.levelCount)) { VkImageLayout layout = layouts.subresourceStates[0].newLayout; @@ -609,7 +609,7 @@ void VulkanResourceManager::InsertDeviceMemoryRefs(WriteSerialiser &ser) data.push_back({mem, jt->start(), jt->value()}); } - uint32_t sizeEstimate = (uint32_t)data.size() * sizeof(MemRefInterval) + 32; + uint64_t sizeEstimate = data.size() * sizeof(MemRefInterval) + 32; { SCOPED_SERIALISE_CHUNK(VulkanChunk::DeviceMemoryRefs, sizeEstimate); diff --git a/renderdoc/driver/vulkan/vk_pixelhistory.cpp b/renderdoc/driver/vulkan/vk_pixelhistory.cpp index 57c428e59..e2059edd5 100644 --- a/renderdoc/driver/vulkan/vk_pixelhistory.cpp +++ b/renderdoc/driver/vulkan/vk_pixelhistory.cpp @@ -510,7 +510,7 @@ struct VulkanOcclusionAndStencilCallback : public VulkanPixelHistoryCallback pipestate.renderPass = GetResID(m_RenderPass); pipestate.subpass = 0; pipestate.graphics.pipeline = GetResID(replacements.fixedShaderStencil); - ReplayDraw(cmd, (uint32_t)m_OcclusionQueries.size(), eid, true, true); + ReplayDraw(cmd, m_OcclusionQueries.size(), eid, true, true); m_OcclusionQueries.insert( std::pair(eid, (uint32_t)m_OcclusionQueries.size())); diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp index 138bd1d21..18ef6f4d4 100644 --- a/renderdoc/driver/vulkan/vk_postvs.cpp +++ b/renderdoc/driver/vulkan/vk_postvs.cpp @@ -2002,13 +2002,13 @@ void VulkanReplay::FetchVSOut(uint32_t eventId) if(vi->pVertexBindingDescriptions[vb].inputRate == VK_VERTEX_INPUT_RATE_INSTANCE) { - len = uint64_t(maxInstance + 1) * vi->pVertexBindingDescriptions[vb].stride; + len = (uint64_t(maxInstance) + 1) * vi->pVertexBindingDescriptions[vb].stride; offs += drawcall->instanceOffset * vi->pVertexBindingDescriptions[vb].stride; } else { - len = uint64_t(maxIndex + 1) * vi->pVertexBindingDescriptions[vb].stride; + len = (uint64_t(maxIndex) + 1) * vi->pVertexBindingDescriptions[vb].stride; offs += drawcall->vertexOffset * vi->pVertexBindingDescriptions[vb].stride; } diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 6e70caf66..b774477f1 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -2977,8 +2977,8 @@ VkResult WrappedVulkan::vkCreateDevice(VkPhysicalDevice physicalDevice, { uint32_t family = createInfo.pQueueCreateInfos[i].queueFamilyIndex; uint32_t count = createInfo.pQueueCreateInfos[i].queueCount; - m_QueueFamilies.resize(RDCMAX(m_QueueFamilies.size(), size_t(family + 1))); - m_QueueFamilyCounts.resize(RDCMAX(m_QueueFamilies.size(), size_t(family + 1))); + m_QueueFamilies.resize(RDCMAX(m_QueueFamilies.size(), size_t(family) + 1)); + m_QueueFamilyCounts.resize(RDCMAX(m_QueueFamilies.size(), size_t(family) + 1)); m_QueueFamilies[family] = new VkQueue[count]; m_QueueFamilyCounts[family] = count; diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index f7adf6ea8..a4d1dc6de 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -47,11 +47,11 @@ VkIndirectPatchData WrappedVulkan::FetchIndirectData(VkIndirectPatchType type, case VkIndirectPatchType::DispatchIndirect: dataSize = sizeof(VkDispatchIndirectCommand); break; case VkIndirectPatchType::DrawIndirect: case VkIndirectPatchType::DrawIndirectCount: - dataSize = sizeof(VkDrawIndirectCommand) + (count > 0 ? count - 1 : 0) * stride; + dataSize = sizeof(VkDrawIndirectCommand) + (count - 1) * stride; break; case VkIndirectPatchType::DrawIndexedIndirect: case VkIndirectPatchType::DrawIndexedIndirectCount: - dataSize = sizeof(VkDrawIndexedIndirectCommand) + (count > 0 ? count - 1 : 0) * stride; + dataSize = sizeof(VkDrawIndexedIndirectCommand) + (count - 1) * stride; break; case VkIndirectPatchType::DrawIndirectByteCount: dataSize = 4; break; } diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index dd42a96bb..5cf4c6198 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -819,7 +819,7 @@ rdcpair Process::InjectIntoProcess( _snwprintf_s( paramsAlloc, 2047, 2047, - L"\"%ls\" capaltbit --pid=%d --capfile=\"%ls\" --debuglog=\"%ls\" --capopts=\"%hs\"", + L"\"%ls\" capaltbit --pid=%u --capfile=\"%ls\" --debuglog=\"%ls\" --capopts=\"%hs\"", renderdocPath, pid, wcapturefile.c_str(), wdebugLogfile.c_str(), optstr.c_str()); RDCDEBUG("params %ls", paramsAlloc); diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp index a8603fb75..49c508a54 100644 --- a/renderdoc/replay/replay_driver.cpp +++ b/renderdoc/replay/replay_driver.cpp @@ -75,7 +75,7 @@ static DrawcallDescription *SetupDrawcallPointers(rdcarrayeventId > drawcallTable.back()->eventId); - drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId + 1))); + drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId) + 1)); drawcallTable[draw->eventId] = draw; } @@ -91,7 +91,7 @@ static DrawcallDescription *SetupDrawcallPointers(rdcarrayeventId > drawcallTable.back()->eventId || (draw->eventId == drawcallTable.back()->eventId && (drawcallTable.back()->flags & DrawFlags::PushMarker))); - drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId + 1))); + drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId) + 1)); drawcallTable[draw->eventId] = draw; } } @@ -106,7 +106,7 @@ static DrawcallDescription *SetupDrawcallPointers(rdcarrayeventId > drawcallTable.back()->eventId || (draw->eventId == drawcallTable.back()->eventId && (drawcallTable.back()->flags & DrawFlags::PushMarker))); - drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId + 1))); + drawcallTable.resize(RDCMAX(drawcallTable.size(), size_t(draw->eventId) + 1)); drawcallTable[draw->eventId] = draw; }