Browse Source

build: Remove AMD_EXTENSIONS / NV_EXTENSIONS defines

These defines aren't needed anymore
Juan Ramos 2 years ago
parent
commit
06a7078ce7
2 changed files with 3 additions and 5 deletions
  1. 2 2
      Android.mk
  2. 1 3
      BUILD.bazel

+ 2 - 2
Android.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2020 The Khronos Group Inc.
+# Copyright (C) 2020-2023 The Khronos Group Inc.
 #
 # All rights reserved.
 #
@@ -53,7 +53,7 @@ $(eval $(call gen_glslang_build_info_h))
 
 GLSLANG_OS_FLAGS := -DGLSLANG_OSINCLUDE_UNIX
 # 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)
 LOCAL_MODULE:=OSDependent

+ 1 - 3
BUILD.bazel

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