Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 19 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ notifications:
matrix:
include:

# - os: linux
# dist: bionic
# language: minimal
# compiler: clang
# env: DAWN_BUILD=linux-bionic-clang
# cache:
# directories:
# - $HOME/.hunter
# addons:
# apt:
# packages:
# - libgl1-mesa-dev
# - libvulkan-dev
# - mesa-common-dev
# - python2.7
# before_script:
# - cmake -B.build -H. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DCMAKE_INSTALL_PREFIX=$(pwd)/.install
# script:
# - cmake --build .build --target install -- -j$(grep -c ^processor /proc/cpuinfo)
- os: linux
dist: bionic
language: minimal
compiler: clang
env: DAWN_BUILD=linux-bionic-clang
cache:
directories:
- $HOME/.hunter
addons:
apt:
packages:
- libgl1-mesa-dev
- libvulkan-dev
- mesa-common-dev
- python2.7
before_script:
- cmake -B.build -H. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DCMAKE_INSTALL_PREFIX=$(pwd)/.install
script:
- cmake --build .build --target install -- -j$(grep -c ^processor /proc/cpuinfo)

- os: linux
dist: bionic
Expand Down
9 changes: 4 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
endif()

HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.216.tar.gz"
SHA1 "a492a1879bee60c29f7af17ef56b45f0d7766241"
LOCAL
URL "https://github.com/cpp-pm/hunter/archive/v0.23.223.tar.gz"
SHA1 "44339d35e1a2555525229ef86a2cc21721798d85"
)

project(dawn)
Expand All @@ -59,8 +58,6 @@ find_package(Python3 QUIET REQUIRED)
hunter_add_package(glfw)
find_package(glfw3 CONFIG REQUIRED)

hunter_add_package(mattc_glslang)
hunter_add_package(mattc_SPIRV-Cross)
hunter_add_package(shaderc)
find_package(shaderc CONFIG REQUIRED)

Expand Down Expand Up @@ -481,6 +478,8 @@ target_sources(dawn_native_sources INTERFACE
${dawn_root}/src/dawn_native/d3d12/RenderPipelineD3D12.h
${dawn_root}/src/dawn_native/d3d12/ResourceAllocator.cpp
${dawn_root}/src/dawn_native/d3d12/ResourceAllocator.h
${dawn_root}/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp
${dawn_root}/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h
${dawn_root}/src/dawn_native/d3d12/ResourceHeapD3D12.cpp
${dawn_root}/src/dawn_native/d3d12/ResourceHeapD3D12.h
${dawn_root}/src/dawn_native/d3d12/SamplerD3D12.cpp
Expand Down
44 changes: 0 additions & 44 deletions cmake/Hunter/config.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion dawn
Submodule dawn updated from 09cc2b to e986cb