birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4430 from aws-lumberyard-dev/Atom/jromnoa/fix-for-vulkan-rhi-test-failure

Browse Source 
Fix Vulkan RHI test failure by increasing timeout
monroegm-disable-blank-issue-2
Guthrie Adams 4 years ago committed by GitHub
parent 18b947fd00 18652fabea
commit 3cff21e2c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

6
AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
Unescape Escape View File

@ -226,9 +226,9 @@ class TestMaterialEditor(object):
self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name, cfg_args): self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name, cfg_args):
""" """
Tests each valid RHI option (Null RHI excluded) can be launched with the MaterialEditor. Tests each valid RHI option (Null RHI excluded) can be launched with the MaterialEditor.
Checks for the "Finished loading viewport configurtions." success message post lounch. Checks for the "Finished loading viewport configurations." success message post launch.
""" """
expected_lines = ["Finished loading viewport configurtions."] expected_lines = ["Finished loading viewport configurations."]
unexpected_lines = [ unexpected_lines = [
# "Trace::Assert", # "Trace::Assert",
# "Trace::Error", # "Trace::Error",
@ -241,7 +241,7 @@ class TestMaterialEditor(object):
generic_launcher, generic_launcher,
editor_script="", editor_script="",
run_python="--runpython", run_python="--runpython",
timeout=30, timeout=60,
expected_lines=expected_lines, expected_lines=expected_lines,
unexpected_lines=unexpected_lines, unexpected_lines=unexpected_lines,
halt_on_unexpected=False, halt_on_unexpected=False,

8
Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
Unescape Escape View File

@ -190,7 +190,7 @@ namespace MaterialEditor
void MaterialViewportComponent::ReloadContent() void MaterialViewportComponent::ReloadContent()
{ {
AZ_TracePrintf("Material Editor", "Started loading viewport configurtions.\n"); AZ_TracePrintf("Material Editor", "Started loading viewport configurations.\n");
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnBeginReloadContent); MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnBeginReloadContent);
@ -239,7 +239,7 @@ namespace MaterialEditor
{ {
auto presetPtr = AddLightingPreset(*preset); auto presetPtr = AddLightingPreset(*preset);
m_lightingPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId); m_lightingPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId);
AZ_TracePrintf("Material Editor", "Loaded viewport configurtion: %s.\n", info.m_relativePath.c_str()); AZ_TracePrintf("Material Editor", "Loaded viewport configuration: %s.\n", info.m_relativePath.c_str());
} }
} }
} }
@ -258,7 +258,7 @@ namespace MaterialEditor
{ {
auto presetPtr = AddModelPreset(*preset); auto presetPtr = AddModelPreset(*preset);
m_modelPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId); m_modelPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId);
AZ_TracePrintf("Material Editor", "Loaded viewport configurtion: %s.\n", info.m_relativePath.c_str()); AZ_TracePrintf("Material Editor", "Loaded viewport configuration: %s.\n", info.m_relativePath.c_str());
} }
} }
} }
@ -271,7 +271,7 @@ namespace MaterialEditor
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnEndReloadContent); MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnEndReloadContent);
AZ_TracePrintf("Material Editor", "Finished loading viewport configurtions.\n"); AZ_TracePrintf("Material Editor", "Finished loading viewport configurations.\n");
} }
AZ::Render::LightingPresetPtr MaterialViewportComponent::AddLightingPreset(const AZ::Render::LightingPreset& preset) AZ::Render::LightingPresetPtr MaterialViewportComponent::AddLightingPreset(const AZ::Render::LightingPreset& preset)

Write Preview
Loading…
Cancel
Save