encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of the OpenGL backend on Mac 

OpenGLBackend.cpp would end up including KHR/khrplatform.h when the
libdawn_native target that contains it doesn't have a dependency on the
khr_platform target. Fix this by making libdawn_native_sources expose
some of its dependencies as public_deps.

BUG=

Change-Id: I45c05a064e4b73ab7ac6f5f6258e7983e5fc085d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9205
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Corentin Wallez 2019-07-22 23:32:29 +00:00 committed by Commit Bot service account
parent 40793232d8
commit 23dd12459c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BUILD.gn
View File

@ -95,6 +95,11 @@ source_set("libdawn_native_sources") {
configs += [ ":libdawn_native_internal" ] configs += [ ":libdawn_native_internal" ]
libs = [] libs = []
# Dependencies that are needed to compile libdawn_native entry points in
# FooBackend.cpp need to be public deps so they are propagated to the
# libdawn_native target
public_deps = []
sources = get_target_outputs(":libdawn_native_utils_gen") sources = get_target_outputs(":libdawn_native_utils_gen")
sources += [ sources += [
"src/dawn_native/Adapter.cpp", "src/dawn_native/Adapter.cpp",
@ -280,7 +285,7 @@ source_set("libdawn_native_sources") {
} }
if (dawn_enable_opengl) { if (dawn_enable_opengl) {
deps += [ public_deps += [
":libdawn_native_opengl_loader_gen", ":libdawn_native_opengl_loader_gen",
"third_party:khronos_platform", "third_party:khronos_platform",
] ]
@ -326,7 +331,7 @@ source_set("libdawn_native_sources") {
} }
if (dawn_enable_vulkan) { if (dawn_enable_vulkan) {
deps += [ "third_party:vulkan_headers" ] public_deps += [ "third_party:vulkan_headers" ]
sources += [ sources += [
"src/dawn_native/vulkan/AdapterVk.cpp", "src/dawn_native/vulkan/AdapterVk.cpp",
"src/dawn_native/vulkan/AdapterVk.h", "src/dawn_native/vulkan/AdapterVk.h",