diff --git a/android/android_studio_project/.gitignore b/android/android_studio_project/.gitignore new file mode 100644 index 000000000..aa724b770 --- /dev/null +++ b/android/android_studio_project/.gitignore @@ -0,0 +1,15 @@ +*.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 diff --git a/android/android_studio_project/app/.gitignore b/android/android_studio_project/app/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/android/android_studio_project/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android/android_studio_project/app/build.gradle b/android/android_studio_project/app/build.gradle new file mode 100644 index 000000000..6ba02485c --- /dev/null +++ b/android/android_studio_project/app/build.gradle @@ -0,0 +1,82 @@ +plugins { + id 'com.android.application' +} + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.2" + ndkVersion '22.0.6917172 rc1' + + defaultConfig { + applicationId "jp.xenia.emulator" + minSdkVersion 24 + targetSdkVersion 30 + versionCode 1 + versionName "Prototype" + externalNativeBuild { + ndkBuild { + arguments "NDK_APPLICATION_MK:=../../../build/xenia_Application.mk" + } + } + ndk { + abiFilters 'arm64-v8a' + } + } + + buildTypes { + release { + externalNativeBuild { + ndkBuild { + arguments "PM5_CONFIG:=release_android" + } + } + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + releaseDebuggable { + initWith release + debuggable true + } + debug { + applicationIdSuffix ".debug" + debuggable true + externalNativeBuild { + ndkBuild { + arguments "PM5_CONFIG:=debug_android" + } + } + } + checked { + applicationIdSuffix ".checked" + debuggable true + externalNativeBuild { + ndkBuild { + arguments "PM5_CONFIG:=checked_android" + } + } + } + } + + flavorDimensions "distribution" + productFlavors { + github { + dimension "distribution" + applicationIdSuffix ".github" + } + googlePlay { + dimension "distribution" + // TODO(Triang3l): Provide a signing config for core contributors only. + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + externalNativeBuild { + ndkBuild { + path file('../../../build/xenia_Android.mk') + } + } +} \ No newline at end of file diff --git a/android/android_studio_project/app/proguard-rules.pro b/android/android_studio_project/app/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/android/android_studio_project/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/android/android_studio_project/app/src/main/AndroidManifest.xml b/android/android_studio_project/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..43e557eaf --- /dev/null +++ b/android/android_studio_project/app/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/java/jp/xenia/emulator/DemoActivity.java b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/DemoActivity.java new file mode 100644 index 000000000..970bd9b03 --- /dev/null +++ b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/DemoActivity.java @@ -0,0 +1,12 @@ +package jp.xenia.emulator; + +import android.app.Activity; +import android.os.Bundle; + +public class DemoActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_demo); + } +} \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/android_studio_project/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/android/android_studio_project/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/res/drawable/ic_launcher_background.xml b/android/android_studio_project/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/android/android_studio_project/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/android_studio_project/app/src/main/res/layout/activity_demo.xml b/android/android_studio_project/app/src/main/res/layout/activity_demo.xml new file mode 100644 index 000000000..ed5456938 --- /dev/null +++ b/android/android_studio_project/app/src/main/res/layout/activity_demo.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/android/android_studio_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a571e6009 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..61da551c5 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c41dd2853 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..db5080a75 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6dba46dab Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..da31a871c Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..15ac68172 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b216f2d31 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f25a41974 Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e96783ccc Binary files /dev/null and b/android/android_studio_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/android_studio_project/app/src/main/res/values/strings.xml b/android/android_studio_project/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..6379b7bcb --- /dev/null +++ b/android/android_studio_project/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Xenia + \ No newline at end of file diff --git a/android/android_studio_project/build.gradle b/android/android_studio_project/build.gradle new file mode 100644 index 000000000..4d24be2c6 --- /dev/null +++ b/android/android_studio_project/build.gradle @@ -0,0 +1,24 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.1.1" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/android/android_studio_project/gradle.properties b/android/android_studio_project/gradle.properties new file mode 100644 index 000000000..52f5917cb --- /dev/null +++ b/android/android_studio_project/gradle.properties @@ -0,0 +1,19 @@ +# 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 +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/android/android_studio_project/gradle/wrapper/gradle-wrapper.jar b/android/android_studio_project/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..f6b961fd5 Binary files /dev/null and b/android/android_studio_project/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/android_studio_project/gradle/wrapper/gradle-wrapper.properties b/android/android_studio_project/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..aba71f679 --- /dev/null +++ b/android/android_studio_project/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Nov 21 20:44:11 MSK 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/android/android_studio_project/gradlew b/android/android_studio_project/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/android/android_studio_project/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/android/android_studio_project/gradlew.bat b/android/android_studio_project/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/android/android_studio_project/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/android/android_studio_project/settings.gradle b/android/android_studio_project/settings.gradle new file mode 100644 index 000000000..d14049a94 --- /dev/null +++ b/android/android_studio_project/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "Xenia" \ No newline at end of file diff --git a/docs/gpu.md b/docs/gpu.md index 903c9b6e2..0ba3c13b1 100644 --- a/docs/gpu.md +++ b/docs/gpu.md @@ -119,6 +119,87 @@ Registers documented at [src/xenia/gpu/register_table.inc](../src/xenia/gpu/regi PM4 commands documented at [src/xenia/gpu/xenos.h](../src/xenia/gpu/xenos.h#L521). +#### Performance Counters that may be read back by D3D + +They are 64-bit values and have a high and low 32-bit register as well as a `SELECT` register each: + +- CP_PERFCOUNTER0 + +- RBBM_PERFCOUNTER0 +- RBBM_PERFCOUNTER1 + +- SQ_PERFCOUNTER0 +- SQ_PERFCOUNTER1 +- SQ_PERFCOUNTER2 +- SQ_PERFCOUNTER3 + +- VGT_PERFCOUNTER0 +- VGT_PERFCOUNTER1 +- VGT_PERFCOUNTER2 +- VGT_PERFCOUNTER3 + +- VC_PERFCOUNTER0 +- VC_PERFCOUNTER1 +- VC_PERFCOUNTER2 +- VC_PERFCOUNTER3 + +- PA_SU_PERFCOUNTER0 +- PA_SU_PERFCOUNTER1 +- PA_SU_PERFCOUNTER2 +- PA_SU_PERFCOUNTER3 + +- PA_SC_PERFCOUNTER0 +- PA_SC_PERFCOUNTER1 +- PA_SC_PERFCOUNTER2 +- PA_SC_PERFCOUNTER3 + +- HZ_PERFCOUNTER0 +- HZ_PERFCOUNTER1 + +- TCR_PERFCOUNTER0 +- TCR_PERFCOUNTER1 + +- TCM_PERFCOUNTER0 +- TCM_PERFCOUNTER1 + +- TCF_PERFCOUNTER0 +- TCF_PERFCOUNTER1 +- TCF_PERFCOUNTER2 +- TCF_PERFCOUNTER3 +- TCF_PERFCOUNTER4 +- TCF_PERFCOUNTER5 +- TCF_PERFCOUNTER6 +- TCF_PERFCOUNTER7 +- TCF_PERFCOUNTER8 +- TCF_PERFCOUNTER9 +- TCF_PERFCOUNTER10 +- TCF_PERFCOUNTER11 + +- TP0_PERFCOUNTER0 +- TP0_PERFCOUNTER1 +- TP1_PERFCOUNTER0 +- TP1_PERFCOUNTER1 +- TP2_PERFCOUNTER0 +- TP2_PERFCOUNTER1 +- TP3_PERFCOUNTER0 +- TP3_PERFCOUNTER1 + +- SX_PERFCOUNTER0 + +- BC_PERFCOUNTER0 +- BC_PERFCOUNTER1 +- BC_PERFCOUNTER2 +- BC_PERFCOUNTER3 + +- MC0_PERFCOUNTER0 +- MC1_PERFCOUNTER0 + +- MH_PERFCOUNTER0 +- MH_PERFCOUNTER1 +- MH_PERFCOUNTER2 + +- BIF_PERFCOUNTER0 + ### Shaders * [LLVM R600 Tables](https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/R600Instructions.td) diff --git a/src/xenia/gpu/command_processor.cc b/src/xenia/gpu/command_processor.cc index 4d9354946..651952da6 100644 --- a/src/xenia/gpu/command_processor.cc +++ b/src/xenia/gpu/command_processor.cc @@ -1179,9 +1179,11 @@ bool CommandProcessor::ExecutePacketType3_DRAW_INDX(RingBuffer* reader, // initiate fetch of index buffer and draw // if dword0 != 0, this is a conditional draw based on viz query. // This ID matches the one issued in PM4_VIZ_QUERY - // ID = dword0 & 0x3F; - // use = dword0 & 0x40; uint32_t dword0 = reader->ReadAndSwap(); // viz query info + // uint32_t viz_id = dword0 & 0x3F; + // when true, render conditionally based on query result + // uint32_t viz_use = dword0 & 0x100; + reg::VGT_DRAW_INITIATOR vgt_draw_initiator; vgt_draw_initiator.value = reader->ReadAndSwap(); WriteRegister(XE_GPU_REG_VGT_DRAW_INITIATOR, vgt_draw_initiator.value); @@ -1218,6 +1220,14 @@ bool CommandProcessor::ExecutePacketType3_DRAW_INDX(RingBuffer* reader, } break; } + auto viz_query = register_file_->Get(); + if (viz_query.viz_query_ena && viz_query.kill_pix_post_hi_z) { + // TODO(Triang3l): Don't drop the draw call completely if the vertex shader + // has memexport. + // TODO(Triang3l || JoelLinn): Handle this properly in the render backends. + return true; + } + bool success = IssueDraw(vgt_draw_initiator.prim_type, vgt_draw_initiator.num_indices, is_indexed ? &index_buffer_info : nullptr, @@ -1251,6 +1261,14 @@ bool CommandProcessor::ExecutePacketType3_DRAW_INDX_2(RingBuffer* reader, // TODO(Triang3l): VGT_IMMED_DATA. reader->AdvanceRead((count - 1) * sizeof(uint32_t)); + auto viz_query = register_file_->Get(); + if (viz_query.viz_query_ena && viz_query.kill_pix_post_hi_z) { + // TODO(Triang3l): Don't drop the draw call completely if the vertex shader + // has memexport. + // TODO(Triang3l || JoelLinn): Handle this properly in the render backends. + return true; + } + bool success = IssueDraw( vgt_draw_initiator.prim_type, vgt_draw_initiator.num_indices, nullptr, xenos::IsMajorModeExplicit(vgt_draw_initiator.major_mode, @@ -1447,15 +1465,26 @@ bool CommandProcessor::ExecutePacketType3_VIZ_QUERY(RingBuffer* reader, uint32_t dword0 = reader->ReadAndSwap(); uint32_t id = dword0 & 0x3F; - uint32_t end = dword0 & 0x80; + uint32_t end = dword0 & 0x100; if (!end) { // begin a new viz query @ id + // On hardware this clears the internal state of the scan converter (which + // is different to the register) WriteRegister(XE_GPU_REG_VGT_EVENT_INITIATOR, VIZQUERY_START); XELOGGPU("Begin viz query ID {:02X}", id); } else { // end the viz query WriteRegister(XE_GPU_REG_VGT_EVENT_INITIATOR, VIZQUERY_END); XELOGGPU("End viz query ID {:02X}", id); + // The scan converter writes the internal result back to the register here. + // We just fake it and say it was visible in case it is read back. + if (id < 32) { + register_file_->values[XE_GPU_REG_PA_SC_VIZ_QUERY_STATUS_0].u32 |= + uint32_t(1) << id; + } else { + register_file_->values[XE_GPU_REG_PA_SC_VIZ_QUERY_STATUS_1].u32 |= + uint32_t(1) << (id - 32); + } } return true; diff --git a/src/xenia/gpu/register_table.inc b/src/xenia/gpu/register_table.inc index 8ac7ec5d2..31e08e60e 100644 --- a/src/xenia/gpu/register_table.inc +++ b/src/xenia/gpu/register_table.inc @@ -15,9 +15,25 @@ //#define XE_GPU_REGISTER(index, type, name) +XE_GPU_REGISTER(0x0048, kDword, BIF_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0049, kDword, BIF_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x004A, kDword, BIF_PERFCOUNTER0_LOW) + XE_GPU_REGISTER(0x01DD, kDword, SCRATCH_ADDR) XE_GPU_REGISTER(0x01DC, kDword, SCRATCH_UMSK) +XE_GPU_REGISTER(0x01E6, kDword, CP_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x01E7, kDword, CP_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x01E8, kDword, CP_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x01F5, kDword, CP_PERFMON_CNTL) + +XE_GPU_REGISTER(0x0395, kDword, RBBM_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0396, kDword, RBBM_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0397, kDword, RBBM_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0398, kDword, RBBM_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0399, kDword, RBBM_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x039A, kDword, RBBM_PERFCOUNTER1_HI) + XE_GPU_REGISTER(0x045E, kDword, CALLBACK_ACK) XE_GPU_REGISTER(0x0578, kDword, SCRATCH_REG0) // interrupt sync @@ -31,33 +47,226 @@ XE_GPU_REGISTER(0x057F, kDword, SCRATCH_REG7) XE_GPU_REGISTER(0x05C8, kDword, WAIT_UNTIL) +XE_GPU_REGISTER(0x0815, kDword, MC0_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0816, kDword, MC0_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0817, kDword, MC0_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0855, kDword, MC1_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0856, kDword, MC1_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0857, kDword, MC1_PERFCOUNTER0_LOW) + XE_GPU_REGISTER(0x0A02, kDword, UNKNOWN_0A02) XE_GPU_REGISTER(0x0A03, kDword, UNKNOWN_0A03) XE_GPU_REGISTER(0x0A04, kDword, UNKNOWN_0A04) XE_GPU_REGISTER(0x0A05, kDword, UNKNOWN_0A05) +XE_GPU_REGISTER(0x0A18, kDword, MH_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0A19, kDword, MH_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0A1A, kDword, MH_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0A1B, kDword, MH_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0A1C, kDword, MH_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0A1D, kDword, MH_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0A1E, kDword, MH_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0A1F, kDword, MH_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0A20, kDword, MH_PERFCOUNTER2_LOW) + XE_GPU_REGISTER(0x0A2F, kDword, COHER_SIZE_HOST) XE_GPU_REGISTER(0x0A30, kDword, COHER_BASE_HOST) XE_GPU_REGISTER(0x0A31, kDword, COHER_STATUS_HOST) +// Status flags of viz queries, doesn't seem to be read back by d3d +// queries 0x00 to 0x1f (be), bit set when visible +XE_GPU_REGISTER(0x0C44, kDword, PA_SC_VIZ_QUERY_STATUS_0) +// queries 0x20 to 0x3f (be) +XE_GPU_REGISTER(0x0C45, kDword, PA_SC_VIZ_QUERY_STATUS_1) + +XE_GPU_REGISTER(0x0C48, kDword, VGT_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0C49, kDword, VGT_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0C4A, kDword, VGT_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0C4B, kDword, VGT_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0C4C, kDword, VGT_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0C4D, kDword, VGT_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0C4E, kDword, VGT_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0C4F, kDword, VGT_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0C50, kDword, VGT_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0C51, kDword, VGT_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0C52, kDword, VGT_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0C53, kDword, VGT_PERFCOUNTER3_HI) + +XE_GPU_REGISTER(0x0C85, kDword, PA_CL_ENHANCE) + +XE_GPU_REGISTER(0x0C88, kDword, PA_SU_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0C89, kDword, PA_SU_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0C8A, kDword, PA_SU_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0C8B, kDword, PA_SU_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0C8C, kDword, PA_SU_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0C8D, kDword, PA_SU_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0C8E, kDword, PA_SU_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0C8F, kDword, PA_SU_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0C90, kDword, PA_SU_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0C91, kDword, PA_SU_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0C92, kDword, PA_SU_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0C93, kDword, PA_SU_PERFCOUNTER3_HI) +XE_GPU_REGISTER(0x0C98, kDword, PA_SC_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0C99, kDword, PA_SC_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0C9A, kDword, PA_SC_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0C9B, kDword, PA_SC_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0C9C, kDword, PA_SC_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0C9D, kDword, PA_SC_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0C9E, kDword, PA_SC_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0C9F, kDword, PA_SC_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0CA0, kDword, PA_SC_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0CA1, kDword, PA_SC_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0CA2, kDword, PA_SC_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0CA3, kDword, PA_SC_PERFCOUNTER3_HI) + XE_GPU_REGISTER(0x0D00, kDword, SQ_GPR_MANAGEMENT) XE_GPU_REGISTER(0x0D01, kDword, SQ_FLOW_CONTROL) XE_GPU_REGISTER(0x0D02, kDword, SQ_INST_STORE_MANAGMENT) XE_GPU_REGISTER(0x0D04, kDword, SQ_EO_RT) -XE_GPU_REGISTER(0x0C85, kDword, PA_CL_ENHANCE) +XE_GPU_REGISTER(0x0DC8, kDword, SQ_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0DC9, kDword, SQ_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0DCA, kDword, SQ_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0DCB, kDword, SQ_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0DCC, kDword, SQ_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0DCD, kDword, SQ_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0DCE, kDword, SQ_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0DCF, kDword, SQ_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0DD0, kDword, SQ_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0DD1, kDword, SQ_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0DD2, kDword, SQ_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0DD3, kDword, SQ_PERFCOUNTER3_HI) +XE_GPU_REGISTER(0x0DD4, kDword, SX_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0DD8, kDword, SX_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0DD9, kDword, SX_PERFCOUNTER0_HI) // Set with WAIT_UNTIL = WAIT_3D_IDLECLEAN XE_GPU_REGISTER(0x0E00, kDword, UNKNOWN_0E00) + +XE_GPU_REGISTER(0x0E05, kDword, TCR_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E06, kDword, TCR_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E07, kDword, TCR_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E08, kDword, TCR_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E09, kDword, TCR_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E0A, kDword, TCR_PERFCOUNTER1_LOW) + +XE_GPU_REGISTER(0x0E1F, kDword, TP0_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E20, kDword, TP0_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E21, kDword, TP0_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E22, kDword, TP0_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E23, kDword, TP0_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E24, kDword, TP0_PERFCOUNTER1_LOW) + +XE_GPU_REGISTER(0x0E28, kDword, TP1_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E29, kDword, TP1_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E2A, kDword, TP1_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E2B, kDword, TP1_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E2C, kDword, TP1_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E2D, kDword, TP1_PERFCOUNTER1_LOW) + +XE_GPU_REGISTER(0x0E31, kDword, TP2_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E32, kDword, TP2_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E33, kDword, TP2_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E34, kDword, TP2_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E35, kDword, TP2_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E36, kDword, TP2_PERFCOUNTER1_LOW) + +XE_GPU_REGISTER(0x0E3A, kDword, TP3_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E3B, kDword, TP3_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E3C, kDword, TP3_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E3D, kDword, TP3_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E3E, kDword, TP3_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E3F, kDword, TP3_PERFCOUNTER1_LOW) + +// Set with WAIT_UNTIL = WAIT_3D_IDLECLEAN XE_GPU_REGISTER(0x0E40, kDword, UNKNOWN_0E40) +// Set during GPU initialization by D3D XE_GPU_REGISTER(0x0E42, kDword, UNKNOWN_0E42) +XE_GPU_REGISTER(0x0E48, kDword, VC_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E49, kDword, VC_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E4A, kDword, VC_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E4B, kDword, VC_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E4C, kDword, VC_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E4D, kDword, VC_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0E4E, kDword, VC_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0E4F, kDword, VC_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0E50, kDword, VC_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0E51, kDword, VC_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0E52, kDword, VC_PERFCOUNTER3_HI) +XE_GPU_REGISTER(0x0E53, kDword, VC_PERFCOUNTER3_LOW) + +XE_GPU_REGISTER(0x0E54, kDword, TCM_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E55, kDword, TCM_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E56, kDword, TCM_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E57, kDword, TCM_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E58, kDword, TCM_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E59, kDword, TCM_PERFCOUNTER1_LOW) + +XE_GPU_REGISTER(0x0E5A, kDword, TCF_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0E5B, kDword, TCF_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0E5C, kDword, TCF_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0E5D, kDword, TCF_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0E5E, kDword, TCF_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0E5F, kDword, TCF_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0E60, kDword, TCF_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0E61, kDword, TCF_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0E62, kDword, TCF_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0E63, kDword, TCF_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0E64, kDword, TCF_PERFCOUNTER3_HI) +XE_GPU_REGISTER(0x0E65, kDword, TCF_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0E66, kDword, TCF_PERFCOUNTER4_SELECT) +XE_GPU_REGISTER(0x0E67, kDword, TCF_PERFCOUNTER4_HI) +XE_GPU_REGISTER(0x0E68, kDword, TCF_PERFCOUNTER4_LOW) +XE_GPU_REGISTER(0x0E69, kDword, TCF_PERFCOUNTER5_SELECT) +XE_GPU_REGISTER(0x0E6A, kDword, TCF_PERFCOUNTER5_HI) +XE_GPU_REGISTER(0x0E6B, kDword, TCF_PERFCOUNTER5_LOW) +XE_GPU_REGISTER(0x0E6C, kDword, TCF_PERFCOUNTER6_SELECT) +XE_GPU_REGISTER(0x0E6D, kDword, TCF_PERFCOUNTER6_HI) +XE_GPU_REGISTER(0x0E6E, kDword, TCF_PERFCOUNTER6_LOW) +XE_GPU_REGISTER(0x0E6F, kDword, TCF_PERFCOUNTER7_SELECT) +XE_GPU_REGISTER(0x0E70, kDword, TCF_PERFCOUNTER7_HI) +XE_GPU_REGISTER(0x0E71, kDword, TCF_PERFCOUNTER7_LOW) +XE_GPU_REGISTER(0x0E72, kDword, TCF_PERFCOUNTER8_SELECT) +XE_GPU_REGISTER(0x0E73, kDword, TCF_PERFCOUNTER8_HI) +XE_GPU_REGISTER(0x0E74, kDword, TCF_PERFCOUNTER8_LOW) +XE_GPU_REGISTER(0x0E75, kDword, TCF_PERFCOUNTER9_SELECT) +XE_GPU_REGISTER(0x0E76, kDword, TCF_PERFCOUNTER9_HI) +XE_GPU_REGISTER(0x0E77, kDword, TCF_PERFCOUNTER9_LOW) +XE_GPU_REGISTER(0x0E78, kDword, TCF_PERFCOUNTER10_SELECT) +XE_GPU_REGISTER(0x0E79, kDword, TCF_PERFCOUNTER10_HI) +XE_GPU_REGISTER(0x0E7A, kDword, TCF_PERFCOUNTER10_LOW) +XE_GPU_REGISTER(0x0E7B, kDword, TCF_PERFCOUNTER11_SELECT) +XE_GPU_REGISTER(0x0E7C, kDword, TCF_PERFCOUNTER11_HI) +XE_GPU_REGISTER(0x0E7D, kDword, TCF_PERFCOUNTER11_LOW) + XE_GPU_REGISTER(0x0F01, kDword, RB_BC_CONTROL) XE_GPU_REGISTER(0x0F02, kDword, RB_EDRAM_INFO) -// D1*, LUT, and AVIVO registers taken from libxenon and https://www.x.org/docs/AMD/old/RRG-216M56-03oOEM.pdf +XE_GPU_REGISTER(0x0F04, kDword, BC_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x0F05, kDword, BC_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x0F06, kDword, BC_PERFCOUNTER2_SELECT) +XE_GPU_REGISTER(0x0F07, kDword, BC_PERFCOUNTER3_SELECT) +XE_GPU_REGISTER(0x0F08, kDword, BC_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x0F09, kDword, BC_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x0F0A, kDword, BC_PERFCOUNTER1_LOW) +XE_GPU_REGISTER(0x0F0B, kDword, BC_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x0F0C, kDword, BC_PERFCOUNTER2_LOW) +XE_GPU_REGISTER(0x0F0D, kDword, BC_PERFCOUNTER2_HI) +XE_GPU_REGISTER(0x0F0E, kDword, BC_PERFCOUNTER3_LOW) +XE_GPU_REGISTER(0x0F0F, kDword, BC_PERFCOUNTER3_HI) + +XE_GPU_REGISTER(0x1004, kDword, HZ_PERFCOUNTER0_SELECT) +XE_GPU_REGISTER(0x1005, kDword, HZ_PERFCOUNTER0_HI) +XE_GPU_REGISTER(0x1006, kDword, HZ_PERFCOUNTER0_LOW) +XE_GPU_REGISTER(0x1007, kDword, HZ_PERFCOUNTER1_SELECT) +XE_GPU_REGISTER(0x1008, kDword, HZ_PERFCOUNTER1_HI) +XE_GPU_REGISTER(0x1009, kDword, HZ_PERFCOUNTER1_LOW) + +// D1*, LUT, and AVIVO registers taken from libxenon and +// https://www.x.org/docs/AMD/old/RRG-216M56-03oOEM.pdf XE_GPU_REGISTER(0x1838, kDword, D1MODE_MASTER_UPDATE_LOCK) XE_GPU_REGISTER(0x1841, kDword, D1GRPH_CONTROL) diff --git a/src/xenia/gpu/registers.h b/src/xenia/gpu/registers.h index 9a5b08e59..dd1a7dfc2 100644 --- a/src/xenia/gpu/registers.h +++ b/src/xenia/gpu/registers.h @@ -289,12 +289,16 @@ union PA_SC_MPASS_PS_CNTL { static constexpr Register register_index = XE_GPU_REG_PA_SC_MPASS_PS_CNTL; }; -// Scanline converter viz query +// Scanline converter viz query, used by D3D for gpu side conditional rendering union PA_SC_VIZ_QUERY { struct { - uint32_t viz_query_ena : 1; // +0 - uint32_t viz_query_id : 6; // +1 - uint32_t kill_pix_post_early_z : 1; // +7 + // the visibility of draws should be evaluated + uint32_t viz_query_ena : 1; // +0 + uint32_t viz_query_id : 6; // +1 + // discard geometry after test (but use for testing) + uint32_t kill_pix_post_hi_z : 1; // +7 + // not used with d3d + uint32_t kill_pix_detail_mask : 1; // +8 }; uint32_t value; static constexpr Register register_index = XE_GPU_REG_PA_SC_VIZ_QUERY; diff --git a/src/xenia/gpu/xenos.h b/src/xenia/gpu/xenos.h index d3a78a850..4117a8293 100644 --- a/src/xenia/gpu/xenos.h +++ b/src/xenia/gpu/xenos.h @@ -82,7 +82,6 @@ constexpr bool IsPrimitivePolygonal(bool tessellated, PrimitiveType type) { case PrimitiveType::kTriangleFan: case PrimitiveType::kTriangleStrip: case PrimitiveType::kTriangleWithWFlags: - case PrimitiveType::kRectangleList: case PrimitiveType::kQuadList: case PrimitiveType::kQuadStrip: case PrimitiveType::kPolygon: @@ -90,6 +89,10 @@ constexpr bool IsPrimitivePolygonal(bool tessellated, PrimitiveType type) { default: break; } + // TODO(Triang3l): Investigate how kRectangleList should be treated - possibly + // actually drawn as two polygons on the console, however, the current + // geometry shader doesn't care about the winding order - allowing backface + // culling for rectangles currently breaks Gears of War 2. return false; }