Move samples/ under src/dawn/samples/
Bug: dawn:1339 Change-Id: I897df9889da62e4505ea98a780bd481e7855ec73 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86307 Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
parent
7eaab38574
commit
6efd54e2ae
2
BUILD.gn
2
BUILD.gn
|
@ -27,7 +27,7 @@ group("all") {
|
|||
]
|
||||
if (dawn_standalone) {
|
||||
deps += [
|
||||
"samples/dawn:samples",
|
||||
"src/dawn/samples",
|
||||
"src/tint/cmd:tint",
|
||||
]
|
||||
}
|
||||
|
|
|
@ -572,12 +572,6 @@ add_subdirectory(src/dawn)
|
|||
# Samples
|
||||
################################################################################
|
||||
|
||||
if (DAWN_BUILD_SAMPLES)
|
||||
#TODO(dawn:269): Add this once implementation-based swapchains are removed.
|
||||
#add_subdirectory(src/utils)
|
||||
add_subdirectory(samples/dawn)
|
||||
endif()
|
||||
|
||||
if (TINT_BUILD_SAMPLES)
|
||||
add_subdirectory(src/tint/cmd)
|
||||
endif()
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
filter=-build/header_guard
|
||||
filter=-build/include_order
|
||||
filter=-build/include_what_you_use
|
||||
filter=-readability/casting
|
|
@ -1 +0,0 @@
|
|||
*
|
|
@ -23,6 +23,12 @@ add_subdirectory(wire)
|
|||
# TODO(dawn:269): Remove once the implementation-based swapchains are removed.
|
||||
add_subdirectory(utils)
|
||||
|
||||
if (DAWN_BUILD_SAMPLES)
|
||||
#TODO(dawn:269): Add this once implementation-based swapchains are removed.
|
||||
#add_subdirectory(src/utils)
|
||||
add_subdirectory(samples)
|
||||
endif()
|
||||
|
||||
if (DAWN_BUILD_NODE_BINDINGS)
|
||||
set(NODE_BINDING_DEPS
|
||||
${NODE_ADDON_API_DIR}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "SampleUtils.h"
|
||||
#include "dawn/samples/SampleUtils.h"
|
||||
|
||||
#include "dawn/utils/ComboRenderPipelineDescriptor.h"
|
||||
#include "dawn/utils/ScopedAutoreleasePool.h"
|
|
@ -12,7 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import("../../scripts/dawn_overrides_with_defaults.gni")
|
||||
import("../../../scripts/dawn_overrides_with_defaults.gni")
|
||||
|
||||
group("samples") {
|
||||
deps = [
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "SampleUtils.h"
|
||||
#include "dawn/samples/SampleUtils.h"
|
||||
|
||||
#include "dawn/utils/ScopedAutoreleasePool.h"
|
||||
#include "dawn/utils/SystemUtils.h"
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
add_library(dawn_sample_utils STATIC ${DAWN_DUMMY_FILE})
|
||||
common_compile_options(dawn_sample_utils)
|
||||
target_include_directories(dawn_sample_utils PRIVATE ${PROJECT_SOURCE_DIR})
|
||||
target_sources(dawn_sample_utils PRIVATE
|
||||
"SampleUtils.cpp"
|
||||
"SampleUtils.h"
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "SampleUtils.h"
|
||||
#include "dawn/samples/SampleUtils.h"
|
||||
|
||||
#include "dawn/utils/ComboRenderPipelineDescriptor.h"
|
||||
#include "dawn/utils/ScopedAutoreleasePool.h"
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "SampleUtils.h"
|
||||
#include "dawn/samples/SampleUtils.h"
|
||||
|
||||
#include "dawn/utils/ComboRenderPipelineDescriptor.h"
|
||||
#include "dawn/utils/ScopedAutoreleasePool.h"
|
|
@ -12,7 +12,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "samples/dawn/SampleUtils.h"
|
||||
#include "dawn/samples/SampleUtils.h"
|
||||
|
||||
#include "GLFW/glfw3.h"
|
||||
#include "dawn/common/Assert.h"
|
Loading…
Reference in New Issue