Skip to content

Rolling 14 dependencies #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dj2 merged 4 commits into from
Jun 2, 2020
Merged

Rolling 14 dependencies #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5e19e0
Rolling 14 dependencies
dj2 Jun 2, 2020
10c112f
suppress old style cast
dj2 Jun 2, 2020
2e29409
Rolling 5 dependencies
dj2 Jun 2, 2020
32341c6
Rolling 2 dependencies
dj2 Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ vars = {
'nlohmann_git': 'https://github.com/nlohmann',
'swiftshader_git': 'https://swiftshader.googlesource.com',

'clspv_llvm_revision': '7cefd1b4cd77cd37128965264051e617c7005593',
'clspv_revision': '1c32720c4c5b3e0e4c78e97a50f886cb42198e0c',
'cppdap_revision': '9e313445bb75bae71b5d003f7264ee55ae296023',
'clspv_llvm_revision': 'b836ae24a9f4202a73a227bc3dac9b1a40979a7d',
'clspv_revision': '227e97857852d9bd7247ecaa9ff382210864a8a2',
'cppdap_revision': 'cc93ba9747201007c8ff90e7d924152485462fbc',
'cpplint_revision': '26470f9ccb354ff2f6d098f831271a1833701b28',
'dxc_revision': '36ecb43206b9de059a3ab2a1e2ab1dde25c98c5b',
'glslang_revision': '0ab78114a9e1b28a48cd37252ec59fdcf85e187d',
'googletest_revision': '011959aafddcd30611003de96cfd8d7a7685c700',
'dxc_revision': 'b7626e97eebaff425239a7ac32d3e9698259758d',
'glslang_revision': '78a3c915a1d70cf236588cc3c88f4db0566494a4',
'googletest_revision': '859bfe8981d6724c4ea06e73d29accd8588f3230',
'json_revision': '456478b3c50d60100dbb1fb9bc931f370a2c1c28',
'lodepng_revision': 'e34ac04553e51a6982ae234d98ce6b76dd57a6a1',
'shaderc_revision': '00ac5d82178cfb5679fe19194d5794fdb01cdd00',
'spirv_headers_revision': 'c0df742ec0b8178ad58c68cff3437ad4b6a06e26',
'spirv_tools_revision': '18ba3d9a353b7c59903d8ef712d66ea7f3ee76f1',
'swiftshader_revision': 'b6e8c3f0f4830887d69ba765a922ac3c40e81dd9',
'vulkan_headers_revision': '09531f27933bf04bffde9074acb302e026e8f181',
'vulkan_loader_revision': '3e390a15976143060eb232acc04380209f9ed08e',
'vulkan_validationlayers_revision': '67eac5116ba382ba157db3ddaa061d53433f5dbf',
'lodepng_revision': '486d165ed70999cd575a9996a7f2551c7b238c81',
'shaderc_revision': 'd8eca133b4b18e4fb8b2ab9b9f04dc53d5ce2537',
'spirv_headers_revision': '11d7637e7a43cd88cfd4e42c99581dcb682936aa',
'spirv_tools_revision': '636f449e1529a10d259eb7dc37d97192cf2820f8',
'swiftshader_revision': 'b0c00e8dd6d408fbc2c6a464b95fad93bf0dc812',
'vulkan_headers_revision': 'db1a98c6cc430725669ea10eb6a35b3584d5f3ab',
'vulkan_loader_revision': '006586926adece57adea3e006140b5df19826371',
'vulkan_validationlayers_revision': '515b4041cc32085f99d4ab8f87aa1c40c7450467',
}

deps = {
Expand Down
4 changes: 4 additions & 0 deletions samples/config_helper_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,11 @@ amber::Result ConfigHelperVulkan::CreateVulkanInstance(
bool show_version_info) {
VkApplicationInfo app_info = VkApplicationInfo();
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
app_info.apiVersion = VK_MAKE_VERSION(engine_major, engine_minor, 0);
#pragma clang diagnostic pop

VkInstanceCreateInfo instance_info = VkInstanceCreateInfo();
instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
Expand Down