From c8eff1c1e1b88b98b2cf1fa52efbac487f4a747c Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Mon, 4 Mar 2019 23:41:28 +0000 Subject: [PATCH] Remove export of GLVersion from GLAD This symbol conflicts with a duplicate symbol when we link Dawn into Chromium on Linux. Bug: chromium:877147 Change-Id: Iadf8ac81760085a04d82ea9116e367a1bd17cd4d Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/5260 Reviewed-by: Corentin Wallez Reviewed-by: Kai Ninomiya Commit-Queue: Austin Eng --- third_party/glad/include/glad/glad.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/glad/include/glad/glad.h b/third_party/glad/include/glad/glad.h index 46e87987e2..2825675cb4 100644 --- a/third_party/glad/include/glad/glad.h +++ b/third_party/glad/include/glad/glad.h @@ -7,7 +7,7 @@ APIs: gl=4.5 Profile: core Extensions: - + Loader: True Local files: False Omit khrplatform: False @@ -81,7 +81,7 @@ typedef void* (* GLADloadproc)(const char *name); # endif #endif -GLAPI struct gladGLversionStruct GLVersion; +extern struct gladGLversionStruct GLVersion; GLAPI int gladLoadGL(void);