mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Remove AMD_EXTENSIONS / NV_EXTENSIONS defines

Browse Source 
These defines aren't needed anymore
This commit is contained in:
Juan Ramos 2023-01-04 14:02:19 -07:00 committed by Jeremy Hayes
parent 1d978158de
commit 06a7078ce7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -1,4 +1,4 @@
# Copyright (C) 2020 The Khronos Group Inc. # Copyright (C) 2020-2023 The Khronos Group Inc.
# #
# All rights reserved. # All rights reserved.
# #
@ -53,7 +53,7 @@ $(eval $(call gen_glslang_build_info_h))
GLSLANG_OS_FLAGS := -DGLSLANG_OSINCLUDE_UNIX GLSLANG_OS_FLAGS := -DGLSLANG_OSINCLUDE_UNIX
# AMD and NV extensions are turned on by default in upstream Glslang. # AMD and NV extensions are turned on by default in upstream Glslang.
GLSLANG_DEFINES:= -DAMD_EXTENSIONS -DNV_EXTENSIONS -DENABLE_HLSL $(GLSLANG_OS_FLAGS) GLSLANG_DEFINES:= -DENABLE_HLSL $(GLSLANG_OS_FLAGS)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:=OSDependent LOCAL_MODULE:=OSDependent

4
BUILD.bazel
View File

@ -1,4 +1,4 @@
# Copyright (C) 2020 The Khronos Group Inc. # Copyright (C) 2020-2023 The Khronos Group Inc.
# #
# All rights reserved. # All rights reserved.
# #
@ -125,10 +125,8 @@ cc_library(
], ],
copts = COMMON_COPTS, copts = COMMON_COPTS,
defines = [ defines = [
"AMD_EXTENSIONS",
"ENABLE_HLSL=0", "ENABLE_HLSL=0",
"ENABLE_OPT=0", "ENABLE_OPT=0",
"NV_EXTENSIONS",
], ],
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [""], "@bazel_tools//src/conditions:windows": [""],