lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-15 22:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable warning C4189: local variable is initialized but not referenced

Browse Source
This commit is contained in:
baldurk
2016-04-09 11:24:45 +02:00
parent 905e2ce0a2
commit cda0b4cb5a
8 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/custom_assert.h
+1 -1
View File
@@ -105,7 +105,7 @@
#define RDCASSERTMSG(msg, ...) \
do { \
if(!(RDCASSERT_IFCOND(__VA_ARGS__))) { \
const char custommsg[] = msg; \
const char custommsg[] = msg; (void)custommsg; \
std::string assertmsg = "'" STRINGIZE(RDCASSERT_GETCOND(__VA_ARGS__)) "' "; \
if(sizeof(custommsg) > 1) assertmsg += msg " "; \
std::string failmsg; \
renderdoc/core/replay_proxy.cpp
+1 -1
View File
@@ -1948,7 +1948,7 @@ byte *ProxySerialiser::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_
byte *compressed = (byte *)m_FromReplaySerialiser->RawReadBytes(compressedSize);
size_t uncompSize = (size_t)LZ4_decompress_fast((const char *)compressed, (char *)ret, (int)dataSize);
LZ4_decompress_fast((const char *)compressed, (char *)ret, (int)dataSize);
return ret;
}
renderdoc/os/win32/win32_callstack.cpp
+7 -9
View File
@@ -262,6 +262,12 @@ BOOL CALLBACK EnumModule(PCWSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext
BOOL res = dynSymGetModuleInfo64W(GetCurrentProcess(), BaseOfDll, &ModInfo);
DWORD err = GetLastError();
if(!res)
{
RDCERR("Couldn't get module info for %ls: %d", ModuleName, err);
return FALSE;
}
EnumModChunk chunk;
chunk.base = BaseOfDll;
@@ -284,9 +290,6 @@ BOOL CALLBACK EnumModule(PCWSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext
PIMAGE_FILE_HEADER fileHeader = (PIMAGE_FILE_HEADER)(PE00+4);
PIMAGE_OPTIONAL_HEADER optHeader = (PIMAGE_OPTIONAL_HEADER)((BYTE *)fileHeader+sizeof(IMAGE_FILE_HEADER));
PIMAGE_SECTION_HEADER sections = (PIMAGE_SECTION_HEADER)((BYTE *)optHeader+sizeof(IMAGE_OPTIONAL_HEADER));
DWORD dbgSize = optHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
DWORD dbgOffset = optHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
PIMAGE_DEBUG_DIRECTORY debugDir = (PIMAGE_DEBUG_DIRECTORY)(addr32 + dbgOffset);
@@ -442,10 +445,7 @@ void *Win32CallstackResolver::SendRecvPipeMessage(wstring message)
BOOL success = WriteFile(pdblocatePipe, message.c_str(), msgLen, &written, NULL);
if(!success || written != msgLen)
{
DWORD err = GetLastError();
return NULL;
}
byte *bufPtr = (byte *)pipeMessageBuf;
DWORD bufSize = sizeof(pipeMessageBuf);
@@ -703,8 +703,6 @@ Win32CallstackResolver::Win32CallstackResolver(char *moduleDB, size_t DBSize, st
pdbIgnores.erase( unique( pdbIgnores.begin(), pdbIgnores.end() ), pdbIgnores.end() );
merge(pdbIgnores, ignores, L';');
WritePrivateProfileStringW(L"renderdoc", L"ignores", ignores.c_str(), configPath.c_str());
int a=0;
}
Win32CallstackResolver::~Win32CallstackResolver()
@@ -730,7 +728,7 @@ Callstack::AddressDetails Win32CallstackResolver::GetAddr(DWORD64 addr)
{
DWORD64 base = modules[i].base;
DWORD size = modules[i].size;
if(addr > modules[i].base && addr < modules[i].base + modules[i].size)
if(addr > base && addr < base + size)
{
if(modules[i].moduleId != 0)
info = GetAddrInfoForModule(modules[i].moduleId, addr);
renderdoc/os/win32/win32_hook.cpp
-3
View File
@@ -177,7 +177,6 @@ struct CachedHookData
PIMAGE_FILE_HEADER fileHeader = (PIMAGE_FILE_HEADER)(PE00+4);
PIMAGE_OPTIONAL_HEADER optHeader = (PIMAGE_OPTIONAL_HEADER)((BYTE *)fileHeader+sizeof(IMAGE_FILE_HEADER));
DWORD iatSize = optHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size;
DWORD iatOffset = optHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
IMAGE_IMPORT_DESCRIPTOR *importDesc = (IMAGE_IMPORT_DESCRIPTOR *)(baseAddress + iatOffset);
@@ -302,8 +301,6 @@ static void HookAllModules()
uintptr_t ret = 0;
int numModules = 0;
do
{
s_HookData->ApplyHooks(me32.szModule, me32.hModule);
renderdoc/renderdoc.vcxproj
+4 -4
View File
@@ -109,7 +109,7 @@
<PreprocessorDefinitions>RENDERDOC_EXPORTS;RENDERDOC_PLATFORM=win32;USE_BREAKPAD;WIN32;RELEASE;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalOptions>/wd4100 /wd4127 /wd4189</AdditionalOptions>
<AdditionalOptions>/wd4100 /wd4127</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
@@ -138,7 +138,7 @@
<PreprocessorDefinitions>RENDERDOC_EXPORTS;RENDERDOC_PLATFORM=win32;USE_BREAKPAD;WIN64;WIN32;RELEASE;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalOptions>/wd4100 /wd4127 /wd4189</AdditionalOptions>
<AdditionalOptions>/wd4100 /wd4127</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
@@ -166,7 +166,7 @@
<PreprocessorDefinitions>RENDERDOC_EXPORTS;RENDERDOC_PLATFORM=win32;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalOptions>/wd4100 /wd4127 /wd4189</AdditionalOptions>
<AdditionalOptions>/wd4100 /wd4127</AdditionalOptions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
@@ -198,7 +198,7 @@
<PreprocessorDefinitions>RENDERDOC_EXPORTS;RENDERDOC_PLATFORM=win32;WIN64;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalOptions>/wd4100 /wd4127 /wd4189</AdditionalOptions>
<AdditionalOptions>/wd4100 /wd4127</AdditionalOptions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)renderdoc\3rdparty\</AdditionalIncludeDirectories>
renderdoc/replay/replay_renderer.cpp
-2
View File
@@ -1220,8 +1220,6 @@ bool ReplayRenderer::SaveTexture(const TextureSave &saveData, const char *path)
bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, uint32_t sampleIdx, rdctype::array<PixelModification> *history)
{
bool outofbounds = false;
for(size_t t=0; t < m_Textures.size(); t++)
{
if(m_Textures[t].ID == target)
renderdoc/serialise/serialiser.cpp
+1 -2
View File
@@ -273,7 +273,7 @@ Chunk::Chunk(Serialiser *ser, uint32_t chunkType, bool temporary)
if(newval > m_MaxChunks)
{
int breakpointme=0;
int breakpointme=0;(void)breakpointme;
}
m_MaxChunks = RDCMAX(newval, m_MaxChunks);
@@ -1737,7 +1737,6 @@ void Serialiser::AlignNextBuffer(const size_t alignment)
// avoid dynamically allocating
RDCASSERT(alignment <= 128);
byte padding[128] = {0};
byte *p = &padding[0];
if(m_Mode >= WRITING)
{
renderdoc/serialise/utf8printf.cpp
-2
View File
@@ -293,8 +293,6 @@ void PrintInteger(bool typeUnsigned, uint64_t argu, int base, uint64_t numbits,
}
else
{
bool left0s = true;
// buffer large enough for any int (up to 64bit unsigned)
char intbuf[32] = {0};