izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Text format correctness in the new ShaderCache errors.

Browse Source 
[CL 2706229 by Mark Satterthwaite in Main branch]
This commit is contained in:
Mark Satterthwaite
2015-09-25 11:32:41 -04:00
committed by Mark.Satterthwaite@epicgames.com
parent f7c6ed3f83
commit 7147d2be54
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Engine/Source/Runtime/ShaderCore/Private/ShaderCache.cpp
View File

@@ -897,7 +897,7 @@ void FShaderCache::InternalSetSamplerState(EShaderFrequency Frequency, uint32 In
{
if ( bUseShaderDrawLog && !bIsPreDraw )
{
checkf(Index < GetFeatureLevelMaxTextureSamplers(GMaxRHIFeatureLevel), TEXT("Attempting to bind sampler at index %d which exceeds RHI max. %d"), Index, GetFeatureLevelMaxTextureSamplers(GMaxRHIFeatureLevel));
checkf(Index < GetFeatureLevelMaxTextureSamplers(GMaxRHIFeatureLevel), TEXT("Attempting to bind sampler at index %u which exceeds RHI max. %d"), Index, GetFeatureLevelMaxTextureSamplers(GMaxRHIFeatureLevel));
InvalidResourceCount -= (uint32)(CurrentDrawKey.SamplerStates[Frequency][Index] == FShaderDrawKey::InvalidState);
if ( State )
{
@@ -908,7 +908,7 @@ void FShaderCache::InternalSetSamplerState(EShaderFrequency Frequency, uint32 In
}
else
{
UE_LOG(LogShaders, Warning, TEXT("Binding invalid sampler %p to shader stage %d index %d, draw logging will be suspended until this is reset to a valid or null reference."), State, (uint32)Frequency, Index);
UE_LOG(LogShaders, Warning, TEXT("Binding invalid sampler %p to shader stage %u index %u, draw logging will be suspended until this is reset to a valid or null reference."), State, (uint32)Frequency, Index);
CurrentDrawKey.SamplerStates[Frequency][Index] = FShaderDrawKey::InvalidState;
InvalidResourceCount++;
}
@@ -925,7 +925,7 @@ void FShaderCache::InternalSetTexture(EShaderFrequency Frequency, uint32 Index,
{
if ( bUseShaderDrawLog && !bIsPreDraw )
{
checkf(Index < MaxResources, TEXT("Attempting to texture bind at index %d which exceeds RHI max. %d"), Index, MaxResources);
checkf(Index < MaxResources, TEXT("Attempting to texture bind at index %u which exceeds RHI max. %d"), Index, MaxResources);
InvalidResourceCount -= (uint32)(CurrentDrawKey.Resources[Frequency][Index] == FShaderDrawKey::InvalidState);
if ( State )
{
@@ -946,7 +946,7 @@ void FShaderCache::InternalSetTexture(EShaderFrequency Frequency, uint32 Index,
}
else
{
UE_LOG(LogShaders, Warning, TEXT("Binding invalid texture %p to shader stage %d index %d, draw logging will be suspended until this is reset to a valid or null reference."), State, (uint32)Frequency, Index);
UE_LOG(LogShaders, Warning, TEXT("Binding invalid texture %p to shader stage %u index %u, draw logging will be suspended until this is reset to a valid or null reference."), State, (uint32)Frequency, Index);
CurrentDrawKey.Resources[Frequency][Index] = FShaderDrawKey::InvalidState;
InvalidResourceCount++;
}
@@ -963,7 +963,7 @@ void FShaderCache::InternalSetSRV(EShaderFrequency Frequency, uint32 Index, FSha
{
if ( bUseShaderDrawLog && !bIsPreDraw )
{
checkf(Index < MaxResources, TEXT("Attempting to bind SRV at index %d which exceeds RHI max. %d"), Index, MaxResources);
checkf(Index < MaxResources, TEXT("Attempting to bind SRV at index %u which exceeds RHI max. %d"), Index, MaxResources);
InvalidResourceCount -= (uint32)(CurrentDrawKey.Resources[Frequency][Index] == FShaderDrawKey::InvalidState);
if ( SRV )
{
@@ -975,7 +975,7 @@ void FShaderCache::InternalSetSRV(EShaderFrequency Frequency, uint32 Index, FSha
}
else
{
UE_LOG(LogShaders, Warning, TEXT("Binding invalid SRV %p to shader stage %d index %d, draw logging will be suspended until this is reset to a valid or null reference."), SRV, (uint32)Frequency, Index);
UE_LOG(LogShaders, Warning, TEXT("Binding invalid SRV %p to shader stage %u index %u, draw logging will be suspended until this is reset to a valid or null reference."), SRV, (uint32)Frequency, Index);
CurrentDrawKey.Resources[Frequency][Index] = FShaderDrawKey::InvalidState;
InvalidResourceCount++;
}