diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index 181158ced..12c93090f 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -114,11 +114,6 @@ public: { if(e->buttons() & Qt::LeftButton) { - if(m_DragStartPos.x() < 0) - { - m_DragStartPos = e->pos(); - } - m_DragStartPos = e->pos(); } else @@ -332,20 +327,15 @@ private: void RotateArcball(QPoint from, QPoint to) { - float ax = ((float)from.x() / (float)m_WinSize.width()) * 2.0f - 1.0f; - float ay = ((float)from.y() / (float)m_WinSize.height()) * 2.0f - 1.0f; - float bx = ((float)to.x() / (float)m_WinSize.width()) * 2.0f - 1.0f; - float by = ((float)to.y() / (float)m_WinSize.height()) * 2.0f - 1.0f; - // this isn't a 'true arcball' but it handles extreme aspect ratios // better. We basically 'centre' around the from point always being // 0,0 (straight out of the screen) as if you're always dragging // the arcball from the middle, and just use the relative movement int minDimension = qMin(m_WinSize.width(), m_WinSize.height()); - ax = ay = 0; - bx = ((float)(to.x() - from.x()) / (float)minDimension) * 2.0f; - by = ((float)(to.y() - from.y()) / (float)minDimension) * 2.0f; + float ax = 0.0f, ay = 0.0f; + float bx = ((float)(to.x() - from.x()) / (float)minDimension) * 2.0f; + float by = ((float)(to.y() - from.y()) / (float)minDimension) * 2.0f; ay = -ay; by = -by; diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 518fad6fa..10dca36a5 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -1170,13 +1170,8 @@ void ShaderViewer::disassembly_buttonReleased(QMouseEvent *event) m_DisassemblyView->setIndicatorCurrent(INDICATOR_REGHIGHLIGHT); m_DisassemblyView->indicatorClearRange(start, end); - sptr_t flags = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; - - if(tag.cat != VariableCategory::Unknown) - { - flags |= SCFIND_REGEXP | SCFIND_POSIX; - text += lit("\\.[xyzwrgba]+"); - } + sptr_t flags = SCFIND_MATCHCASE | SCFIND_WHOLEWORD | SCFIND_REGEXP | SCFIND_POSIX; + text += lit("\\.[xyzwrgba]+"); QByteArray findUtf8 = text.toUtf8(); diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index cc14d6cef..b667def20 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -1548,7 +1548,6 @@ rdcpair RemoteServer::OpenCapture( if(proxyid != ~0U && proxyid >= m_Proxies.size()) { RDCERR("Invalid proxy driver id %d specified for remote renderer", proxyid); - ret.first = ReplayStatus::InternalError; return ret; } diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp index 3adc3b429..3bbc76ffe 100644 --- a/renderdoc/driver/d3d11/d3d11_context.cpp +++ b/renderdoc/driver/d3d11/d3d11_context.cpp @@ -1300,12 +1300,6 @@ ReplayStatus WrappedID3D11DeviceContext::ReplayLog(CaptureState readType, uint32 it != WrappedID3D11Texture3D1::m_TextureList.end(); ++it) m_ResourceUses[it->first]; -#define CHECK_UNUSED_INITIAL_STATES 0 - -#if CHECK_UNUSED_INITIAL_STATES - int initialSkips = 0; -#endif - // it's easier to remove duplicate usages here than check it as we go. // this means if textures are bound in multiple places in the same draw // we don't have duplicate uses @@ -1314,53 +1308,7 @@ ReplayStatus WrappedID3D11DeviceContext::ReplayLog(CaptureState readType, uint32 rdcarray &v = it->second; std::sort(v.begin(), v.end()); v.erase(std::unique(v.begin(), v.end()) - v.begin(), ~0U); - -#if CHECK_UNUSED_INITIAL_STATES - ResourceId resid = m_pDevice->GetResourceManager()->GetOriginalID(it->first); - - if(m_pDevice->GetResourceManager()->GetInitialContents(resid).resource == NULL) - continue; - - // code disabled for now as skipping these initial states - // doesn't seem to produce any measurable improvement in any case - // I've checked - RDCDEBUG("Resource %llu", resid); - if(v.empty()) - { - RDCDEBUG("Never used!"); - initialSkips++; - } - else - { - bool written = false; - - for(auto usit = v.begin(); usit != v.end(); ++usit) - { - ResourceUsage u = usit->usage; - - if(u == ResourceUsage::StreamOut || - (u >= ResourceUsage::VS_RWResource && u <= ResourceUsage::CS_RWResource) || - u == ResourceUsage::DepthStencilTarget || u == ResourceUsage::ColorTarget) - { - written = true; - break; - } - } - - if(written) - { - RDCDEBUG("Written in frame - needs initial state"); - } - else - { - RDCDEBUG("Never written to in the frame"); - initialSkips++; - } - } -#endif } - - // RDCDEBUG("Can skip %d initial states.", initialSkips); } // swap the structure back now that we've accumulated the frame as well. diff --git a/renderdoc/driver/d3d11/d3d11_postvs.cpp b/renderdoc/driver/d3d11/d3d11_postvs.cpp index f5ea2e281..59fd43b2b 100644 --- a/renderdoc/driver/d3d11/d3d11_postvs.cpp +++ b/renderdoc/driver/d3d11/d3d11_postvs.cpp @@ -199,12 +199,6 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) WrappedID3D11Shader *wrappedVS = (WrappedID3D11Shader *)vs; - if(!wrappedVS) - { - RDCERR("Couldn't find wrapped vertex shader!"); - return; - } - const DrawcallDescription *drawcall = m_pDevice->GetDrawcall(eventId); if(drawcall->numIndices == 0 || @@ -222,12 +216,6 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) WrappedID3D11Shader *wrappedGS = (WrappedID3D11Shader *)gs; - if(!wrappedGS) - { - RDCERR("Couldn't find wrapped geometry shader!"); - return; - } - dxbcGS = wrappedGS->GetDXBC(); RDCASSERT(dxbcGS); @@ -240,12 +228,6 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) WrappedID3D11Shader *wrappedDS = (WrappedID3D11Shader *)ds; - if(!wrappedDS) - { - RDCERR("Couldn't find wrapped domain shader!"); - return; - } - dxbcDS = wrappedDS->GetDXBC(); RDCASSERT(dxbcDS); diff --git a/renderdoc/driver/d3d12/d3d12_rendertexture.cpp b/renderdoc/driver/d3d12/d3d12_rendertexture.cpp index f93cf198b..2f2f49b3f 100644 --- a/renderdoc/driver/d3d12/d3d12_rendertexture.cpp +++ b/renderdoc/driver/d3d12/d3d12_rendertexture.cpp @@ -449,7 +449,6 @@ bool D3D12Replay::RenderTextureInternal(D3D12_CPU_DESCRIPTOR_HANDLE rtv, Texture vertexData.VertexScale.y = (tex_y / m_OutputHeight) * cfg.scale * 2.0f; pixelData.MipLevel = (float)cfg.subresource.mip; - pixelData.OutputDisplayFormat = RESTYPE_TEX2D; if(resourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) pixelData.Slice = diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index 9a4872c88..ac1282a6c 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.cpp +++ b/renderdoc/driver/d3d12/d3d12_replay.cpp @@ -84,11 +84,7 @@ D3D12Pipe::RegisterSpace &get_space(rdcarray &dstSpace D3D12Replay::D3D12Replay(WrappedID3D12Device *d) { m_pDevice = d; - m_Proxy = false; - m_HighlightCache.driver = this; - - RDCEraseEl(m_DriverInfo); } void D3D12Replay::Shutdown() diff --git a/renderdoc/driver/d3d12/d3d12_state.cpp b/renderdoc/driver/d3d12/d3d12_state.cpp index 926ce0376..3d6951cd6 100644 --- a/renderdoc/driver/d3d12/d3d12_state.cpp +++ b/renderdoc/driver/d3d12/d3d12_state.cpp @@ -28,33 +28,6 @@ #include "d3d12_manager.h" #include "d3d12_resources.h" -D3D12RenderState &D3D12RenderState::operator=(const D3D12RenderState &o) -{ - views = o.views; - scissors = o.scissors; - - rts = o.rts; - dsv = o.dsv; - - pipe = o.pipe; - - heaps = o.heaps; - - graphics.rootsig = o.graphics.rootsig; - graphics.sigelems = o.graphics.sigelems; - compute.rootsig = o.compute.rootsig; - compute.sigelems = o.compute.sigelems; - - topo = o.topo; - stencilRef = o.stencilRef; - memcpy(blendFactor, o.blendFactor, sizeof(blendFactor)); - - ibuffer = o.ibuffer; - vbuffers = o.vbuffers; - - return *this; -} - rdcarray D3D12RenderState::GetRTVIDs() const { rdcarray ret; diff --git a/renderdoc/driver/d3d12/d3d12_state.h b/renderdoc/driver/d3d12/d3d12_state.h index f73e40866..b90d8553b 100644 --- a/renderdoc/driver/d3d12/d3d12_state.h +++ b/renderdoc/driver/d3d12/d3d12_state.h @@ -44,7 +44,8 @@ enum SignatureElementType struct D3D12RenderState { D3D12RenderState() = default; - D3D12RenderState &operator=(const D3D12RenderState &o); + D3D12RenderState(const D3D12RenderState &o) = default; + D3D12RenderState &operator=(const D3D12RenderState &o) = default; void ApplyState(WrappedID3D12Device *dev, ID3D12GraphicsCommandListX *list) const; void ApplyDescriptorHeaps(ID3D12GraphicsCommandListX *list) const; diff --git a/renderdoc/driver/d3d8/d3d8_device.cpp b/renderdoc/driver/d3d8/d3d8_device.cpp index 297035ea3..d4d7c6ede 100644 --- a/renderdoc/driver/d3d8/d3d8_device.cpp +++ b/renderdoc/driver/d3d8/d3d8_device.cpp @@ -260,7 +260,7 @@ HRESULT __stdcall WrappedD3DDevice8::Present(CONST RECT *pSourceRect, CONST RECT HRESULT res = S_OK; res = m_device->BeginScene(); DWORD stateBlock; - HRESULT stateBlockRes = m_device->CreateStateBlock(D3DSBT_ALL, &stateBlock); + m_device->CreateStateBlock(D3DSBT_ALL, &stateBlock); IDirect3DSurface8 *backBuffer; res |= m_device->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &backBuffer); @@ -285,7 +285,7 @@ HRESULT __stdcall WrappedD3DDevice8::Present(CONST RECT *pSourceRect, CONST RECT GetDebugManager()->RenderText(0.0f, 0.0f, overlayText); - stateBlockRes = m_device->ApplyStateBlock(stateBlock); + m_device->ApplyStateBlock(stateBlock); res |= m_device->EndScene(); } } diff --git a/renderdoc/driver/d3d9/d3d9_device.cpp b/renderdoc/driver/d3d9/d3d9_device.cpp index c1aabb08f..0dd0b7ced 100644 --- a/renderdoc/driver/d3d9/d3d9_device.cpp +++ b/renderdoc/driver/d3d9/d3d9_device.cpp @@ -228,7 +228,7 @@ HRESULT __stdcall WrappedD3DDevice9::Present(CONST RECT *pSourceRect, CONST RECT HRESULT res = S_OK; res = m_device->BeginScene(); IDirect3DStateBlock9 *stateBlock; - HRESULT stateBlockRes = m_device->CreateStateBlock(D3DSBT_ALL, &stateBlock); + m_device->CreateStateBlock(D3DSBT_ALL, &stateBlock); IDirect3DSurface9 *backBuffer; res |= m_device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &backBuffer); @@ -253,7 +253,7 @@ HRESULT __stdcall WrappedD3DDevice9::Present(CONST RECT *pSourceRect, CONST RECT GetDebugManager()->RenderText(0.0f, 0.0f, overlayText); - stateBlockRes = stateBlock->Apply(); + stateBlock->Apply(); res |= m_device->EndScene(); } } diff --git a/renderdoc/driver/dxgi/dxgi_common.cpp b/renderdoc/driver/dxgi/dxgi_common.cpp index 3bdb4fbd2..26b7a82de 100644 --- a/renderdoc/driver/dxgi/dxgi_common.cpp +++ b/renderdoc/driver/dxgi/dxgi_common.cpp @@ -364,7 +364,6 @@ UINT GetRowPitch(int Width, DXGI_FORMAT Format, int mip) case DXGI_FORMAT_NV11: // similar to NV12 - planar 4:1:1 4 horizontal downsampling but no vertical downsampling. For // row pitch calculation amounts to the same result. - ret = ret; break; case DXGI_FORMAT_AI44: // special format, 1 byte per pixel, palletised values in 4 most significant bits, alpha in 4 diff --git a/renderdoc/driver/gl/gl_rendermesh.cpp b/renderdoc/driver/gl/gl_rendermesh.cpp index 11520da80..62164b0e5 100644 --- a/renderdoc/driver/gl/gl_rendermesh.cpp +++ b/renderdoc/driver/gl/gl_rendermesh.cpp @@ -335,9 +335,6 @@ void GLReplay::RenderMesh(uint32_t eventId, const rdcarray &secondar ClearGLErrors(); drv.glUseProgram(solidProg); - GLenum err = drv.glGetError(); - - err = eGL_NONE; } MeshUBOData *soliddata = (MeshUBOData *)drv.glMapBufferRange( diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index efc8d21b3..04dfd562e 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -869,7 +869,6 @@ void GLReplay::SavePipelineState(uint32_t eventId) ResourceFormat fmt; fmt.type = ResourceFormatType::Regular; - fmt.compCount = 4; GLint compCount; drv.glGetVertexAttribiv(i, eGL_VERTEX_ATTRIB_ARRAY_SIZE, (GLint *)&compCount); diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.h b/renderdoc/driver/shaders/dxbc/dxbc_debug.h index 0d4034d6c..22ec6f8c9 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.h @@ -294,7 +294,6 @@ public: done = false; trace = NULL; program = NULL; - program = NULL; RDCEraseEl(semantics); } State(int quadIdx, const ShaderDebugTrace *t, const DXBC::Reflection *r, diff --git a/renderdoc/driver/vulkan/vk_rendertexture.cpp b/renderdoc/driver/vulkan/vk_rendertexture.cpp index 570bebc65..d7e3839ba 100644 --- a/renderdoc/driver/vulkan/vk_rendertexture.cpp +++ b/renderdoc/driver/vulkan/vk_rendertexture.cpp @@ -302,8 +302,6 @@ bool VulkanReplay::RenderTextureInternal(TextureDisplay cfg, VkRenderPassBeginIn int sampleIdx = (int)RDCCLAMP(cfg.subresource.sample, 0U, (uint32_t)SampleCount(iminfo.samples)); - sampleIdx = cfg.subresource.sample; - if(cfg.subresource.sample == ~0U) sampleIdx = -SampleCount(iminfo.samples); diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 51710eaf0..17e1fb6bf 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -240,11 +240,6 @@ rdcarray VulkanReplay::GetPassEvents(uint32_t eventId) // step back start = start->previous; - - // something went wrong, start->previous was non-zero but we didn't - // get a draw. Abort - if(!start) - return passEvents; } // store all the draw eventIDs up to the one specified at the start diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 8ceff8584..f8c243bd6 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -556,12 +556,10 @@ static void ForAllModules(std::function callbac return; } - uintptr_t ret = 0; - do { callback(me32); - } while(ret == 0 && Module32Next(hModuleSnap, &me32)); + } while(Module32Next(hModuleSnap, &me32)); CloseHandle(hModuleSnap); } diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index 22cacd8e2..4603b84a5 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -639,19 +639,13 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_UpdateInstalledVersionNumbe // allow the value to silently not exist if(ret != ERROR_SUCCESS) - { DisplayName[0] = 0; - ret = ERROR_SUCCESS; - } len = sizeof(Publisher) - 1; ret = RegGetValueA(subkey, NULL, "Publisher", RRF_RT_ANY, NULL, Publisher, &len); if(ret != ERROR_SUCCESS) - { Publisher[0] = 0; - ret = ERROR_SUCCESS; - } // if this is our key, set the version number if(!strcmp(DisplayName, "RenderDoc") && !strcmp(Publisher, "Baldur Karlsson")) diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp index 564945857..3fc51ddff 100644 --- a/renderdoccmd/renderdoccmd.cpp +++ b/renderdoccmd/renderdoccmd.cpp @@ -386,7 +386,6 @@ struct InjectCommand : public Command virtual int Execute(cmdline::parser &parser, const CaptureOptions &opts) { uint32_t PID = parser.get("PID"); - std::string workingDir = parser.get("working-dir"); std::string logFile = parser.get("capture-file"); std::cout << "Injecting into PID " << PID << std::endl;