Skip to content

Import android glslang and update mesa #3149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 2 commits into
base: main
Choose a base branch
from
+612 −73
Open

Import android glslang and update mesa #3149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f18f93e
Build glslang for new mesa dependency on glslang_validator
Databean Sep 5, 2026
73dd233
Update mesa to current aosp-latest-release version
Databean Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/build_external/build_external.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ include("//build_external/freetype:freetype.MODULE.bazel")
include("//build_external/fruit:fruit.MODULE.bazel")
include("//build_external/gflags:gflags.MODULE.bazel")
include("//build_external/gfxstream:gfxstream.MODULE.bazel")
include("//build_external/glslang:glslang.MODULE.bazel")
include("//build_external/googletest:googletest.MODULE.bazel")
include("//build_external/grpc-proto:grpc-proto.MODULE.bazel")
include("//build_external/grpc:grpc.MODULE.bazel")
Expand Down
Empty file added base/cvd/build_external/glslang/BUILD.bazel
View file
Open in desktop
Empty file.
246 changes: 246 additions & 0 deletions base/cvd/build_external/glslang/BUILD.glslang.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_python//python:defs.bzl", "py_binary")

package(
default_visibility = ["//visibility:public"],
)

COPTS = [
"-DENABLE_HLSL"
]

py_binary(
name = "build_info_py",
srcs = ["build_info.py"],
main = "build_info.py",
)

genrule(
name = "build_info_h",
srcs = [
"CHANGES.md",
"build_info.h.tmpl",
],
outs = ["glslang/build_info.h"],
cmd = "python3 $(location :build_info_py) $$(dirname $(location CHANGES.md)) -i $(location build_info.h.tmpl) -o $(location glslang/build_info.h)",
tools = [":build_info_py"],
)

py_binary(
name = "gen_extension_headers_py",
srcs = ["gen_extension_headers.py"],
main = "gen_extension_headers.py",
)

cc_library(
name = "generic_code_gen",
srcs = [
"glslang/GenericCodeGen/CodeGen.cpp",
"glslang/GenericCodeGen/Link.cpp",
],
deps = [
":include",
],
)

cc_library(
name = "glslang",
srcs = [
"glslang/CInterface/glslang_c_interface.cpp",
"StandAlone/DirStackFileIncluder.h",
],
deps = [
":machine_independent",
":os_dependent",
],
)

genrule(
name = "glsl_intrinsic_header_h",
srcs = ["glslang/ExtensionHeaders/GL_EXT_shader_realtime_clock.glsl"],
outs = ["glslang/glsl_intrinsic_header.h"],
cmd = "python3 $(location :gen_extension_headers_py) " +
"-i $$(dirname $(location :glslang/ExtensionHeaders/GL_EXT_shader_realtime_clock.glsl)) " +
"-o $(location glslang/glsl_intrinsic_header.h)",
tools = [":gen_extension_headers_py"],
)

cc_binary(
name = "glslang_validator",
srcs = [
":glsl_intrinsic_header_h",
"StandAlone/StandAlone.cpp",
"StandAlone/Worklist.h",
],
copts = [
"-DENABLE_OPT=0",
"-DENABLE_SPIRV=1",
],
deps = [
":generic_code_gen",
":glslang",
":machine_independent",
":os_dependent",
":resource_limits",
":spirv",
],
)

cc_library(
name = "include",
hdrs = [
"glslang/Include/BaseTypes.h",
"glslang/Include/Common.h",
"glslang/Include/ConstantUnion.h",
"glslang/Include/InfoSink.h",
"glslang/Include/InitializeGlobals.h",
"glslang/Include/PoolAlloc.h",
"glslang/Include/ResourceLimits.h",
"glslang/Include/ShHandle.h",
"glslang/Include/SpirvIntrinsics.h",
"glslang/Include/Types.h",
"glslang/Include/arrays.h",
"glslang/Include/glslang_c_interface.h",
"glslang/Include/glslang_c_shader_types.h",
"glslang/Include/intermediate.h",
"glslang/Include/visibility.h",
"glslang/MachineIndependent/Versions.h",
"glslang/Public/ResourceLimits.h",
"glslang/Public/ShaderLang.h",
"glslang/Public/resource_limits_c.h",
],
)

cc_library(
name = "machine_independent",
srcs = [
":build_info_h",
"glslang/HLSL/hlslAttributes.cpp",
"glslang/HLSL/hlslAttributes.h",
"glslang/HLSL/hlslGrammar.cpp",
"glslang/HLSL/hlslGrammar.h",
"glslang/HLSL/hlslOpMap.cpp",
"glslang/HLSL/hlslOpMap.h",
"glslang/HLSL/hlslParseHelper.cpp",
"glslang/HLSL/hlslParseHelper.h",
"glslang/HLSL/hlslParseables.cpp",
"glslang/HLSL/hlslParseables.h",
"glslang/HLSL/hlslScanContext.cpp",
"glslang/HLSL/hlslScanContext.h",
"glslang/HLSL/hlslTokenStream.cpp",
"glslang/HLSL/hlslTokenStream.h",
"glslang/HLSL/hlslTokens.h",
"glslang/MachineIndependent/Constant.cpp",
"glslang/MachineIndependent/InfoSink.cpp",
"glslang/MachineIndependent/Initialize.cpp",
"glslang/MachineIndependent/Initialize.h",
"glslang/MachineIndependent/IntermTraverse.cpp",
"glslang/MachineIndependent/Intermediate.cpp",
"glslang/MachineIndependent/LiveTraverser.h",
"glslang/MachineIndependent/ParseContextBase.cpp",
"glslang/MachineIndependent/ParseHelper.cpp",
"glslang/MachineIndependent/ParseHelper.h",
"glslang/MachineIndependent/PoolAlloc.cpp",
"glslang/MachineIndependent/RemoveTree.cpp",
"glslang/MachineIndependent/RemoveTree.h",
"glslang/MachineIndependent/Scan.cpp",
"glslang/MachineIndependent/Scan.h",
"glslang/MachineIndependent/ScanContext.h",
"glslang/MachineIndependent/ShaderLang.cpp",
"glslang/MachineIndependent/SpirvIntrinsics.cpp",
"glslang/MachineIndependent/SymbolTable.cpp",
"glslang/MachineIndependent/SymbolTable.h",
"glslang/MachineIndependent/Versions.cpp",
"glslang/MachineIndependent/attribute.cpp",
"glslang/MachineIndependent/attribute.h",
"glslang/MachineIndependent/gl_types.h",
"glslang/MachineIndependent/glslang_tab.cpp",
"glslang/MachineIndependent/glslang_tab.cpp.h",
"glslang/MachineIndependent/intermOut.cpp",
"glslang/MachineIndependent/iomapper.cpp",
"glslang/MachineIndependent/iomapper.h",
"glslang/MachineIndependent/limits.cpp",
"glslang/MachineIndependent/linkValidate.cpp",
"glslang/MachineIndependent/localintermediate.h",
"glslang/MachineIndependent/parseConst.cpp",
"glslang/MachineIndependent/parseVersions.h",
"glslang/MachineIndependent/preprocessor/Pp.cpp",
"glslang/MachineIndependent/preprocessor/PpAtom.cpp",
"glslang/MachineIndependent/preprocessor/PpContext.cpp",
"glslang/MachineIndependent/preprocessor/PpContext.h",
"glslang/MachineIndependent/preprocessor/PpScanner.cpp",
"glslang/MachineIndependent/preprocessor/PpTokens.cpp",
"glslang/MachineIndependent/preprocessor/PpTokens.h",
"glslang/MachineIndependent/propagateNoContraction.cpp",
"glslang/MachineIndependent/propagateNoContraction.h",
"glslang/MachineIndependent/reflection.cpp",
"glslang/MachineIndependent/reflection.h",
"glslang/MachineIndependent/span.h",
],
copts = COPTS,
deps = [
":generic_code_gen",
":include",
":os_dependent",
],
)

cc_library(
name = "os_dependent",
srcs = ["glslang/OSDependent/Unix/ossource.cpp"],
hdrs = ["glslang/OSDependent/osinclude.h"],
deps = [
":include",
],
)

cc_library(
name = "resource_limits",
srcs = ["glslang/ResourceLimits/ResourceLimits.cpp"],
hdrs = ["glslang/Public/ResourceLimits.h"],
deps = [
":include",
],
)

cc_library(
name = "spirv",
srcs = [
"SPIRV/CInterface/spirv_c_interface.cpp",
"SPIRV/GLSL.ext.AMD.h",
"SPIRV/GLSL.ext.ARM.h",
"SPIRV/GLSL.ext.EXT.h",
"SPIRV/GLSL.ext.KHR.h",
"SPIRV/GLSL.ext.NV.h",
"SPIRV/GLSL.ext.QCOM.h",
"SPIRV/GLSL.std.450.h",
"SPIRV/GlslangToSpv.cpp",
"SPIRV/GlslangToSpv.h",
"SPIRV/InReadableOrder.cpp",
"SPIRV/Logger.cpp",
"SPIRV/Logger.h",
"SPIRV/NonSemanticDebugPrintf.h",
"SPIRV/NonSemanticShaderDebugInfo100.h",
"SPIRV/SpvBuilder.cpp",
"SPIRV/SpvBuilder.h",
"SPIRV/SpvPostProcess.cpp",
"SPIRV/SpvTools.cpp",
"SPIRV/SpvTools.h",
"SPIRV/bitutils.h",
"SPIRV/disassemble.cpp",
"SPIRV/disassemble.h",
"SPIRV/doc.cpp",
"SPIRV/doc.h",
"SPIRV/hex_float.h",
"SPIRV/spvIR.h",
"SPIRV/spvUtil.h",
],
textual_hdrs = [
"SPIRV/spirv.hpp11",
],
deps = [
":include",
":machine_independent",
],
)
8 changes: 8 additions & 0 deletions base/cvd/build_external/glslang/glslang.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "glslang",
build_file = "@//build_external/glslang:BUILD.glslang.bazel",
commit = "14422bdc57fb93221192a0c542dde144980dfb69",
remote = "https://android.googlesource.com/platform/external/deqp-deps/glslang",
)
Loading
Loading