diff --git a/examples/agdk-winit-wgpu/.gitignore b/examples/agdk-winit-wgpu/.gitignore new file mode 100644 index 0000000..2e068df --- /dev/null +++ b/examples/agdk-winit-wgpu/.gitignore @@ -0,0 +1,22 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +*.so + + +# Added by cargo + +/target +Cargo.lock diff --git a/examples/agdk-winit-wgpu/.idea/.gitignore b/examples/agdk-winit-wgpu/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/examples/agdk-winit-wgpu/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/examples/agdk-winit-wgpu/.idea/compiler.xml b/examples/agdk-winit-wgpu/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/examples/agdk-winit-wgpu/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/.idea/gradle.xml b/examples/agdk-winit-wgpu/.idea/gradle.xml new file mode 100644 index 0000000..526b4c2 --- /dev/null +++ b/examples/agdk-winit-wgpu/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/.idea/misc.xml b/examples/agdk-winit-wgpu/.idea/misc.xml new file mode 100644 index 0000000..b2b0d06 --- /dev/null +++ b/examples/agdk-winit-wgpu/.idea/misc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/.idea/vcs.xml b/examples/agdk-winit-wgpu/.idea/vcs.xml new file mode 100644 index 0000000..fdf1fc8 --- /dev/null +++ b/examples/agdk-winit-wgpu/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/Cargo.toml b/examples/agdk-winit-wgpu/Cargo.toml new file mode 100644 index 0000000..04d661e --- /dev/null +++ b/examples/agdk-winit-wgpu/Cargo.toml @@ -0,0 +1,33 @@ +[package] +name = "agdk-winit-wgpu" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +log = "0.4" +winit = { git = "https://github.com/rib/winit", branch = "agdk-game-activity" } +#winit = { path="../../../winit" } +wgpu = "0.12.0" +pollster = "0.2" + +[target.'cfg(not(target_os = "android"))'.dependencies] +simple_logger = "2" + +[target.'cfg(target_os = "android")'.dependencies] +android_logger = "0.11.0" +game-activity = { path="../../game-activity" } + +[features] +default = [] +desktop = [] + +[lib] +name="main" +crate_type=["cdylib"] + +[[bin]] +path="src/lib.rs" +name="test-winit-wgpu" +required-features = [ "desktop" ] \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/README.md b/examples/agdk-winit-wgpu/README.md new file mode 100644 index 0000000..fc434fe --- /dev/null +++ b/examples/agdk-winit-wgpu/README.md @@ -0,0 +1,30 @@ +This tests using the game_activity crate with winit and wgpu. + +This is based on a re-worked winit backend here: +https://github.com/rib/winit/tree/agdk-game-activity + +Although it would have been possible to handle the suspend/resume +lifecycle events with a simpler approach of destroying and +recreating all graphics state, this tries to represent how +lifecycle events could be handled in more complex applications, +such as within Bevy. + +Considering that lifecycle events aren't supported consistently +on desktop platforms this test also aims to build and run +on desktop - for the sake of testing how more complex +applications (that need to be portable) can work. (enable +"desktop" feature to build binary) + +``` +rustup target add aarch64-linux-android + +cargo install cargo-ndk + +export ANDROID_NDK_HOME="path/to/ndk" +cargo ndk -t arm64-v8a -o app/src/main/jniLibs/ build + +export ANDROID_HOME="path/to/sdk" +./gradlew build +./gradlew installDebug +adb shell am start -n co.realfit.agdkwinitwgpu/.MainActivity +``` \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/.gitignore b/examples/agdk-winit-wgpu/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/examples/agdk-winit-wgpu/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/build.gradle b/examples/agdk-winit-wgpu/app/build.gradle new file mode 100644 index 0000000..c91fcab --- /dev/null +++ b/examples/agdk-winit-wgpu/app/build.gradle @@ -0,0 +1,61 @@ +plugins { + id 'com.android.application' +} + +android { + compileSdk 31 + + defaultConfig { + applicationId "co.realfit.agdkwinitwgpu" + minSdk 28 + targetSdk 31 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled false + //packagingOptions { + // doNotStrip '**/*.so' + //} + //debuggable true + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + // To use the Android Frame Pacing library + //implementation "androidx.games:games-frame-pacing:1.9.1" + + // To use the Android Performance Tuner + //implementation "androidx.games:games-performance-tuner:1.5.0" + + // To use the Games Activity library + implementation "androidx.games:games-activity:1.1.0" + + // To use the Games Controller Library + //implementation "androidx.games:games-controller:1.1.0" + + // To use the Games Text Input Library + //implementation "androidx.games:games-text-input:1.1.0" +} + diff --git a/examples/agdk-winit-wgpu/app/proguard-rules.pro b/examples/agdk-winit-wgpu/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/AndroidManifest.xml b/examples/agdk-winit-wgpu/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..42ef1ea --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/java/co/realfit/agdkwinitwgpu/MainActivity.java b/examples/agdk-winit-wgpu/app/src/main/java/co/realfit/agdkwinitwgpu/MainActivity.java new file mode 100644 index 0000000..d8943d0 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/java/co/realfit/agdkwinitwgpu/MainActivity.java @@ -0,0 +1,70 @@ +package co.realfit.agdkwinitwgpu; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.WindowCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.core.view.WindowInsetsControllerCompat; + +import com.google.androidgamesdk.GameActivity; + +import android.os.Bundle; +import android.content.pm.PackageManager; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; + +public class MainActivity extends GameActivity { + + static { + // Load the STL first to workaround issues on old Android versions: + // "if your app targets a version of Android earlier than Android 4.3 + // (Android API level 18), + // and you use libc++_shared.so, you must load the shared library before any other + // library that depends on it." + // See https://developer.android.com/ndk/guides/cpp-support#shared_runtimes + //System.loadLibrary("c++_shared"); + + // Load the native library. + // The name "android-game" depends on your CMake configuration, must be + // consistent here and inside AndroidManifect.xml + System.loadLibrary("main"); + } + + private void hideSystemUI() { + // This will put the game behind any cutouts and waterfalls on devices which have + // them, so the corresponding insets will be non-zero. + if (VERSION.SDK_INT >= VERSION_CODES.P) { + getWindow().getAttributes().layoutInDisplayCutoutMode + = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; + } + // From API 30 onwards, this is the recommended way to hide the system UI, rather than + // using View.setSystemUiVisibility. + View decorView = getWindow().getDecorView(); + WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(getWindow(), + decorView); + controller.hide(WindowInsetsCompat.Type.systemBars()); + controller.hide(WindowInsetsCompat.Type.displayCutout()); + controller.setSystemBarsBehavior( + WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + // When true, the app will fit inside any system UI windows. + // When false, we render behind any system UI windows. + WindowCompat.setDecorFitsSystemWindows(getWindow(), false); + hideSystemUI(); + // You can set IME fields here or in native code using GameActivity_setImeEditorInfoFields. + // We set the fields in native_engine.cpp. + // super.setImeEditorInfoFields(InputType.TYPE_CLASS_TEXT, + // IME_ACTION_NONE, IME_FLAG_NO_FULLSCREEN ); + super.onCreate(savedInstanceState); + } + + public boolean isGooglePlayGames() { + PackageManager pm = getPackageManager(); + return pm.hasSystemFeature("com.google.android.play.feature.HPE_EXPERIENCE"); + } +} \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/agdk-winit-wgpu/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/drawable/ic_launcher_background.xml b/examples/agdk-winit-wgpu/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/agdk-winit-wgpu/app/src/main/res/layout/activity_main.xml b/examples/agdk-winit-wgpu/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..4fc2444 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/examples/agdk-winit-wgpu/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/examples/agdk-winit-wgpu/app/src/main/res/values-night/themes.xml b/examples/agdk-winit-wgpu/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..81c6873 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/values/colors.xml b/examples/agdk-winit-wgpu/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/app/src/main/res/values/themes.xml b/examples/agdk-winit-wgpu/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..83a6c4a --- /dev/null +++ b/examples/agdk-winit-wgpu/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/build.gradle b/examples/agdk-winit-wgpu/build.gradle new file mode 100644 index 0000000..dfdcb16 --- /dev/null +++ b/examples/agdk-winit-wgpu/build.gradle @@ -0,0 +1,10 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.1.2' apply false + id 'com.android.library' version '7.1.2' apply false +} + +task clean(type: Delete) { + delete rootProject.buildDir +} + diff --git a/examples/agdk-winit-wgpu/gradle.properties b/examples/agdk-winit-wgpu/gradle.properties new file mode 100644 index 0000000..dab7c28 --- /dev/null +++ b/examples/agdk-winit-wgpu/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.jar b/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.properties b/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b53fece --- /dev/null +++ b/examples/agdk-winit-wgpu/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 02 15:39:12 BST 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/examples/agdk-winit-wgpu/gradlew b/examples/agdk-winit-wgpu/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/examples/agdk-winit-wgpu/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/examples/agdk-winit-wgpu/gradlew.bat b/examples/agdk-winit-wgpu/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/examples/agdk-winit-wgpu/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/agdk-winit-wgpu/settings.gradle b/examples/agdk-winit-wgpu/settings.gradle new file mode 100644 index 0000000..f60920c --- /dev/null +++ b/examples/agdk-winit-wgpu/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +include ':app' diff --git a/examples/agdk-winit-wgpu/src/lib.rs b/examples/agdk-winit-wgpu/src/lib.rs new file mode 100644 index 0000000..2d9dcd7 --- /dev/null +++ b/examples/agdk-winit-wgpu/src/lib.rs @@ -0,0 +1,329 @@ + +use log::Level; +use log::trace; +use wgpu::TextureFormat; +use wgpu::{Instance, Adapter, Device, ShaderModule, PipelineLayout, RenderPipeline, Queue}; +use winit::event_loop::EventLoopWindowTarget; + +use std::ops::Deref; +use std::borrow::Cow; +use std::sync::{Arc, RwLock}; +use winit::{ + event::{Event, WindowEvent}, + event_loop::{ControlFlow, EventLoop}, +}; + +struct RenderState { + device: Device, + queue: Queue, + _shader: ShaderModule, + target_format: TextureFormat, + _pipeline_layout: PipelineLayout, + render_pipeline: RenderPipeline, +} + +struct SurfaceState { + window: winit::window::Window, + surface: wgpu::Surface +} + +struct AppInner { + instance: Instance, + adapter: Option, + surface_state: Option, + render_state: Option, +} + +struct App { + inner: Arc> +} + +impl App { + fn new(instance: Instance) -> Self { + Self { + inner: Arc::new(RwLock::new(AppInner { + instance, + adapter: None, + surface_state: None, + render_state: None, + })) + } + } +} +impl Deref for App { + type Target = Arc>; + fn deref(&self) -> &Self::Target { + &self.inner + } +} + + +async fn init_render_state(adapter: &Adapter, target_format: TextureFormat) -> RenderState { + trace!("Initializing render state"); + + trace!("WGPU: requesting device"); + // Create the logical device and command queue + let (device, queue) = adapter + .request_device( + &wgpu::DeviceDescriptor { + label: None, + features: wgpu::Features::empty(), + // Make sure we use the texture resolution limits from the adapter, so we can support images the size of the swapchain. + limits: wgpu::Limits::downlevel_webgl2_defaults() + .using_resolution(adapter.limits()), + }, + None, + ) + .await + .expect("Failed to create device"); + + trace!("WGPU: loading shader"); + // Load the shaders from disk + let shader = device.create_shader_module(&wgpu::ShaderModuleDescriptor { + label: None, + source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))), + }); + + trace!("WGPU: creating pipeline layout"); + let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { + label: None, + bind_group_layouts: &[], + push_constant_ranges: &[], + }); + + trace!("WGPU: creating render pipeline"); + let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { + label: None, + layout: Some(&pipeline_layout), + vertex: wgpu::VertexState { + module: &shader, + entry_point: "vs_main", + buffers: &[], + }, + fragment: Some(wgpu::FragmentState { + module: &shader, + entry_point: "fs_main", + targets: &[target_format.into()], + }), + primitive: wgpu::PrimitiveState::default(), + depth_stencil: None, + multisample: wgpu::MultisampleState::default(), + multiview: None, + }); + + RenderState { + device, + queue, + _shader: shader, + target_format, + _pipeline_layout: pipeline_layout, + render_pipeline, + } +} + +fn configure_surface_swapchain(render_state: &RenderState, surface_state: &SurfaceState) { + let swapchain_format = render_state.target_format; + let size = surface_state.window.inner_size(); + + let mut config = wgpu::SurfaceConfiguration { + usage: wgpu::TextureUsages::RENDER_ATTACHMENT, + format: swapchain_format, + width: size.width, + height: size.height, + present_mode: wgpu::PresentMode::Mailbox, + //present_mode: wgpu::PresentMode::Fifo, + }; + + trace!("WGPU: Configuring surface swapchain: format = {swapchain_format:?}, size = {size:?}"); + surface_state.surface.configure(&render_state.device, &config); +} + +// We want to defer the initialization of our render state until +// we have a surface so we can take its format into account. +// +// After we've initialized our render state once though we +// expect all future surfaces will have the same format and we +// so this stat will remain valid. +async fn ensure_render_state_for_surface(app: &App, new_surface_state: &SurfaceState) { + let mut app_guard = app.inner.write().unwrap(); + + if app_guard.adapter.is_none() { + trace!("WGPU: requesting a suitable adapter (compatible with our surface)"); + let adapter = app_guard.instance + .request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::default(), + force_fallback_adapter: false, + // Request an adapter which can render to our surface + compatible_surface: Some(&new_surface_state.surface), + }) + .await + .expect("Failed to find an appropriate adapter"); + + app_guard.adapter = Some(adapter); + } + let adapter = app_guard.adapter.as_ref().unwrap(); + + if app_guard.render_state.is_none() { + trace!("WGPU: finding preferred swapchain format"); + let swapchain_format = new_surface_state.surface.get_preferred_format(&adapter).unwrap(); + + let rs = init_render_state(adapter, swapchain_format).await; + app_guard.render_state = Some(rs); + } +} + +fn create_surface(app: &App, event_loop: &EventLoopWindowTarget) -> SurfaceState { + let window = winit::window::Window::new(&event_loop).unwrap(); + + trace!("WGPU: creating surface for native window"); + let guard = app.inner.read().unwrap(); + let surface = unsafe { guard.instance.create_surface(&window) }; + + SurfaceState { + window, + surface + } +} + +fn resume(app: &App, event_loop: &EventLoopWindowTarget) { + trace!("Resumed, creating render state..."); + + let new_surface = create_surface(&app, event_loop); + + pollster::block_on(ensure_render_state_for_surface(&app, &new_surface)); + + app.write().unwrap().surface_state = Some(new_surface); + + let guard = app.read().unwrap(); + let render_state = guard.render_state.as_ref().unwrap(); + let surface_state = guard.surface_state.as_ref().unwrap(); + configure_surface_swapchain(render_state, surface_state); + + trace!("Making Redraw Request"); + surface_state.window.request_redraw(); +} + + +fn run(event_loop: EventLoop<()>, app: App) { + + //let mut running = false; + + trace!("Running mainloop..."); + + event_loop.run(move |event, event_loop, control_flow| { + trace!("Received Winit event: {event:?}"); + + *control_flow = ControlFlow::Wait; + match event { + Event::NewEvents(winit::event::StartCause::Init) => { + // Note: that because Winit doesn't currently support lifecycle events consistently + // across platforms then we effectively issue a fake 'resume' on non-android + // platforms... + #[cfg(not(target_os="android"))] + resume(&app, event_loop) + } + Event::Resumed => { + resume(&app, event_loop); + } + Event::Suspended => { + trace!("Suspended, dropping render state..."); + let mut guard = app.write().unwrap(); + //guard.running = false; + guard.render_state = None; + }, + Event::WindowEvent { + event: WindowEvent::Resized(_size), + .. + } => { + let guard = app.read().unwrap(); + if let Some(ref surface_state) = guard.surface_state { + if let Some(ref render_state) = guard.render_state { + configure_surface_swapchain(render_state, surface_state); + + // Winit: doesn't currently implicitly request a redraw + // for a resize which may be required on some platforms... + surface_state.window.request_redraw(); + } + } + } + Event::RedrawRequested(_) => { + trace!("Handling Redraw Request"); + + let guard = app.read().unwrap(); + if let Some(ref surface_state) = guard.surface_state { + if let Some(ref rs) = guard.render_state { + let frame = surface_state.surface + .get_current_texture() + .expect("Failed to acquire next swap chain texture"); + let view = frame + .texture + .create_view(&wgpu::TextureViewDescriptor::default()); + let mut encoder = + rs.device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None }); + { + let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: None, + color_attachments: &[wgpu::RenderPassColorAttachment { + view: &view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(wgpu::Color::GREEN), + store: true, + }, + }], + depth_stencil_attachment: None, + }); + rpass.set_pipeline(&rs.render_pipeline); + rpass.draw(0..3, 0..1); + } + + rs.queue.submit(Some(encoder.finish())); + frame.present(); + surface_state.window.request_redraw(); + } + } + } + Event::WindowEvent { + event: WindowEvent::CloseRequested, + .. + } => *control_flow = ControlFlow::Exit, + _ => {} + } + }); +} + + +fn _main() { + let event_loop = EventLoop::new(); + + // We can decide on our graphics API / backend up-front and that + // doesn't need to be re-considered later + let instance = wgpu::Instance::new(wgpu::Backends::all()); + //let instance = wgpu::Instance::new(wgpu::Backends::VULKAN); + //let instance = wgpu::Instance::new(wgpu::Backends::GL); + + let app = App::new(instance); + + run(event_loop, app); +} + + +#[cfg(target_os="android")] +#[no_mangle] +extern "C" fn android_main() { + android_logger::init_once( + android_logger::Config::default().with_min_level(Level::Trace) + ); + + _main(); +} +// Stop rust-analyzer from complaining that this file doesn't have a main() function... +#[cfg(target_os="android")] +fn main() {} + +#[cfg(not(target_os="android"))] +fn main() { + simple_logger::SimpleLogger::new().init().unwrap(); + + _main(); +} \ No newline at end of file diff --git a/examples/agdk-winit-wgpu/src/shader.wgsl b/examples/agdk-winit-wgpu/src/shader.wgsl new file mode 100644 index 0000000..4903d72 --- /dev/null +++ b/examples/agdk-winit-wgpu/src/shader.wgsl @@ -0,0 +1,11 @@ +[[stage(vertex)]] +fn vs_main([[builtin(vertex_index)]] in_vertex_index: u32) -> [[builtin(position)]] vec4 { + let x = f32(i32(in_vertex_index) - 1); + let y = f32(i32(in_vertex_index & 1u) * 2 - 1); + return vec4(x, y, 0.0, 1.0); +} + +[[stage(fragment)]] +fn fs_main() -> [[location(0)]] vec4 { + return vec4(1.0, 0.0, 0.0, 1.0); +} \ No newline at end of file