Skip to content

Commit

Permalink
build: Remove AMD_EXTENSIONS / NV_EXTENSIONS defines
Browse files Browse the repository at this point in the history
These defines aren't needed anymore
  • Loading branch information
juan-lunarg authored and jeremy-lunarg committed Jan 5, 2023
1 parent 1d97815 commit 06a7078
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Android.mk
@@ -1,4 +1,4 @@
# Copyright (C) 2020 The Khronos Group Inc.
# Copyright (C) 2020-2023 The Khronos Group Inc.
#
# All rights reserved.
#
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions BUILD.bazel
@@ -1,4 +1,4 @@
# Copyright (C) 2020 The Khronos Group Inc.
# Copyright (C) 2020-2023 The Khronos Group Inc.
#
# All rights reserved.
#
Expand Down Expand Up @@ -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": [""],
Expand Down

0 comments on commit 06a7078

Please sign in to comment.