Skip to content
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

Migrate swiftshader,angle, ffavc to local code repository #42

Merged
merged 1 commit into from
Jan 19, 2022
Merged

Migrate swiftshader,angle, ffavc to local code repository #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ local.properties

/third_party
/out
/vendor
cmake-build-debug
cmake-build-release
node_modules
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ if (PAG_USE_LIBAVC)
list(APPEND PAG_INCLUDES third_party/libavc/common third_party/libavc/decoder)
endif ()

list(APPEND SWIFTSHADER_INCLUDE_DIRS third_party/swiftshader/include)
file(GLOB SWIFTSHADER_LIBRARIES third_party/out/swiftshader/${LIBRARY_ENTRY}/*${CMAKE_SHARED_LIBRARY_SUFFIX})
list(APPEND SWIFTSHADER_INCLUDE_DIRS vendor/swiftshader/include)
file(GLOB SWIFTSHADER_LIBRARIES vendor/swiftshader/${LIBRARY_ENTRY}/*${CMAKE_SHARED_LIBRARY_SUFFIX})

if (PAG_USE_QT)
# need to set the CMAKE_PREFIX_PATH to local QT installation path, for example :
Expand Down Expand Up @@ -376,7 +376,7 @@ elseif (WIN32)
add_definitions(-DNOMINMAX -D_USE_MATH_DEFINES)

if (USE_NATIVE_PLATFORM)
list(APPEND PAG_PLATFORM_INCLUDES vendor/angle/${PLATFORM}/include)
list(APPEND PAG_PLATFORM_INCLUDES vendor/angle/include)
file(GLOB_RECURSE PAG_PLATFORM_FILES src/platform/win/*.*)
file(GLOB GL_PLATFORM_FILES tgfx/src/gpu/opengl/egl/*.*)
list(APPEND PAG_PLATFORM_FILES ${GL_PLATFORM_FILES})
Expand Down Expand Up @@ -457,7 +457,7 @@ if (PAG_BUILD_TESTS)

file(GLOB FFAVC_LIB vendor/ffavc/${LIBRARY_ENTRY}/*${CMAKE_SHARED_LIBRARY_SUFFIX})
list(APPEND TEST_PLATFORM_LIBS ${FFAVC_LIB})
list(APPEND TEST_INCLUDES vendor/ffavc/${INCLUDE_ENTRY})
list(APPEND TEST_INCLUDES vendor/ffavc/include)

add_executable(PAGUnitTest ${Test_VENDOR_TARGET} ${PAG_TEST_FILES})
target_include_directories(PAGUnitTest PUBLIC ${TEST_INCLUDES})
Expand Down
26 changes: 0 additions & 26 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,6 @@
}
]
},
"files": {
"mac": [
{
"url": "${PAG_GROUP}/swiftshader/releases/download/opengl/mac.zip",
"dir": "third_party/out/swiftshader",
"unzip": true
},
{
"url": "${PAG_GROUP}/ffavc/releases/download/0.9.0/ffavc_0.9.0_release_mac_x64.zip",
"dir": "vendor/ffavc",
"unzip": true
}
],
"win": [
{
"url": "${PAG_GROUP}/swiftshader/releases/download/opengl/win.zip",
"dir": "third_party/out/swiftshader",
"unzip": true
},
{
"url": "${PAG_GROUP}/angle/releases/download/chromium_4763/win.zip",
"dir": "vendor/angle",
"unzip": true
}
]
},
"actions": {
"common": [
{
Expand Down
3 changes: 3 additions & 0 deletions vendor/angle/include/CL/.clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@


DisableFormat: true
Loading