Skip to content

Commit

Permalink
Change for Android, add args.gn, setup build
Browse files Browse the repository at this point in the history
  • Loading branch information
khanhduytran0 committed Jul 31, 2023
1 parent 6851f62 commit 5b306a9
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 12 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
pull_request:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
strategy:
matrix:
arch: [ "arm64", "arm", "x64" ] # x86
fail-fast: false

name: "Build for Android ${{matrix.arch}}"
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Get ANGLE
uses: actions/checkout@v2
with:
path: 'angle'

- name: Build ANGLE
shell: bash
run: |
git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
export PATH=`pwd`/depot_tools:$PATH
echo $PATH
cd angle
vpython scripts/bootstrap.py
gclient sync
gn gen out/Android-${{matrix.arch}}
autoninja -C out/Android-${{matrix.arch}}
- name: Upload ANGLE
uses: actions/upload-artifact@v2
with:
name: angle-libs-${{matrix.arch}}
path: |
angle/out/Android-${{matrix.arch}}/libGLESv2_angle.so
angle/out/Android-${{matrix.arch}}/libEGL_angle.so
22 changes: 11 additions & 11 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,10 @@ deps = {
'dep_type': 'cipd',
},

'third_party/catapult': {
'url': '{chromium_git}/catapult.git@{catapult_revision}',
'condition': 'not build_with_chromium',
},
#'third_party/catapult': {
# 'url': '{chromium_git}/catapult.git@{catapult_revision}',
# 'condition': 'not build_with_chromium',
#},

# Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results.
'third_party/cherry': {
Expand Down Expand Up @@ -612,10 +612,10 @@ deps = {
'condition': 'checkout_android and not build_with_chromium',
},

'third_party/SwiftShader': {
'url': '{swiftshader_git}/SwiftShader@9fbca2df22a8e71e3116a576e26cf9b3d7915c08',
'condition': 'not build_with_chromium',
},
#'third_party/SwiftShader': {
# 'url': '{swiftshader_git}/SwiftShader@9fbca2df22a8e71e3116a576e26cf9b3d7915c08',
# 'condition': 'not build_with_chromium',
#},

'third_party/turbine': {
'packages': [
Expand All @@ -628,9 +628,9 @@ deps = {
'dep_type': 'cipd',
},

'third_party/VK-GL-CTS/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/VK-GL-CTS@{vk_gl_cts_revision}',
},
#'third_party/VK-GL-CTS/src': {
# 'url': '{chromium_git}/external/github.com/KhronosGroup/VK-GL-CTS@{vk_gl_cts_revision}',
#},

'third_party/vulkan-deps': {
'url': '{chromium_git}/vulkan-deps@6f1c3384ecb605efb9bc22b85d3dca0d0f552020',
Expand Down
2 changes: 1 addition & 1 deletion src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,7 @@ egl::Config GenerateDefaultConfig(DisplayVk *display,
config.bindToTextureRGBA = colorFormat.format == GL_RGBA || colorFormat.format == GL_BGRA_EXT;
config.colorBufferType = EGL_RGB_BUFFER;
config.configCaveat = GetConfigCaveat(colorFormat.internalFormat);
config.conformant = es1Support | es2Support | es3Support;
config.conformant = es1Support | es2Support | es3Support | desktopSupport;
config.depthSize = depthStencilFormat.depthBits;
config.stencilSize = depthStencilFormat.stencilBits;
config.level = 0;
Expand Down

0 comments on commit 5b306a9

Please sign in to comment.