lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix %s to %hs usage

Browse Source
This commit is contained in:
baldurk
2014-08-25 17:23:03 +01:00
parent 0532e4e8d6
commit 620067ec6b
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_resources.h
+1 -1
View File
@@ -477,7 +477,7 @@ protected:
bool ret = m_pDevice->GetResourceManager()->AddWrapper(this, real);
if(!ret)
RDCERR("Error adding wrapper for type %s", ToStr::Get(__uuidof(NestedType)).c_str());
RDCERR("Error adding wrapper for type %hs", ToStr::Get(__uuidof(NestedType)).c_str());
m_pDevice->GetResourceManager()->AddCurrentResource(GetResourceID(), this);
}
renderdoc/driver/gl/gl_debug.cpp
+2 -2
View File
@@ -535,7 +535,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overl
}
else
{
RDCERR("Uniform type '%s' not being copied to new program", ToStr::Get(uniType).c_str());
RDCERR("Uniform type '%hs' not being copied to new program", ToStr::Get(uniType).c_str());
}
}
}
@@ -598,7 +598,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overl
}
else
{
RDCERR("Uniform type '%s' not being copied to new program", ToStr::Get(uniType).c_str());
RDCERR("Uniform type '%hs' not being copied to new program", ToStr::Get(uniType).c_str());
}
}
}
renderdoc/driver/gl/gl_replay.cpp
+3 -3
View File
@@ -1048,7 +1048,7 @@ void GLReplay::SavePipelineState()
}
else if(binding != t)
{
RDCWARN("Two uniforms pointing to texture unit %d with types %s and %s", unit, ToStr::Get(binding).c_str(), ToStr::Get(t).c_str());
RDCWARN("Two uniforms pointing to texture unit %d with types %hs and %hs", unit, ToStr::Get(binding).c_str(), ToStr::Get(t).c_str());
}
}
}
@@ -1222,7 +1222,7 @@ void GLReplay::FillCBufferVariables(WrappedOpenGL &gl, GLuint prog, bool bufferB
for(uint32_t a=0; a < desc.elements; a++)
{
ShaderVariable arrEl = var;
arrEl.name = StringFormat::Fmt("%s[%u]", var.name.elems, a);
arrEl.name = StringFormat::Fmt("%hs[%u]", var.name.elems, a);
vector<ShaderVariable> ov;
FillCBufferVariables(gl, prog, bufferBacked, prefix + arrEl.name.elems + ".", variables[i].type.members, ov, data);
@@ -1272,7 +1272,7 @@ void GLReplay::FillCBufferVariables(WrappedOpenGL &gl, GLuint prog, bool bufferB
for(uint32_t a=0; a < desc.elements; a++)
{
ShaderVariable el = var;
el.name = StringFormat::Fmt("%s[%u]", var.name.elems, a);
el.name = StringFormat::Fmt("%hs[%u]", var.name.elems, a);
FillCBufferValue(gl, prog, bufferBacked, desc.rowMajorStorage ? true : false,
values[0] + values[2] * a, values[1], data, el);
renderdoc/hooks/gl_win32_hooks.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#define HookInit(function) \
bool CONCAT(function, _success) = CONCAT(function, _hook).Initialize(STRINGIZE(function), DLL_NAME, CONCAT(function, _hooked)); \
if(!CONCAT(function, _success)) RDCWARN("Couldn't hook %s", STRINGIZE(function)); \
if(!CONCAT(function, _success)) RDCWARN("Couldn't hook %hs", STRINGIZE(function)); \
success &= CONCAT(function, _success); \
GL.function = CONCAT(function, _hook)();
@@ -231,7 +231,7 @@ class OpenGLHook : LibraryHook
#if USE_MHOOK
if(GetModuleHandleA(DLL_NAME) == NULL)
{
RDCWARN("Failed to load %s - not inserting OpenGL hooks.", DLL_NAME);
RDCWARN("Failed to load %hs - not inserting OpenGL hooks.", DLL_NAME);
return false;
}
#endif
renderdoc/os/win32/win32_hook.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ struct CachedHookData
if(dosheader->e_magic != 0x5a4d)
{
RDCDEBUG("Ignoring module %s, since magic is 0x%04x not 0x%04x", modName, (uint32_t)dosheader->e_magic, 0x5a4dU);
RDCDEBUG("Ignoring module %hs, since magic is 0x%04x not 0x%04x", modName, (uint32_t)dosheader->e_magic, 0x5a4dU);
return;
}