Skip to content

Commit 38f2945

Browse files
hevrardhevrard
authored
Add new vulkan worker (#102)
* Add new vulkan worker, without its dependencies * Add new vulkan worker dependencies as submodules * License headers. * Add gitignore * Add shader samples * Update third party location in CMakeLists.txt * Tweak CMake file and fix warnings.
1 parent c1afc42 commit 38f2945

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3368
-1
lines changed

‎.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "third_party/cJSON"]
2+
path = third_party/cJSON
3+
url = https://github.com/DaveGamble/cJSON
4+
[submodule "third_party/lodepng"]
5+
path = third_party/lodepng
6+
url = https://github.com/lvandeve/lodepng
7+
[submodule "third_party/gflags"]
8+
path = third_party/gflags
9+
url = https://github.com/gflags/gflags

‎build/travis/check_headers.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,12 @@ def exclude_filename(f: str):
7878
f.endswith(".md") or \
7979
f.endswith(".json") or \
8080
f.endswith(".primitives") or \
81+
f.endswith(".jar") or \
82+
f.endswith(".spv") or \
8183
f in [
8284
".editorconfig",
85+
".gitmodules",
86+
"settings.gradle",
8387
".gitignore",
8488
".gitattributes",
8589
"AUTHORS",
@@ -91,6 +95,7 @@ def exclude_filename(f: str):
9195
"gradlew",
9296
"gradlew.bat",
9397
"dependency-reduced-pom.xml",
98+
"gradle-wrapper.properties",
9499

95100

96101
]
@@ -114,7 +119,12 @@ def go():
114119
try:
115120
with io.open(file, 'r') as fin:
116121
contents = fin.read()
117-
if contents.find("Copyright 2018 The GraphicsFuzz Project Authors") == -1:
122+
123+
# File must contain Copyright header anywhere
124+
# or "generated" on the first line.
125+
126+
if contents.find("Copyright 2018 The GraphicsFuzz Project Authors") == -1 and \
127+
contents.split('\n')[0].find("generated") == -1:
118128
fail = True
119129
print("Missing license header " + file)
120130
except:

‎third_party/cJSON

Submodule cJSON added at 2c914c0

‎third_party/gflags

Submodule gflags added at 498cfa8

‎third_party/lodepng

Submodule lodepng added at 425a57e

‎vulkan-worker/.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
build/
2+
build_*/
3+
local.properties
4+
gradle.properties
5+
.externalNativeBuild/
6+
.gradle/
7+
.idea/
8+
*.iml
9+
*.png
10+
*.spv
11+
GPATH
12+
GTAGS
13+
GRTAGS
14+
TAGS

‎vulkan-worker/CMakeLists.txt

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Copyright 2018 The GraphicsFuzz Project Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
cmake_minimum_required(VERSION 3.4.1)
16+
17+
project(vkworker)
18+
19+
set(CMAKE_CXX_STANDARD 11)
20+
21+
set(THIRD_PARTY ${CMAKE_SOURCE_DIR}/../third_party)
22+
23+
find_package(glfw3 3.2 REQUIRED)
24+
add_subdirectory(${THIRD_PARTY}/gflags gflags EXCLUDE_FROM_ALL)
25+
26+
add_executable(vkworker
27+
src/linux/main.cc
28+
src/linux/platform.cc
29+
src/common/vulkan_worker.cc
30+
src/common/vkcheck.cc
31+
${THIRD_PARTY}/cJSON/cJSON.c
32+
${THIRD_PARTY}/lodepng/lodepng.cpp
33+
)
34+
35+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
36+
target_compile_options(vkworker PRIVATE "-Werror" "-Wall" "-Wextra")
37+
endif()
38+
39+
target_include_directories(vkworker BEFORE PRIVATE
40+
${CMAKE_SOURCE_DIR}/src/common
41+
${CMAKE_SOURCE_DIR}/src/linux
42+
${THIRD_PARTY}/cJSON
43+
${THIRD_PARTY}/lodepng
44+
$ENV{VULKAN_SDK}/include
45+
)
46+
47+
link_directories(vkworker BEFORE $ENV{VULKAN_SDK}/lib)
48+
target_link_libraries(vkworker vulkan glfw gflags)
49+
50+
install(TARGETS vkworker DESTINATION bin)

‎vulkan-worker/README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# GraphicsFuzz vulkan-worker
2+
3+
Vulkan worker for the GraphicsFuzz project. Contents of this repo will
4+
eventually be merged into the google/graphicsfuzz GitHub repo.
5+
6+
## Source code layout
7+
8+
Android entry point: `src/android/src/main/cpp/main.cc`
9+
10+
Linux entry point: `src/linux/main.cc`
11+
12+
All platform-agnostic vulkan things are in: `src/common/vulkan_worker.cc`
13+
14+
The few platform-specifics are in:
15+
- Android: `src/android/src/main/cpp/platform.cc`
16+
- Linux: `src/linux/platform.cc`
17+
18+
## How to build
19+
20+
For Android, use Android Studio to open the `build.gradle` file at the root of
21+
this repo. On the command line, from root directory: `./gradlew assembleDebug`
22+
generates the apk in `./src/android/build/outputs/apk/debug/android-debug.apk`.
23+
24+
For Linux, use cmake with the top-level CMakeLists.txt
25+
26+
## Third party sources
27+
28+
We are relying on, and grateful to, the following open-source projects:
29+
- cJSON: https://github.com/DaveGamble/cJSON
30+
- lodepng: https://github.com/lvandeve/lodepng
31+
- gflags: https://github.com/gflags/gflags

‎vulkan-worker/build.gradle

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2018 The GraphicsFuzz Project Authors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
16+
17+
buildscript {
18+
repositories {
19+
google()
20+
jcenter()
21+
}
22+
dependencies {
23+
classpath 'com.android.tools.build:gradle:3.2.0'
24+
// NOTE: Do not place your application dependencies here; they belong
25+
// in the individual module build.gradle files
26+
}
27+
}
28+
29+
allprojects {
30+
repositories {
31+
google()
32+
jcenter()
33+
}
34+
}
35+
36+
task clean(type: Delete) {
37+
delete rootProject.buildDir
38+
}

‎vulkan-worker/gradle/wrapper/gradle-wrapper.jar

52.1 KB
Binary file not shown.

‎vulkan-worker/gradle/wrapper/gradle-wrapper.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Tue Oct 02 18:08:42 BST 2018
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎vulkan-worker/gradlew

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn ( ) {
37+
echo "$*"
38+
}
39+
40+
die ( ) {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158+
function splitJvmOpts() {
159+
JVM_OPTS=("$@")
160+
}
161+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163+
164+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)