Remove VisualBench and its Android implementation.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018603003
Review-Url: https://codereview.chromium.org/2018603003
diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index d0c933c..02a5474 100644
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -33,13 +33,6 @@
'dependencies': [
'android_system.gyp:SampleApp_APK',
],
- 'conditions': [
- [ 'skia_gpu == 1', {
- 'dependencies': [
- 'android_system.gyp:VisualBench_APK',
- ],
- }],
- ],
}],
],
},
diff --git a/gyp/kilobench.gyp b/gyp/kilobench.gyp
deleted file mode 100644
index 8223547..0000000
--- a/gyp/kilobench.gyp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# GYP file to build performance testbench.
-#
-{
- 'includes': [
- 'apptype_console.gypi',
- ],
- 'targets': [
- {
- 'target_name': 'kilobench',
- 'type': 'executable',
- 'include_dirs': [
- '../bench',
- '../gm',
- '../include/private',
- '../src/core',
- '../src/gpu',
- '../tools/VisualBench',
- ],
- 'sources': [
- '<!@(python find.py ../tools/kilobench "*.cpp")',
- '../bench/Benchmark.cpp',
- '../tools/VisualBench/VisualSKPBench.cpp',
- ],
- 'dependencies': [
- 'flags.gyp:flags',
- 'gpu.gyp:skgpu',
- 'gputest.gyp:skgputest',
- 'jsoncpp.gyp:jsoncpp',
- 'skia_lib.gyp:skia_lib',
- 'tools.gyp:crash_handler',
- 'tools.gyp:proc_stats',
- 'tools.gyp:resources',
- 'tools.gyp:timer',
- ],
- },
- ],
-}
diff --git a/gyp/most.gyp b/gyp/most.gyp
index 9e54732..47c0d80 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -26,24 +26,15 @@
'pathops_unittest.gyp:*',
'pathops_skpclip.gyp:*',
'dm.gyp:dm',
- 'visualbench.gyp:visualbench',
'fuzz.gyp:fuzz',
- 'kilobench.gyp:kilobench',
'viewer.gyp:viewer',
],
'conditions': [
[ 'skia_gpu == 0', {
'dependencies!': [
- 'visualbench.gyp:visualbench',
- 'kilobench.gyp:kilobench',
'viewer.gyp:viewer',
]
}],
- [ 'skia_os != "android" and skia_os != "linux"', {
- 'dependencies!': [
- 'kilobench.gyp:kilobench',
- ],
- }],
[ 'skia_gpu == 0 or skia_os == "android"', {
'dependencies!': [
'example.gyp:HelloWorld',
@@ -58,7 +49,6 @@
'dependencies!': [
'example.gyp:HelloWorld',
'SampleApp.gyp:SampleApp',
- 'visualbench.gyp:visualbench',
],
'dependencies': ['iOSShell.gyp:iOSShell' ],
}],
@@ -82,7 +72,6 @@
'dependencies!': [
'example.gyp:HelloWorld',
'SampleApp.gyp:SampleApp',
- 'visualbench.gyp:visualbench',
]
}
],
diff --git a/gyp/visualbench.gyp b/gyp/visualbench.gyp
deleted file mode 100644
index fdf0efb..0000000
--- a/gyp/visualbench.gyp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# GYP file to build visual bench tool
-{
- 'includes': [
- 'apptype_console.gypi',
- ],
- 'targets': [
- {
- 'target_name': 'visualbench',
- 'type': 'executable',
- 'includes' : [
- 'gmslides.gypi',
- ],
- 'include_dirs' : [
- '../bench',
- '../include/gpu',
- '../include/private',
- '../src/core',
- '../src/effects',
- '../src/gpu',
- '../src/images',
- '../src/image',
- '../src/pdf',
- ],
- 'sources': [
- '../gm/gm.cpp',
- '<!@(python find.py ../tools/VisualBench "*.cpp")',
- '<!@(python find.py ../tools/VisualBench "*.h")',
- '<!@(python find.py ../bench "*.cpp")',
- ],
- 'sources!': [
- '../bench/nanobench.cpp',
- '../bench/nanobenchAndroid.cpp',
- ],
- 'dependencies': [
- 'etc1.gyp:libetc1',
- 'flags.gyp:flags',
- 'jsoncpp.gyp:jsoncpp',
- 'gputest.gyp:skgputest',
- 'pdf.gyp:pdf',
- 'skia_lib.gyp:skia_lib',
- 'tools.gyp:proc_stats',
- 'tools.gyp:sk_tool_utils',
- 'tools.gyp:timer',
- 'tools.gyp:url_data_manager',
- 'views.gyp:views',
- ],
- 'conditions' : [
- [ 'skia_os == "android" and skia_use_sdl == 0', {
- 'dependencies': [
- 'android_deps.gyp:Android_VisualBench',
- 'android_deps.gyp:native_app_glue',
- ],
- 'link_settings': {
- 'libraries': [
- '-landroid',
- '-lGLESv2',
- '-lEGL',
- ],
- },
- }],
- [ 'skia_os == "android" and skia_use_sdl == 1', {
- 'dependencies': [
- 'android_deps.gyp:Android_EntryPoint',
- ],
- }],
- ],
- },
- ],
-}
diff --git a/platform_tools/android/apps/settings.gradle b/platform_tools/android/apps/settings.gradle
index d462ca8..9d23bff 100644
--- a/platform_tools/android/apps/settings.gradle
+++ b/platform_tools/android/apps/settings.gradle
@@ -1,5 +1,3 @@
include ':sample_app'
-include ':visualbench'
-include ':visualbenchsdl'
include ':canvasproof'
include ':viewer'
diff --git a/platform_tools/android/apps/visualbench/build.gradle b/platform_tools/android/apps/visualbench/build.gradle
deleted file mode 100644
index e64e43e..0000000
--- a/platform_tools/android/apps/visualbench/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 19
- buildToolsVersion "22.0.1"
-
- defaultConfig {
- applicationId "com.skia.visualbench"
- minSdkVersion 19
- signingConfig signingConfigs.debug
- targetSdkVersion 19
- versionCode 1
- versionName "1.0"
- }
-
- sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
- sourceSets.main.jniLibs.srcDir "src/main/libs"
-
- productFlavors {
- arm {}
- arm64 {}
- x86 {}
- x86_64 {}
- mips {}
- mips64 {}
- }
-
- // make sure that app is built and shared libraries are copied to correct directories
- setupSkiaLibraryBuild(project, applicationVariants, "CopyVisualBenchDeps")
-}
diff --git a/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml b/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml
deleted file mode 100644
index 2bb9eca..0000000
--- a/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- BEGIN_INCLUDE(manifest) -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.skia"
- android:versionCode="1"
- android:versionName="1.0">
-
- <!-- This is the platform API where NativeActivity was introduced. -->
- <uses-sdk android:minSdkVersion="19" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <application android:label="VisualBenchActivity">
- <activity android:name=".VisualBenchActivity"
- android:label="VisualBenchActivity"
- android:configChanges="orientation|keyboardHidden"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- <meta-data android:name="android.app.lib_name"
- android:value="visualbench" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
-<!-- END_INCLUDE(manifest) -->
diff --git a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java
deleted file mode 100644
index a5d291f..0000000
--- a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-package com.skia;
-
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.View;
-import android.view.WindowManager;
-
-public class VisualBenchActivity extends android.app.NativeActivity {
- static {
- System.loadLibrary("skia_android");
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
-
- // Setup a bunch of window parameters. We have to do this here to prevent our backend from
- // getting spurious term / init messages when we relayout
-
- // Layout fullscreen and keep screen on
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN |
- WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
- getWindow().getDecorView().setSystemUiVisibility(
- View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | // hide nav bar
- View.SYSTEM_UI_FLAG_FULLSCREEN |// hide status bar
- View.SYSTEM_UI_FLAG_IMMERSIVE);
-
- // Disable backlight to keep the system as cool as possible
- // TODO make this configurable
- Settings.System.putInt(getContentResolver(), Settings.System.SCREEN_BRIGHTNESS_MODE,
- Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-
- WindowManager.LayoutParams lp = getWindow().getAttributes();
- lp.screenBrightness = 0; // 0f - no backlight
- getWindow().setAttributes(lp);
- }
-}
diff --git a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java
deleted file mode 100644
index 48507be..0000000
--- a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-package com.skia;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.test.ActivityUnitTestCase;
-import android.util.Log;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.lang.StringBuilder;
-
-public class VisualBenchTestActivity extends ActivityUnitTestCase<VisualBenchActivity> {
- private VisualBenchActivity mActivity;
- private Instrumentation mInstrumentation;
-
- public VisualBenchTestActivity() {
- super(VisualBenchActivity.class);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- mInstrumentation = getInstrumentation();
- }
-
- private String getFlags() throws IOException {
- InputStream s = getInstrumentation().getTargetContext().getResources().getAssets().open("nanobench_flags.txt");
- BufferedReader r = new BufferedReader(new InputStreamReader(s));
- StringBuilder flags = new StringBuilder();
- String sep = System.getProperty("line.separator");
- String line;
- while ((line = r.readLine()) != null) {
- flags.append(line);
- flags.append(sep);
- }
- s.close();
- return flags.toString();
- }
-
- public void testVisualBench() throws InterruptedException, IOException {
- String pkg = getInstrumentation().getTargetContext().getPackageName();
- Intent intent = new Intent(getInstrumentation().getTargetContext(),
- VisualBenchActivity.class);
- String args = getFlags();
- intent.putExtra("cmdLineFlags", args);
- mActivity = launchActivityWithIntent(pkg, VisualBenchActivity.class, intent);
-
- assertNotNull("mActivity is null", mActivity);
- Thread.sleep(5000);
- while (!mActivity.isDestroyed()) {
- Log.d("skiatest", "Waiting for subprocess to finish.");
- Thread.sleep(1000);
- }
- }
-}
diff --git a/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp b/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp
deleted file mode 100644
index df7e74b..0000000
--- a/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkOSWindow_Android.h"
-
-#include <GLES/gl.h>
-
-SkOSWindow::SkOSWindow(void* hwnd) {
- fWindow.fDisplay = EGL_NO_DISPLAY;
- fWindow.fContext = EGL_NO_CONTEXT;
- fWindow.fSurface = EGL_NO_SURFACE;
- fNativeWindow = (ANativeWindow*)hwnd;
- fDestroyRequested = false;
-}
-
-SkOSWindow::~SkOSWindow() {
- this->release();
-}
-
-bool SkOSWindow::attach(SkBackEndTypes attachType,
- int /*msaaSampleCount*/,
- bool /*deepColor*/,
- AttachmentInfo* info) {
- static const EGLint kEGLContextAttribsForOpenGL[] = {
- EGL_NONE
- };
-
- static const EGLint kEGLContextAttribsForOpenGLES[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_NONE
- };
-
- static const struct {
- const EGLint* fContextAttribs;
- EGLenum fAPI;
- EGLint fRenderableTypeBit;
- } kAPIs[] = {
- { // OpenGL
- kEGLContextAttribsForOpenGL,
- EGL_OPENGL_API,
- EGL_OPENGL_BIT,
- },
- { // OpenGL ES. This seems to work for both ES2 and 3 (when available).
- kEGLContextAttribsForOpenGLES,
- EGL_OPENGL_ES_API,
- EGL_OPENGL_ES2_BIT,
- },
- };
-
- EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
- if (EGL_NO_DISPLAY == display) {
- return false;
- }
-
- EGLint majorVersion;
- EGLint minorVersion;
- if (!eglInitialize(display, &majorVersion, &minorVersion)) {
- return false;
- }
-
- for (size_t api = 0; api < SK_ARRAY_COUNT(kAPIs); ++api) {
- if (!eglBindAPI(kAPIs[api].fAPI)) {
- continue;
- }
-#if 0
- SkDebugf("VENDOR: %s\n", eglQueryString(fDisplay, EGL_VENDOR));
- SkDebugf("APIS: %s\n", eglQueryString(fDisplay, EGL_CLIENT_APIS));
- SkDebugf("VERSION: %s\n", eglQueryString(fDisplay, EGL_VERSION));
- SkDebugf("EXTENSIONS %s\n", eglQueryString(fDisplay, EGL_EXTENSIONS));
-#endif
-
- const EGLint configAttribs[] = {
- EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
- EGL_RENDERABLE_TYPE, kAPIs[api].fRenderableTypeBit,
- EGL_RED_SIZE, 8,
- EGL_GREEN_SIZE, 8,
- EGL_BLUE_SIZE, 8,
- EGL_ALPHA_SIZE, 8,
- EGL_NONE
- };
-
- EGLint format;
- EGLint numConfigs;
- EGLConfig config;
- EGLSurface surface;
- EGLContext context;
-
- /* Here, the application chooses the configuration it desires. In this
- * sample, we have a very simplified selection process, where we pick
- * the first EGLConfig that matches our criteria */
- if (!eglChooseConfig(display, configAttribs, &config, 1, &numConfigs) ||
- numConfigs != 1) {
- continue;
- }
-
- /* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
- * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
- * As soon as we picked a EGLConfig, we can safely reconfigure the
- * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID. */
- if (!eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format)) {
- continue;
- }
-
- ANativeWindow_setBuffersGeometry(fNativeWindow, 0, 0, format);
-
- surface = eglCreateWindowSurface(display, config, fNativeWindow, nullptr);
- if (EGL_NO_SURFACE == surface) {
- SkDebugf("eglCreateWindowSurface failed. EGL Error: 0x%08x\n", eglGetError());
- continue;
- }
- context = eglCreateContext(display, config, nullptr, kAPIs[api].fContextAttribs);
- if (EGL_NO_CONTEXT == context) {
- SkDebugf("eglCreateContext failed. EGL Error: 0x%08x\n", eglGetError());
- eglDestroySurface(display, surface);
- continue;
- }
-
- if (!eglMakeCurrent(display, surface, surface, context)) {
- SkDebugf("eglMakeCurrent failed. EGL Error: 0x%08x\n", eglGetError());
- eglDestroyContext(display, context);
- eglDestroySurface(display, surface);
- continue;
- }
-
- fWindow.fDisplay = display;
- fWindow.fContext = context;
- fWindow.fSurface = surface;
- break;
- }
-
- if (fWindow.fDisplay && fWindow.fContext && fWindow.fSurface) {
- EGLint w, h;
- eglQuerySurface(fWindow.fDisplay, fWindow.fSurface, EGL_WIDTH, &w);
- eglQuerySurface(fWindow.fDisplay, fWindow.fSurface, EGL_HEIGHT, &h);
-
- glViewport(0, 0, w, h);
- glClearColor(0.0, 0, 0, 0.0);
- glClearStencil(0);
- glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
- // We retrieve the fullscreen width and height
- this->setSize((SkScalar)w, (SkScalar)h);
- return true;
- } else {
- return false;
- }
-}
-
-void SkOSWindow::release() {
- if (fWindow.fDisplay != EGL_NO_DISPLAY) {
- eglMakeCurrent(fWindow.fDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- if (fWindow.fContext != EGL_NO_CONTEXT) {
- eglDestroyContext(fWindow.fDisplay, fWindow.fContext);
- }
- if (fWindow.fSurface != EGL_NO_SURFACE) {
- eglDestroySurface(fWindow.fDisplay, fWindow.fSurface);
- }
- eglTerminate(fWindow.fDisplay);
- }
- fWindow.fDisplay = EGL_NO_DISPLAY;
- fWindow.fContext = EGL_NO_CONTEXT;
- fWindow.fSurface = EGL_NO_SURFACE;
-}
-
-void SkOSWindow::present() {
- if (fWindow.fDisplay != EGL_NO_DISPLAY && fWindow.fContext != EGL_NO_CONTEXT) {
- eglSwapBuffers(fWindow.fDisplay, fWindow.fSurface);
- }
-}
-
-void SkOSWindow::closeWindow() {
- fDestroyRequested = true;
-}
-
-void SkOSWindow::setVsync(bool vsync) {
- if (fWindow.fDisplay != EGL_NO_DISPLAY) {
- int swapInterval = vsync ? 1 : 0;
- eglSwapInterval(fWindow.fDisplay, swapInterval);
- }
-}
-
-void SkOSWindow::onSetTitle(const char title[]) {
-}
-
-void SkOSWindow::onHandleInval(const SkIRect& rect) {
-}
-
-///////////////////////////////////////////
-/////////////// SkEvent impl //////////////
-///////////////////////////////////////////
-
-void SkEvent::SignalQueueTimer(SkMSec ms) {
-}
-
-void SkEvent::SignalNonEmptyQueue() {
-}
diff --git a/platform_tools/android/apps/visualbench/src/main/jni/main.cpp b/platform_tools/android/apps/visualbench/src/main/jni/main.cpp
deleted file mode 100644
index f8d54cd..0000000
--- a/platform_tools/android/apps/visualbench/src/main/jni/main.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#include <android_native_app_glue.h>
-
-#include "SkApplication.h"
-#include "VisualBench.h"
-
-/**
- * Shared state for our app.
- */
-enum State {
- kInit_State,
- kAnimate_State,
- kDestroyRequested_State,
- kFinished_State,
-};
-
-struct VisualBenchState {
- VisualBenchState() : fApp(nullptr), fWindow(nullptr), fState(kInit_State) {}
- struct android_app* fApp;
- SkOSWindow* fWindow;
- SkTArray<SkString> fFlags;
- State fState;
-};
-
-static void handle_cmd(struct android_app* app, int32_t cmd) {
- struct VisualBenchState* state = (struct VisualBenchState*)app->userData;
- switch (cmd) {
- case APP_CMD_INIT_WINDOW:
- // The window is being shown, get it ready.
- if (state->fApp->window != nullptr && kInit_State == state->fState) {
- // drain any events that occurred before |window| was assigned.
- while (SkEvent::ProcessEvent());
-
- // Start normal Skia sequence
- application_init();
-
- SkTArray<const char*> args;
- args.push_back("VisualBench");
- for (int i = 0; i < state->fFlags.count(); i++) {
- SkDebugf(state->fFlags[i].c_str());
- args.push_back(state->fFlags[i].c_str());
- }
-
- state->fWindow = create_sk_window((void*)state->fApp->window,
- args.count(),
- const_cast<char**>(args.begin()));
- state->fWindow->forceInvalAll();
- state->fState = kAnimate_State;
- }
- break;
- case APP_CMD_TERM_WINDOW:
- state->fState = kDestroyRequested_State;
- break;
- }
-}
-
-void android_main(struct android_app* state) {
- struct VisualBenchState visualBenchState;
-
- // Make sure glue isn't stripped.
- app_dummy();
-
- state->userData = &visualBenchState;
- state->onAppCmd = handle_cmd;
- visualBenchState.fApp = state;
-
- // Get command line arguments
- JavaVM* jvm = state->activity->vm;
- JNIEnv *env;
- jvm->AttachCurrentThread(&env, 0);
-
- jobject me = state->activity->clazz;
-
- jclass acl = env->GetObjectClass(me); //class pointer of NativeActivity
- jmethodID giid = env->GetMethodID(acl, "getIntent", "()Landroid/content/Intent;");
- jobject intent = env->CallObjectMethod(me, giid); //Got our intent
-
- jclass icl = env->GetObjectClass(intent); //class pointer of Intent
- jmethodID gseid = env->GetMethodID(icl, "getStringExtra",
- "(Ljava/lang/String;)Ljava/lang/String;");
-
- jstring jsParam1 = (jstring)env->CallObjectMethod(intent, gseid,
- env->NewStringUTF("cmdLineFlags"));
- if (jsParam1) {
- const char* flags = env->GetStringUTFChars(jsParam1, 0);
- SkStrSplit(flags, " ", &visualBenchState.fFlags);
- env->ReleaseStringUTFChars(jsParam1, flags);
- }
- jvm->DetachCurrentThread();
-
- while (1) {
- // Read all pending events.
- int ident;
- int events;
- struct android_poll_source* source;
-
- // We loop until all events are read, then continue to draw the next frame of animation.
- while ((ident=ALooper_pollAll(0, nullptr, &events, (void**)&source)) >= 0) {
- // Process this event.
- if (source != nullptr) {
- source->process(state, source);
- }
-
- // Check if we are exiting.
- if (state->destroyRequested != 0) {
- return;
- }
-
- }
-
- if (visualBenchState.fWindow) {
- if (visualBenchState.fWindow->destroyRequested()) {
- visualBenchState.fState = kDestroyRequested_State;
- } else {
- visualBenchState.fWindow->update(nullptr);
- }
- }
-
- if (kDestroyRequested_State == visualBenchState.fState) {
- delete visualBenchState.fWindow;
- visualBenchState.fWindow = nullptr;
- application_term();
- ANativeActivity_finish(state->activity);
- visualBenchState.fState = kFinished_State;
- }
- }
-}
diff --git a/platform_tools/android/apps/visualbenchsdl/build.gradle b/platform_tools/android/apps/visualbenchsdl/build.gradle
deleted file mode 100644
index e64e43e..0000000
--- a/platform_tools/android/apps/visualbenchsdl/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 19
- buildToolsVersion "22.0.1"
-
- defaultConfig {
- applicationId "com.skia.visualbench"
- minSdkVersion 19
- signingConfig signingConfigs.debug
- targetSdkVersion 19
- versionCode 1
- versionName "1.0"
- }
-
- sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
- sourceSets.main.jniLibs.srcDir "src/main/libs"
-
- productFlavors {
- arm {}
- arm64 {}
- x86 {}
- x86_64 {}
- mips {}
- mips64 {}
- }
-
- // make sure that app is built and shared libraries are copied to correct directories
- setupSkiaLibraryBuild(project, applicationVariants, "CopyVisualBenchDeps")
-}
diff --git a/platform_tools/android/apps/visualbenchsdl/src/main/AndroidManifest.xml b/platform_tools/android/apps/visualbenchsdl/src/main/AndroidManifest.xml
deleted file mode 100644
index 2bb9eca..0000000
--- a/platform_tools/android/apps/visualbenchsdl/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- BEGIN_INCLUDE(manifest) -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.skia"
- android:versionCode="1"
- android:versionName="1.0">
-
- <!-- This is the platform API where NativeActivity was introduced. -->
- <uses-sdk android:minSdkVersion="19" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <application android:label="VisualBenchActivity">
- <activity android:name=".VisualBenchActivity"
- android:label="VisualBenchActivity"
- android:configChanges="orientation|keyboardHidden"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- <meta-data android:name="android.app.lib_name"
- android:value="visualbench" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
-<!-- END_INCLUDE(manifest) -->
diff --git a/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchActivity.java b/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchActivity.java
deleted file mode 100644
index 894a9b3..0000000
--- a/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchActivity.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-package com.skia;
-
-import org.libsdl.app.SDLActivity;
-
-import android.content.Intent;
-
-public class VisualBenchActivity extends SDLActivity {
- protected String[] getArguments() {
- String flags = this.getIntent().getStringExtra("cmdLineFlags");
- if (flags != null && !flags.isEmpty()) {
- return flags.split("\\s+");
- }
- return new String[0];
- }
-}
diff --git a/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchTestActivity.java b/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchTestActivity.java
deleted file mode 100644
index 48507be..0000000
--- a/platform_tools/android/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchTestActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-package com.skia;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.test.ActivityUnitTestCase;
-import android.util.Log;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.lang.StringBuilder;
-
-public class VisualBenchTestActivity extends ActivityUnitTestCase<VisualBenchActivity> {
- private VisualBenchActivity mActivity;
- private Instrumentation mInstrumentation;
-
- public VisualBenchTestActivity() {
- super(VisualBenchActivity.class);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- mInstrumentation = getInstrumentation();
- }
-
- private String getFlags() throws IOException {
- InputStream s = getInstrumentation().getTargetContext().getResources().getAssets().open("nanobench_flags.txt");
- BufferedReader r = new BufferedReader(new InputStreamReader(s));
- StringBuilder flags = new StringBuilder();
- String sep = System.getProperty("line.separator");
- String line;
- while ((line = r.readLine()) != null) {
- flags.append(line);
- flags.append(sep);
- }
- s.close();
- return flags.toString();
- }
-
- public void testVisualBench() throws InterruptedException, IOException {
- String pkg = getInstrumentation().getTargetContext().getPackageName();
- Intent intent = new Intent(getInstrumentation().getTargetContext(),
- VisualBenchActivity.class);
- String args = getFlags();
- intent.putExtra("cmdLineFlags", args);
- mActivity = launchActivityWithIntent(pkg, VisualBenchActivity.class, intent);
-
- assertNotNull("mActivity is null", mActivity);
- Thread.sleep(5000);
- while (!mActivity.isDestroyed()) {
- Log.d("skiatest", "Waiting for subprocess to finish.");
- Thread.sleep(1000);
- }
- }
-}
diff --git a/platform_tools/android/apps/visualbenchsdl/src/main/java/org/libsdl/app/SDLActivity.java b/platform_tools/android/apps/visualbenchsdl/src/main/java/org/libsdl/app/SDLActivity.java
deleted file mode 100644
index 5c5171b..0000000
--- a/platform_tools/android/apps/visualbenchsdl/src/main/java/org/libsdl/app/SDLActivity.java
+++ /dev/null
@@ -1,1684 +0,0 @@
-/*
- * SDL License
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
-
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- *
- */
-
-// This file comes from SDL, but it has been modified to pull Skia's libraries
-
-package org.libsdl.app;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.lang.reflect.Method;
-
-import android.app.*;
-import android.content.*;
-import android.text.InputType;
-import android.view.*;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AbsoluteLayout;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.os.*;
-import android.util.Log;
-import android.util.SparseArray;
-import android.graphics.*;
-import android.graphics.drawable.Drawable;
-import android.media.*;
-import android.hardware.*;
-import android.content.pm.ActivityInfo;
-
-/**
- SDL Activity
-*/
-public class SDLActivity extends Activity {
- private static final String TAG = "SDL";
-
- // Keep track of the paused state
- public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
- public static boolean mExitCalledFromJava;
-
- /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
- public static boolean mBrokenLibraries;
-
- // If we want to separate mouse and touch events.
- // This is only toggled in native code when a hint is set!
- public static boolean mSeparateMouseAndTouch;
-
- // Main components
- protected static SDLActivity mSingleton;
- protected static SDLSurface mSurface;
- protected static View mTextEdit;
- protected static ViewGroup mLayout;
- protected static SDLJoystickHandler mJoystickHandler;
-
- // This is what SDL runs in. It invokes SDL_main(), eventually
- protected static Thread mSDLThread;
-
- // Audio
- protected static AudioTrack mAudioTrack;
-
- /**
- * This method is called by SDL before loading the native shared libraries.
- * It can be overridden to provide names of shared libraries to be loaded.
- * The default implementation returns the defaults. It never returns null.
- * An array returned by a new implementation must at least contain "SDL2".
- * Also keep in mind that the order the libraries are loaded may matter.
- * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
- */
- protected String[] getLibraries() {
- return new String[] {
- //"SDL2",
- // "SDL2_image",
- // "SDL2_mixer",
- // "SDL2_net",
- // "SDL2_ttf",
- "skia_android",
- "visualbench"
- };
- }
-
- // Load the .so
- public void loadLibraries() {
- for (String lib : getLibraries()) {
- System.loadLibrary(lib);
- }
- }
-
- /**
- * This method is called by SDL before starting the native application thread.
- * It can be overridden to provide the arguments after the application name.
- * The default implementation returns an empty array. It never returns null.
- * @return arguments for the native application.
- */
- protected String[] getArguments() {
- return new String[0];
- }
-
- public static void initialize() {
- // The static nature of the singleton and Android quirkyness force us to initialize everything here
- // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
- mSingleton = null;
- mSurface = null;
- mTextEdit = null;
- mLayout = null;
- mJoystickHandler = null;
- mSDLThread = null;
- mAudioTrack = null;
- mExitCalledFromJava = false;
- mBrokenLibraries = false;
- mIsPaused = false;
- mIsSurfaceReady = false;
- mHasFocus = true;
- }
-
- // Setup
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- Log.v(TAG, "Device: " + android.os.Build.DEVICE);
- Log.v(TAG, "Model: " + android.os.Build.MODEL);
- Log.v(TAG, "onCreate(): " + mSingleton);
- super.onCreate(savedInstanceState);
-
- SDLActivity.initialize();
- // So we can call stuff from static callbacks
- mSingleton = this;
-
- // Load shared libraries
- String errorMsgBrokenLib = "";
- try {
- loadLibraries();
- } catch(UnsatisfiedLinkError e) {
- System.err.println(e.getMessage());
- mBrokenLibraries = true;
- errorMsgBrokenLib = e.getMessage();
- } catch(Exception e) {
- System.err.println(e.getMessage());
- mBrokenLibraries = true;
- errorMsgBrokenLib = e.getMessage();
- }
-
- if (mBrokenLibraries)
- {
- AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this);
- dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
- + System.getProperty("line.separator")
- + System.getProperty("line.separator")
- + "Error: " + errorMsgBrokenLib);
- dlgAlert.setTitle("SDL Error");
- dlgAlert.setPositiveButton("Exit",
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog,int id) {
- // if this button is clicked, close current activity
- SDLActivity.mSingleton.finish();
- }
- });
- dlgAlert.setCancelable(false);
- dlgAlert.create().show();
-
- return;
- }
-
- // Set up the surface
- mSurface = new SDLSurface(getApplication());
-
- if(Build.VERSION.SDK_INT >= 12) {
- mJoystickHandler = new SDLJoystickHandler_API12();
- }
- else {
- mJoystickHandler = new SDLJoystickHandler();
- }
-
- mLayout = new AbsoluteLayout(this);
- mLayout.addView(mSurface);
-
- setContentView(mLayout);
-
- // Get filename from "Open with" of another application
- Intent intent = getIntent();
-
- if (intent != null && intent.getData() != null) {
- String filename = intent.getData().getPath();
- if (filename != null) {
- Log.v(TAG, "Got filename: " + filename);
- SDLActivity.onNativeDropFile(filename);
- }
- }
- }
-
- // Events
- @Override
- protected void onPause() {
- Log.v(TAG, "onPause()");
- super.onPause();
-
- if (SDLActivity.mBrokenLibraries) {
- return;
- }
-
- SDLActivity.handlePause();
- }
-
- @Override
- protected void onResume() {
- Log.v(TAG, "onResume()");
- super.onResume();
-
- if (SDLActivity.mBrokenLibraries) {
- return;
- }
-
- SDLActivity.handleResume();
- }
-
-
- @Override
- public void onWindowFocusChanged(boolean hasFocus) {
- super.onWindowFocusChanged(hasFocus);
- Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
-
- if (SDLActivity.mBrokenLibraries) {
- return;
- }
-
- SDLActivity.mHasFocus = hasFocus;
- if (hasFocus) {
- SDLActivity.handleResume();
- }
- }
-
- @Override
- public void onLowMemory() {
- Log.v(TAG, "onLowMemory()");
- super.onLowMemory();
-
- if (SDLActivity.mBrokenLibraries) {
- return;
- }
-
- SDLActivity.nativeLowMemory();
- }
-
- @Override
- protected void onDestroy() {
- Log.v(TAG, "onDestroy()");
-
- if (SDLActivity.mBrokenLibraries) {
- super.onDestroy();
- // Reset everything in case the user re opens the app
- SDLActivity.initialize();
- return;
- }
-
- // Send a quit message to the application
- SDLActivity.mExitCalledFromJava = true;
- SDLActivity.nativeQuit();
-
- // Now wait for the SDL thread to quit
- if (SDLActivity.mSDLThread != null) {
- try {
- SDLActivity.mSDLThread.join();
- } catch(Exception e) {
- Log.v(TAG, "Problem stopping thread: " + e);
- }
- SDLActivity.mSDLThread = null;
-
- //Log.v(TAG, "Finished waiting for SDL thread");
- }
-
- super.onDestroy();
- // Reset everything in case the user re opens the app
- SDLActivity.initialize();
- }
-
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
-
- if (SDLActivity.mBrokenLibraries) {
- return false;
- }
-
- int keyCode = event.getKeyCode();
- // Ignore certain special keys so they're handled by Android
- if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
- keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
- keyCode == KeyEvent.KEYCODE_CAMERA ||
- keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
- keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
- ) {
- return false;
- }
- return super.dispatchKeyEvent(event);
- }
-
- /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
- * is the first to be called, mIsSurfaceReady should still be set
- * to 'true' during the call to onPause (in a usual scenario).
- */
- public static void handlePause() {
- if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
- SDLActivity.mIsPaused = true;
- SDLActivity.nativePause();
- mSurface.handlePause();
- }
- }
-
- /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
- * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
- * every time we get one of those events, only if it comes after surfaceDestroyed
- */
- public static void handleResume() {
- if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
- SDLActivity.mIsPaused = false;
- SDLActivity.nativeResume();
- mSurface.handleResume();
- }
- }
-
- /* The native thread has finished */
- public static void handleNativeExit() {
- SDLActivity.mSDLThread = null;
- mSingleton.finish();
- }
-
-
- // Messages from the SDLMain thread
- static final int COMMAND_CHANGE_TITLE = 1;
- static final int COMMAND_UNUSED = 2;
- static final int COMMAND_TEXTEDIT_HIDE = 3;
- static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
-
- protected static final int COMMAND_USER = 0x8000;
-
- /**
- * This method is called by SDL if SDL did not handle a message itself.
- * This happens if a received message contains an unsupported command.
- * Method can be overwritten to handle Messages in a different class.
- * @param command the command of the message.
- * @param param the parameter of the message. May be null.
- * @return if the message was handled in overridden method.
- */
- protected boolean onUnhandledMessage(int command, Object param) {
- return false;
- }
-
- /**
- * A Handler class for Messages from native SDL applications.
- * It uses current Activities as target (e.g. for the title).
- * static to prevent implicit references to enclosing object.
- */
- protected static class SDLCommandHandler extends Handler {
- @Override
- public void handleMessage(Message msg) {
- Context context = getContext();
- if (context == null) {
- Log.e(TAG, "error handling message, getContext() returned null");
- return;
- }
- switch (msg.arg1) {
- case COMMAND_CHANGE_TITLE:
- if (context instanceof Activity) {
- ((Activity) context).setTitle((String)msg.obj);
- } else {
- Log.e(TAG, "error handling message, getContext() returned no Activity");
- }
- break;
- case COMMAND_TEXTEDIT_HIDE:
- if (mTextEdit != null) {
- mTextEdit.setVisibility(View.GONE);
-
- InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
- }
- break;
- case COMMAND_SET_KEEP_SCREEN_ON:
- {
- Window window = ((Activity) context).getWindow();
- if (window != null) {
- if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) {
- window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- } else {
- window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
- }
- break;
- }
- default:
- if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
- Log.e(TAG, "error handling message, command is " + msg.arg1);
- }
- }
- }
- }
-
- // Handler for the messages
- Handler commandHandler = new SDLCommandHandler();
-
- // Send a message from the SDLMain thread
- boolean sendCommand(int command, Object data) {
- Message msg = commandHandler.obtainMessage();
- msg.arg1 = command;
- msg.obj = data;
- return commandHandler.sendMessage(msg);
- }
-
- // C functions we call
- public static native int nativeInit(Object arguments);
- public static native void nativeLowMemory();
- public static native void nativeQuit();
- public static native void nativePause();
- public static native void nativeResume();
- public static native void onNativeDropFile(String filename);
- public static native void onNativeResize(int x, int y, int format, float rate);
- public static native int onNativePadDown(int device_id, int keycode);
- public static native int onNativePadUp(int device_id, int keycode);
- public static native void onNativeJoy(int device_id, int axis,
- float value);
- public static native void onNativeHat(int device_id, int hat_id,
- int x, int y);
- public static native void onNativeKeyDown(int keycode);
- public static native void onNativeKeyUp(int keycode);
- public static native void onNativeKeyboardFocusLost();
- public static native void onNativeMouse(int button, int action, float x, float y);
- public static native void onNativeTouch(int touchDevId, int pointerFingerId,
- int action, float x,
- float y, float p);
- public static native void onNativeAccel(float x, float y, float z);
- public static native void onNativeSurfaceChanged();
- public static native void onNativeSurfaceDestroyed();
- public static native int nativeAddJoystick(int device_id, String name,
- int is_accelerometer, int nbuttons,
- int naxes, int nhats, int nballs);
- public static native int nativeRemoveJoystick(int device_id);
- public static native String nativeGetHint(String name);
-
- /**
- * This method is called by SDL using JNI.
- */
- public static boolean setActivityTitle(String title) {
- // Called from SDLMain() thread and can't directly affect the view
- return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static boolean sendMessage(int command, int param) {
- return mSingleton.sendCommand(command, Integer.valueOf(param));
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static Context getContext() {
- return mSingleton;
- }
-
- /**
- * This method is called by SDL using JNI.
- * @return result of getSystemService(name) but executed on UI thread.
- */
- public Object getSystemServiceFromUiThread(final String name) {
- final Object lock = new Object();
- final Object[] results = new Object[2]; // array for writable variables
- synchronized (lock) {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- synchronized (lock) {
- results[0] = getSystemService(name);
- results[1] = Boolean.TRUE;
- lock.notify();
- }
- }
- });
- if (results[1] == null) {
- try {
- lock.wait();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- }
- }
- }
- return results[0];
- }
-
- static class ShowTextInputTask implements Runnable {
- /*
- * This is used to regulate the pan&scan method to have some offset from
- * the bottom edge of the input region and the top edge of an input
- * method (soft keyboard)
- */
- static final int HEIGHT_PADDING = 15;
-
- public int x, y, w, h;
-
- public ShowTextInputTask(int x, int y, int w, int h) {
- this.x = x;
- this.y = y;
- this.w = w;
- this.h = h;
- }
-
- @Override
- public void run() {
- AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
- w, h + HEIGHT_PADDING, x, y);
-
- if (mTextEdit == null) {
- mTextEdit = new DummyEdit(getContext());
-
- mLayout.addView(mTextEdit, params);
- } else {
- mTextEdit.setLayoutParams(params);
- }
-
- mTextEdit.setVisibility(View.VISIBLE);
- mTextEdit.requestFocus();
-
- InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.showSoftInput(mTextEdit, 0);
- }
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static boolean showTextInput(int x, int y, int w, int h) {
- // Transfer the task to the main thread as a Runnable
- return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static Surface getNativeSurface() {
- return SDLActivity.mSurface.getNativeSurface();
- }
-
- // Audio
-
- /**
- * This method is called by SDL using JNI.
- */
- public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
- int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
- int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
- int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
-
- Log.v(TAG, "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
-
- // Let the user pick a larger buffer if they really want -- but ye
- // gods they probably shouldn't, the minimums are horrifyingly high
- // latency already
- desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
-
- if (mAudioTrack == null) {
- mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
- channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
-
- // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
- // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
- // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
-
- if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
- Log.e(TAG, "Failed during initialization of Audio Track");
- mAudioTrack = null;
- return -1;
- }
-
- mAudioTrack.play();
- }
-
- Log.v(TAG, "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
-
- return 0;
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static void audioWriteShortBuffer(short[] buffer) {
- for (int i = 0; i < buffer.length; ) {
- int result = mAudioTrack.write(buffer, i, buffer.length - i);
- if (result > 0) {
- i += result;
- } else if (result == 0) {
- try {
- Thread.sleep(1);
- } catch(InterruptedException e) {
- // Nom nom
- }
- } else {
- Log.w(TAG, "SDL audio: error return from write(short)");
- return;
- }
- }
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static void audioWriteByteBuffer(byte[] buffer) {
- for (int i = 0; i < buffer.length; ) {
- int result = mAudioTrack.write(buffer, i, buffer.length - i);
- if (result > 0) {
- i += result;
- } else if (result == 0) {
- try {
- Thread.sleep(1);
- } catch(InterruptedException e) {
- // Nom nom
- }
- } else {
- Log.w(TAG, "SDL audio: error return from write(byte)");
- return;
- }
- }
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static void audioQuit() {
- if (mAudioTrack != null) {
- mAudioTrack.stop();
- mAudioTrack = null;
- }
- }
-
- // Input
-
- /**
- * This method is called by SDL using JNI.
- * @return an array which may be empty but is never null.
- */
- public static int[] inputGetInputDeviceIds(int sources) {
- int[] ids = InputDevice.getDeviceIds();
- int[] filtered = new int[ids.length];
- int used = 0;
- for (int i = 0; i < ids.length; ++i) {
- InputDevice device = InputDevice.getDevice(ids[i]);
- if ((device != null) && ((device.getSources() & sources) != 0)) {
- filtered[used++] = device.getId();
- }
- }
- return Arrays.copyOf(filtered, used);
- }
-
- // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
- public static boolean handleJoystickMotionEvent(MotionEvent event) {
- return mJoystickHandler.handleMotionEvent(event);
- }
-
- /**
- * This method is called by SDL using JNI.
- */
- public static void pollInputDevices() {
- if (SDLActivity.mSDLThread != null) {
- mJoystickHandler.pollInputDevices();
- }
- }
-
- // APK expansion files support
-
- /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
- private Object expansionFile;
-
- /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */
- private Method expansionFileMethod;
-
- /**
- * This method was called by SDL using JNI.
- * @deprecated because of an incorrect name
- */
- @Deprecated
- public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
- return openAPKExpansionInputStream(fileName);
- }
-
- /**
- * This method is called by SDL using JNI.
- * @return an InputStream on success or null if no expansion file was used.
- * @throws IOException on errors. Message is set for the SDL error message.
- */
- public InputStream openAPKExpansionInputStream(String fileName) throws IOException {
- // Get a ZipResourceFile representing a merger of both the main and patch files
- if (expansionFile == null) {
- String mainHint = nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION");
- if (mainHint == null) {
- return null; // no expansion use if no main version was set
- }
- String patchHint = nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION");
- if (patchHint == null) {
- return null; // no expansion use if no patch version was set
- }
-
- Integer mainVersion;
- Integer patchVersion;
- try {
- mainVersion = Integer.valueOf(mainHint);
- patchVersion = Integer.valueOf(patchHint);
- } catch (NumberFormatException ex) {
- ex.printStackTrace();
- throw new IOException("No valid file versions set for APK expansion files", ex);
- }
-
- try {
- // To avoid direct dependency on Google APK expansion library that is
- // not a part of Android SDK we access it using reflection
- expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
- .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
- .invoke(null, this, mainVersion, patchVersion);
-
- expansionFileMethod = expansionFile.getClass()
- .getMethod("getInputStream", String.class);
- } catch (Exception ex) {
- ex.printStackTrace();
- expansionFile = null;
- expansionFileMethod = null;
- throw new IOException("Could not access APK expansion support library", ex);
- }
- }
-
- // Get an input stream for a known file inside the expansion file ZIPs
- InputStream fileStream;
- try {
- fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName);
- } catch (Exception ex) {
- // calling "getInputStream" failed
- ex.printStackTrace();
- throw new IOException("Could not open stream from APK expansion file", ex);
- }
-
- if (fileStream == null) {
- // calling "getInputStream" was successful but null was returned
- throw new IOException("Could not find path in APK expansion file");
- }
-
- return fileStream;
- }
-
- // Messagebox
-
- /** Result of current messagebox. Also used for blocking the calling thread. */
- protected final int[] messageboxSelection = new int[1];
-
- /** Id of current dialog. */
- protected int dialogs = 0;
-
- /**
- * This method is called by SDL using JNI.
- * Shows the messagebox from UI thread and block calling thread.
- * buttonFlags, buttonIds and buttonTexts must have same length.
- * @param buttonFlags array containing flags for every button.
- * @param buttonIds array containing id for every button.
- * @param buttonTexts array containing text for every button.
- * @param colors null for default or array of length 5 containing colors.
- * @return button id or -1.
- */
- public int messageboxShowMessageBox(
- final int flags,
- final String title,
- final String message,
- final int[] buttonFlags,
- final int[] buttonIds,
- final String[] buttonTexts,
- final int[] colors) {
-
- messageboxSelection[0] = -1;
-
- // sanity checks
-
- if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
- return -1; // implementation broken
- }
-
- // collect arguments for Dialog
-
- final Bundle args = new Bundle();
- args.putInt("flags", flags);
- args.putString("title", title);
- args.putString("message", message);
- args.putIntArray("buttonFlags", buttonFlags);
- args.putIntArray("buttonIds", buttonIds);
- args.putStringArray("buttonTexts", buttonTexts);
- args.putIntArray("colors", colors);
-
- // trigger Dialog creation on UI thread
-
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- showDialog(dialogs++, args);
- }
- });
-
- // block the calling thread
-
- synchronized (messageboxSelection) {
- try {
- messageboxSelection.wait();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- return -1;
- }
- }
-
- // return selected value
-
- return messageboxSelection[0];
- }
-
- @Override
- protected Dialog onCreateDialog(int ignore, Bundle args) {
-
- // TODO set values from "flags" to messagebox dialog
-
- // get colors
-
- int[] colors = args.getIntArray("colors");
- int backgroundColor;
- int textColor;
- int buttonBorderColor;
- int buttonBackgroundColor;
- int buttonSelectedColor;
- if (colors != null) {
- int i = -1;
- backgroundColor = colors[++i];
- textColor = colors[++i];
- buttonBorderColor = colors[++i];
- buttonBackgroundColor = colors[++i];
- buttonSelectedColor = colors[++i];
- } else {
- backgroundColor = Color.TRANSPARENT;
- textColor = Color.TRANSPARENT;
- buttonBorderColor = Color.TRANSPARENT;
- buttonBackgroundColor = Color.TRANSPARENT;
- buttonSelectedColor = Color.TRANSPARENT;
- }
-
- // create dialog with title and a listener to wake up calling thread
-
- final Dialog dialog = new Dialog(this);
- dialog.setTitle(args.getString("title"));
- dialog.setCancelable(false);
- dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface unused) {
- synchronized (messageboxSelection) {
- messageboxSelection.notify();
- }
- }
- });
-
- // create text
-
- TextView message = new TextView(this);
- message.setGravity(Gravity.CENTER);
- message.setText(args.getString("message"));
- if (textColor != Color.TRANSPARENT) {
- message.setTextColor(textColor);
- }
-
- // create buttons
-
- int[] buttonFlags = args.getIntArray("buttonFlags");
- int[] buttonIds = args.getIntArray("buttonIds");
- String[] buttonTexts = args.getStringArray("buttonTexts");
-
- final SparseArray<Button> mapping = new SparseArray<Button>();
-
- LinearLayout buttons = new LinearLayout(this);
- buttons.setOrientation(LinearLayout.HORIZONTAL);
- buttons.setGravity(Gravity.CENTER);
- for (int i = 0; i < buttonTexts.length; ++i) {
- Button button = new Button(this);
- final int id = buttonIds[i];
- button.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- messageboxSelection[0] = id;
- dialog.dismiss();
- }
- });
- if (buttonFlags[i] != 0) {
- // see SDL_messagebox.h
- if ((buttonFlags[i] & 0x00000001) != 0) {
- mapping.put(KeyEvent.KEYCODE_ENTER, button);
- }
- if ((buttonFlags[i] & 0x00000002) != 0) {
- mapping.put(111, button); /* API 11: KeyEvent.KEYCODE_ESCAPE */
- }
- }
- button.setText(buttonTexts[i]);
- if (textColor != Color.TRANSPARENT) {
- button.setTextColor(textColor);
- }
- if (buttonBorderColor != Color.TRANSPARENT) {
- // TODO set color for border of messagebox button
- }
- if (buttonBackgroundColor != Color.TRANSPARENT) {
- Drawable drawable = button.getBackground();
- if (drawable == null) {
- // setting the color this way removes the style
- button.setBackgroundColor(buttonBackgroundColor);
- } else {
- // setting the color this way keeps the style (gradient, padding, etc.)
- drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
- }
- }
- if (buttonSelectedColor != Color.TRANSPARENT) {
- // TODO set color for selected messagebox button
- }
- buttons.addView(button);
- }
-
- // create content
-
- LinearLayout content = new LinearLayout(this);
- content.setOrientation(LinearLayout.VERTICAL);
- content.addView(message);
- content.addView(buttons);
- if (backgroundColor != Color.TRANSPARENT) {
- content.setBackgroundColor(backgroundColor);
- }
-
- // add content to dialog and return
-
- dialog.setContentView(content);
- dialog.setOnKeyListener(new Dialog.OnKeyListener() {
- @Override
- public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
- Button button = mapping.get(keyCode);
- if (button != null) {
- if (event.getAction() == KeyEvent.ACTION_UP) {
- button.performClick();
- }
- return true; // also for ignored actions
- }
- return false;
- }
- });
-
- return dialog;
- }
-}
-
-/**
- Simple nativeInit() runnable
-*/
-class SDLMain implements Runnable {
- @Override
- public void run() {
- // Runs SDL_main()
- SDLActivity.nativeInit(SDLActivity.mSingleton.getArguments());
-
- Log.v("SDL", "SDL thread terminated");
- }
-}
-
-
-/**
- SDLSurface. This is what we draw on, so we need to know when it's created
- in order to do anything useful.
-
- Because of this, that's where we set up the SDL thread
-*/
-class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
- View.OnKeyListener, View.OnTouchListener, SensorEventListener {
-
- // Sensors
- protected static SensorManager mSensorManager;
- protected static Display mDisplay;
-
- // Keep track of the surface size to normalize touch events
- protected static float mWidth, mHeight;
-
- // Startup
- public SDLSurface(Context context) {
- super(context);
- getHolder().addCallback(this);
-
- setFocusable(true);
- setFocusableInTouchMode(true);
- requestFocus();
- setOnKeyListener(this);
- setOnTouchListener(this);
-
- mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
- mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
-
- if(Build.VERSION.SDK_INT >= 12) {
- setOnGenericMotionListener(new SDLGenericMotionListener_API12());
- }
-
- // Some arbitrary defaults to avoid a potential division by zero
- mWidth = 1.0f;
- mHeight = 1.0f;
- }
-
- public void handlePause() {
- enableSensor(Sensor.TYPE_ACCELEROMETER, false);
- }
-
- public void handleResume() {
- setFocusable(true);
- setFocusableInTouchMode(true);
- requestFocus();
- setOnKeyListener(this);
- setOnTouchListener(this);
- enableSensor(Sensor.TYPE_ACCELEROMETER, true);
- }
-
- public Surface getNativeSurface() {
- return getHolder().getSurface();
- }
-
- // Called when we have a valid drawing surface
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- Log.v("SDL", "surfaceCreated()");
- holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
- }
-
- // Called when we lose the surface
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
- Log.v("SDL", "surfaceDestroyed()");
- // Call this *before* setting mIsSurfaceReady to 'false'
- SDLActivity.handlePause();
- SDLActivity.mIsSurfaceReady = false;
- SDLActivity.onNativeSurfaceDestroyed();
- }
-
- // Called when the surface is resized
- @Override
- public void surfaceChanged(SurfaceHolder holder,
- int format, int width, int height) {
- Log.v("SDL", "surfaceChanged()");
-
- int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
- switch (format) {
- case PixelFormat.A_8:
- Log.v("SDL", "pixel format A_8");
- break;
- case PixelFormat.LA_88:
- Log.v("SDL", "pixel format LA_88");
- break;
- case PixelFormat.L_8:
- Log.v("SDL", "pixel format L_8");
- break;
- case PixelFormat.RGBA_4444:
- Log.v("SDL", "pixel format RGBA_4444");
- sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
- break;
- case PixelFormat.RGBA_5551:
- Log.v("SDL", "pixel format RGBA_5551");
- sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
- break;
- case PixelFormat.RGBA_8888:
- Log.v("SDL", "pixel format RGBA_8888");
- sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
- break;
- case PixelFormat.RGBX_8888:
- Log.v("SDL", "pixel format RGBX_8888");
- sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
- break;
- case PixelFormat.RGB_332:
- Log.v("SDL", "pixel format RGB_332");
- sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
- break;
- case PixelFormat.RGB_565:
- Log.v("SDL", "pixel format RGB_565");
- sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
- break;
- case PixelFormat.RGB_888:
- Log.v("SDL", "pixel format RGB_888");
- // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
- sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
- break;
- default:
- Log.v("SDL", "pixel format unknown " + format);
- break;
- }
-
- mWidth = width;
- mHeight = height;
- SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
- Log.v("SDL", "Window size: " + width + "x" + height);
-
-
- boolean skip = false;
- int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
-
- if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
- {
- // Accept any
- }
- else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
- {
- if (mWidth > mHeight) {
- skip = true;
- }
- } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
- if (mWidth < mHeight) {
- skip = true;
- }
- }
-
- // Special Patch for Square Resolution: Black Berry Passport
- if (skip) {
- double min = Math.min(mWidth, mHeight);
- double max = Math.max(mWidth, mHeight);
-
- if (max / min < 1.20) {
- Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
- skip = false;
- }
- }
-
- if (skip) {
- Log.v("SDL", "Skip .. Surface is not ready.");
- return;
- }
-
-
- // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
- SDLActivity.mIsSurfaceReady = true;
- SDLActivity.onNativeSurfaceChanged();
-
-
- if (SDLActivity.mSDLThread == null) {
- // This is the entry point to the C app.
- // Start up the C app thread and enable sensor input for the first time
-
- final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
- enableSensor(Sensor.TYPE_ACCELEROMETER, true);
- sdlThread.start();
-
- // Set up a listener thread to catch when the native thread ends
- SDLActivity.mSDLThread = new Thread(new Runnable(){
- @Override
- public void run(){
- try {
- sdlThread.join();
- }
- catch(Exception e){}
- finally{
- // Native thread has finished
- if (! SDLActivity.mExitCalledFromJava) {
- SDLActivity.handleNativeExit();
- }
- }
- }
- }, "SDLThreadListener");
- SDLActivity.mSDLThread.start();
- }
-
- if (SDLActivity.mHasFocus) {
- SDLActivity.handleResume();
- }
- }
-
- // Key events
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // Dispatch the different events depending on where they come from
- // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
- // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
-
- if ( (event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 ||
- (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
- return true;
- }
- } else if (event.getAction() == KeyEvent.ACTION_UP) {
- if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
- return true;
- }
- }
- }
-
- if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- //Log.v("SDL", "key down: " + keyCode);
- SDLActivity.onNativeKeyDown(keyCode);
- return true;
- }
- else if (event.getAction() == KeyEvent.ACTION_UP) {
- //Log.v("SDL", "key up: " + keyCode);
- SDLActivity.onNativeKeyUp(keyCode);
- return true;
- }
- }
-
- return false;
- }
-
- // Touch events
- @Override
- public boolean onTouch(View v, MotionEvent event) {
- /* Ref: http://developer.android.com/training/gestures/multi.html */
- final int touchDevId = event.getDeviceId();
- final int pointerCount = event.getPointerCount();
- int action = event.getActionMasked();
- int pointerFingerId;
- int mouseButton;
- int i = -1;
- float x,y,p;
-
- // !!! FIXME: dump this SDK check after 2.0.4 ships and require API14.
- if (event.getSource() == InputDevice.SOURCE_MOUSE && SDLActivity.mSeparateMouseAndTouch) {
- if (Build.VERSION.SDK_INT < 14) {
- mouseButton = 1; // For Android==12 all mouse buttons are the left button
- } else {
- try {
- mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
- } catch(Exception e) {
- mouseButton = 1; // oh well.
- }
- }
- SDLActivity.onNativeMouse(mouseButton, action, event.getX(0), event.getY(0));
- } else {
- switch(action) {
- case MotionEvent.ACTION_MOVE:
- for (i = 0; i < pointerCount; i++) {
- pointerFingerId = event.getPointerId(i);
- x = event.getX(i) / mWidth;
- y = event.getY(i) / mHeight;
- p = event.getPressure(i);
- if (p > 1.0f) {
- // may be larger than 1.0f on some devices
- // see the documentation of getPressure(i)
- p = 1.0f;
- }
- SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
- }
- break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_DOWN:
- // Primary pointer up/down, the index is always zero
- i = 0;
- case MotionEvent.ACTION_POINTER_UP:
- case MotionEvent.ACTION_POINTER_DOWN:
- // Non primary pointer up/down
- if (i == -1) {
- i = event.getActionIndex();
- }
-
- pointerFingerId = event.getPointerId(i);
- x = event.getX(i) / mWidth;
- y = event.getY(i) / mHeight;
- p = event.getPressure(i);
- if (p > 1.0f) {
- // may be larger than 1.0f on some devices
- // see the documentation of getPressure(i)
- p = 1.0f;
- }
- SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
- break;
-
- case MotionEvent.ACTION_CANCEL:
- for (i = 0; i < pointerCount; i++) {
- pointerFingerId = event.getPointerId(i);
- x = event.getX(i) / mWidth;
- y = event.getY(i) / mHeight;
- p = event.getPressure(i);
- if (p > 1.0f) {
- // may be larger than 1.0f on some devices
- // see the documentation of getPressure(i)
- p = 1.0f;
- }
- SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
- }
- break;
-
- default:
- break;
- }
- }
-
- return true;
- }
-
- // Sensor events
- public void enableSensor(int sensortype, boolean enabled) {
- // TODO: This uses getDefaultSensor - what if we have >1 accels?
- if (enabled) {
- mSensorManager.registerListener(this,
- mSensorManager.getDefaultSensor(sensortype),
- SensorManager.SENSOR_DELAY_GAME, null);
- } else {
- mSensorManager.unregisterListener(this,
- mSensorManager.getDefaultSensor(sensortype));
- }
- }
-
- @Override
- public void onAccuracyChanged(Sensor sensor, int accuracy) {
- // TODO
- }
-
- @Override
- public void onSensorChanged(SensorEvent event) {
- if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
- float x, y;
- switch (mDisplay.getRotation()) {
- case Surface.ROTATION_90:
- x = -event.values[1];
- y = event.values[0];
- break;
- case Surface.ROTATION_270:
- x = event.values[1];
- y = -event.values[0];
- break;
- case Surface.ROTATION_180:
- x = -event.values[1];
- y = -event.values[0];
- break;
- default:
- x = event.values[0];
- y = event.values[1];
- break;
- }
- SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
- y / SensorManager.GRAVITY_EARTH,
- event.values[2] / SensorManager.GRAVITY_EARTH - 1);
- }
- }
-}
-
-/* This is a fake invisible editor view that receives the input and defines the
- * pan&scan region
- */
-class DummyEdit extends View implements View.OnKeyListener {
- InputConnection ic;
-
- public DummyEdit(Context context) {
- super(context);
- setFocusableInTouchMode(true);
- setFocusable(true);
- setOnKeyListener(this);
- }
-
- @Override
- public boolean onCheckIsTextEditor() {
- return true;
- }
-
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
-
- // This handles the hardware keyboard input
- if (event.isPrintingKey()) {
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
- }
- return true;
- }
-
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- SDLActivity.onNativeKeyDown(keyCode);
- return true;
- } else if (event.getAction() == KeyEvent.ACTION_UP) {
- SDLActivity.onNativeKeyUp(keyCode);
- return true;
- }
-
- return false;
- }
-
- //
- @Override
- public boolean onKeyPreIme (int keyCode, KeyEvent event) {
- // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
- // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
- // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
- // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
- // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
- // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
- if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
- if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
- SDLActivity.onNativeKeyboardFocusLost();
- }
- }
- return super.onKeyPreIme(keyCode, event);
- }
-
- @Override
- public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
- ic = new SDLInputConnection(this, true);
-
- outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
- outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
- | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
-
- return ic;
- }
-}
-
-class SDLInputConnection extends BaseInputConnection {
-
- public SDLInputConnection(View targetView, boolean fullEditor) {
- super(targetView, fullEditor);
-
- }
-
- @Override
- public boolean sendKeyEvent(KeyEvent event) {
-
- /*
- * This handles the keycodes from soft keyboard (and IME-translated
- * input from hardkeyboard)
- */
- int keyCode = event.getKeyCode();
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- if (event.isPrintingKey()) {
- commitText(String.valueOf((char) event.getUnicodeChar()), 1);
- }
- SDLActivity.onNativeKeyDown(keyCode);
- return true;
- } else if (event.getAction() == KeyEvent.ACTION_UP) {
-
- SDLActivity.onNativeKeyUp(keyCode);
- return true;
- }
- return super.sendKeyEvent(event);
- }
-
- @Override
- public boolean commitText(CharSequence text, int newCursorPosition) {
-
- nativeCommitText(text.toString(), newCursorPosition);
-
- return super.commitText(text, newCursorPosition);
- }
-
- @Override
- public boolean setComposingText(CharSequence text, int newCursorPosition) {
-
- nativeSetComposingText(text.toString(), newCursorPosition);
-
- return super.setComposingText(text, newCursorPosition);
- }
-
- public native void nativeCommitText(String text, int newCursorPosition);
-
- public native void nativeSetComposingText(String text, int newCursorPosition);
-
- @Override
- public boolean deleteSurroundingText(int beforeLength, int afterLength) {
- // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
- if (beforeLength == 1 && afterLength == 0) {
- // backspace
- return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
- && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
- }
-
- return super.deleteSurroundingText(beforeLength, afterLength);
- }
-}
-
-/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
-class SDLJoystickHandler {
-
- /**
- * Handles given MotionEvent.
- * @param event the event to be handled.
- * @return if given event was processed.
- */
- public boolean handleMotionEvent(MotionEvent event) {
- return false;
- }
-
- /**
- * Handles adding and removing of input devices.
- */
- public void pollInputDevices() {
- }
-}
-
-/* Actual joystick functionality available for API >= 12 devices */
-class SDLJoystickHandler_API12 extends SDLJoystickHandler {
-
- static class SDLJoystick {
- public int device_id;
- public String name;
- public ArrayList<InputDevice.MotionRange> axes;
- public ArrayList<InputDevice.MotionRange> hats;
- }
- static class RangeComparator implements Comparator<InputDevice.MotionRange> {
- @Override
- public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
- return arg0.getAxis() - arg1.getAxis();
- }
- }
-
- private ArrayList<SDLJoystick> mJoysticks;
-
- public SDLJoystickHandler_API12() {
-
- mJoysticks = new ArrayList<SDLJoystick>();
- }
-
- @Override
- public void pollInputDevices() {
- int[] deviceIds = InputDevice.getDeviceIds();
- // It helps processing the device ids in reverse order
- // For example, in the case of the XBox 360 wireless dongle,
- // so the first controller seen by SDL matches what the receiver
- // considers to be the first controller
-
- for(int i=deviceIds.length-1; i>-1; i--) {
- SDLJoystick joystick = getJoystick(deviceIds[i]);
- if (joystick == null) {
- joystick = new SDLJoystick();
- InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
-
- if (
- (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0
- ||
- (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_BUTTON) != 0
- )
- {
- joystick.device_id = deviceIds[i];
- joystick.name = joystickDevice.getName();
- joystick.axes = new ArrayList<InputDevice.MotionRange>();
- joystick.hats = new ArrayList<InputDevice.MotionRange>();
-
- List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
- Collections.sort(ranges, new RangeComparator());
- for (InputDevice.MotionRange range : ranges ) {
- if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
- if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
- range.getAxis() == MotionEvent.AXIS_HAT_Y) {
- joystick.hats.add(range);
- }
- else {
- joystick.axes.add(range);
- }
- }
- }
-
- mJoysticks.add(joystick);
- SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1,
- joystick.axes.size(), joystick.hats.size()/2, 0);
- }
- }
- }
-
- /* Check removed devices */
- ArrayList<Integer> removedDevices = new ArrayList<Integer>();
- for(int i=0; i < mJoysticks.size(); i++) {
- int device_id = mJoysticks.get(i).device_id;
- int j;
- for (j=0; j < deviceIds.length; j++) {
- if (device_id == deviceIds[j]) break;
- }
- if (j == deviceIds.length) {
- removedDevices.add(Integer.valueOf(device_id));
- }
- }
-
- for(int i=0; i < removedDevices.size(); i++) {
- int device_id = removedDevices.get(i).intValue();
- SDLActivity.nativeRemoveJoystick(device_id);
- for (int j=0; j < mJoysticks.size(); j++) {
- if (mJoysticks.get(j).device_id == device_id) {
- mJoysticks.remove(j);
- break;
- }
- }
- }
- }
-
- protected SDLJoystick getJoystick(int device_id) {
- for(int i=0; i < mJoysticks.size(); i++) {
- if (mJoysticks.get(i).device_id == device_id) {
- return mJoysticks.get(i);
- }
- }
- return null;
- }
-
- @Override
- public boolean handleMotionEvent(MotionEvent event) {
- if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
- int actionPointerIndex = event.getActionIndex();
- int action = event.getActionMasked();
- switch(action) {
- case MotionEvent.ACTION_MOVE:
- SDLJoystick joystick = getJoystick(event.getDeviceId());
- if ( joystick != null ) {
- for (int i = 0; i < joystick.axes.size(); i++) {
- InputDevice.MotionRange range = joystick.axes.get(i);
- /* Normalize the value to -1...1 */
- float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
- SDLActivity.onNativeJoy(joystick.device_id, i, value );
- }
- for (int i = 0; i < joystick.hats.size(); i+=2) {
- int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
- int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
- SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY );
- }
- }
- break;
- default:
- break;
- }
- }
- return true;
- }
-}
-
-class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
- // Generic Motion (mouse hover, joystick...) events go here
- @Override
- public boolean onGenericMotion(View v, MotionEvent event) {
- float x, y;
- int action;
-
- switch ( event.getSource() ) {
- case InputDevice.SOURCE_JOYSTICK:
- case InputDevice.SOURCE_GAMEPAD:
- case InputDevice.SOURCE_DPAD:
- SDLActivity.handleJoystickMotionEvent(event);
- return true;
-
- case InputDevice.SOURCE_MOUSE:
- action = event.getActionMasked();
- switch (action) {
- case MotionEvent.ACTION_SCROLL:
- x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
- y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
- SDLActivity.onNativeMouse(0, action, x, y);
- return true;
-
- case MotionEvent.ACTION_HOVER_MOVE:
- x = event.getX(0);
- y = event.getY(0);
-
- SDLActivity.onNativeMouse(0, action, x, y);
- return true;
-
- default:
- break;
- }
- break;
-
- default:
- break;
- }
-
- // Event was not managed
- return false;
- }
-}
diff --git a/platform_tools/android/bin/android_install_app b/platform_tools/android/bin/android_install_app
index 4b29b09..74aea51 100755
--- a/platform_tools/android/bin/android_install_app
+++ b/platform_tools/android/bin/android_install_app
@@ -9,7 +9,7 @@
echo " -h Prints this help message"
echo " --release Install the release build of Skia"
echo " -s [device_s/n] Serial number of the device to be used"
- echo " AppName Can be either SampleApp or VisualBench"
+ echo " AppName Can be either SampleApp or Viewer"
}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/platform_tools/android/bin/android_launch_app b/platform_tools/android/bin/android_launch_app
index e5fd54c..c1eb0b4 100755
--- a/platform_tools/android/bin/android_launch_app
+++ b/platform_tools/android/bin/android_launch_app
@@ -22,9 +22,9 @@
if [[ ${app} == 'SampleApp' ]]; then
activity="com.skia.sample_app/com.skia.SkiaSampleActivity"
elif [[ ${app} == "VisualBench" ]] ; then
- activity="com.skia.visualbench/com.skia.VisualBenchActivity"
+ activity="org.skia.viewer/org.skia.viewer.ViewerActivity"
else
- echo "ERROR: supports either 'SampleApp' or 'VisualBench' as valid apps"
+ echo "ERROR: supports either 'SampleApp' or 'Viewer' as valid apps"
exit 1
fi
$ADB ${DEVICE_SERIAL} shell "am start -S -n ${activity} --es cmdLineFlags \"${APP_ARGS[*]:1}\""
diff --git a/platform_tools/android/bin/android_run_app.go b/platform_tools/android/bin/android_run_app.go
deleted file mode 100644
index 53ae0fd..0000000
--- a/platform_tools/android/bin/android_run_app.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/*
- Run a Skia app to completion, piping the log to stdout.
-*/
-
-package main
-
-import (
- "flag"
- "fmt"
- "io"
- "os"
- "os/exec"
- "os/signal"
- "strconv"
- "strings"
- "time"
-
- "github.com/skia-dev/glog"
- "go.skia.org/infra/go/common"
-)
-
-const (
- COM_SKIA = "com.skia"
-)
-
-var (
- adbPath = flag.String("adb", "", "Path to the ADB executable.")
- app = flag.String("app", "VisualBench", "Name of the app to run.")
- serial = flag.String("s", "", "Serial number for the Android device to use.")
-)
-
-// Struct used for running ADB commands.
-type ADB struct {
- path string
- serial string
-}
-
-// ADBFromFlags returns an ADB instance based on flags passed to the program.
-func ADBFromFlags() *ADB {
- rv := &ADB{
- path: *adbPath,
- serial: *serial,
- }
- if rv.path == "" {
- rv.path = "adb"
- }
- return rv
-}
-
-// Cmd creates an exec.Cmd object for the given ADB command.
-func (adb *ADB) Cmd(log bool, args ...string) *exec.Cmd {
- cmd := []string{}
- if adb.serial != "" {
- cmd = append(cmd, "-s", adb.serial)
- }
- cmd = append(cmd, args...)
- if log {
- glog.Infof("Exec `%s %s`", adb.path, strings.Join(cmd, " "))
- }
- return exec.Command(adb.path, cmd...)
-}
-
-// KillSkia kills any running process.
-func (adb *ADB) Kill(proc string) error {
- return adb.Cmd(false, "shell", "am", "force-stop", proc).Run()
-}
-
-// PollSkia checks to see if the given process is running. If so, return the pid, otherwise return -1.
-func (adb *ADB) Poll(proc string) (int64, error) {
- output, err := adb.Cmd(false, "shell", "ps").Output()
- if err != nil {
- return -1, fmt.Errorf("Failed to check the running processes on the device: %v", err)
- }
- for _, line := range strings.Split(string(output), "\n") {
- if strings.Contains(line, proc) {
- fields := strings.Fields(line)
- pid, err := strconv.ParseInt(fields[1], 10, 32)
- if err != nil {
- return -1, fmt.Errorf("Failed to parse \"%s\" to an integer: %v", fields[1], err)
- }
- return pid, nil
- }
- }
- return -1, nil
-}
-
-// ReadLinesFromPipe reads from the given pipe and logs its output.
-func ReadLinesFromPipe(pipe io.Reader, lines chan string) {
- buf := []byte{}
-
- // writeLine recovers from a panic when writing to the channel.
- writeLine := func(s string) {
- defer func() {
- if r := recover(); r != nil {
- glog.Warningf("Panic writing to channel... are we exiting?")
- }
- }()
- lines <- s
- }
-
- // readLines reads output lines from the buffer and pushes them into the channel.
- readlines := func() {
- readIdx := 0
- // Read lines from buf.
- for i, b := range buf {
- if b == '\n' {
- s := string(buf[readIdx:i])
- writeLine(s)
- readIdx = i + 1
- }
- }
- // Remove the lines we read.
- buf = buf[readIdx:]
- }
-
- // Loop forever, reading bytes from the pipe.
- readbuf := make([]byte, 4096)
- for {
- read, err := pipe.Read(readbuf)
- if read > 0 {
- buf = append(buf, readbuf[:read]...)
-
- // Read lines from the buffers.
- readlines()
- }
- if err != nil {
- if err == io.EOF {
- break
- } else {
- glog.Error(err)
- }
- } else if read == 0 {
- time.Sleep(20 * time.Millisecond)
- }
- }
- // Read any remaining lines from the buffers.
- readlines()
- // "Flush" any incomplete lines from the buffers.
- writeLine(string(buf))
-}
-
-// RunApp launches the given app on the device, pipes its log output to stdout,
-// and returns when the app finishes running, with an error if the app did not
-// complete successfully.
-func RunApp(adb *ADB, appName string, args []string) error {
- // Kill any running instances of the app.
- if err := adb.Kill(COM_SKIA); err != nil {
- return fmt.Errorf("Failed to kill app: %v", err)
- }
-
- // Clear the ADB log.
- if err := adb.Cmd(false, "logcat", "-c").Run(); err != nil {
- return fmt.Errorf("Failed to clear ADB log: %v", err)
- }
-
- // Prepare to read the subprocess output.
- logProc := adb.Cmd(false, "logcat")
- defer func() {
- // Cleanup.
- if err := logProc.Process.Kill(); err != nil {
- glog.Errorf("Failed to kill logcat process: %v", err)
- }
- }()
-
- stdout, err := logProc.StdoutPipe()
- if err != nil {
- return fmt.Errorf("Failed to obtain stdout pipe: %v", err)
- }
- stdoutLines := make(chan string)
- stderr, err := logProc.StderrPipe()
- if err != nil {
- return fmt.Errorf("Failed to obtain stderr pipe: %v", err)
- }
- stderrLines := make(chan string)
-
- go ReadLinesFromPipe(stdout, stdoutLines)
- go ReadLinesFromPipe(stderr, stderrLines)
- if err := logProc.Start(); err != nil {
- return fmt.Errorf("Failed to start logcat process.")
- }
-
- // Launch the app.
- stop := make(chan bool, 1)
- activity := fmt.Sprintf("%s.%s/%s.%sActivity", COM_SKIA, strings.ToLower(appName), COM_SKIA, appName)
- flags := strings.Join(args, " ")
- cmd := []string{"shell", "am", "start", "-S", "-n", activity, "--es", "cmdLineFlags", flags}
- output, err := adb.Cmd(true, cmd...).Output()
- if err != nil {
- return fmt.Errorf("Failed to launch app: %v", err)
- }
- glog.Info(string(output))
- // Make a handler for SIGINT so that we can kill the app if this script is interrupted.
- go func() {
- interrupt := make(chan os.Signal, 1)
- signal.Notify(interrupt, os.Interrupt)
- for _ = range interrupt {
- glog.Infof("Received SIGINT; killing app.")
- stop <- true
- close(stdoutLines)
- close(stderrLines)
- if err := adb.Kill(COM_SKIA); err != nil {
- glog.Errorf("Failed to kill app: %v", err)
- }
- if err := logProc.Process.Kill(); err != nil {
- glog.Errorf("Failed to kill logcat process: %v", err)
- }
- }
- }()
-
- // Loop until the app finishes or we're interrupted, writing output as appropriate.
- // TODO(borenet): VisualBench should print its exit code. This script should exit
- // with that code, or a non-zero code if the process ended without printing any code.
- second := time.Tick(time.Second)
-PollLoop:
- for {
- select {
- case <-second:
- // Poll the Skia process every second to make sure it's still running.
- pid, err := adb.Poll(COM_SKIA)
- if err != nil {
- glog.Errorf("Failed to poll Skia process: %v", err)
- } else if pid < 0 {
- glog.Infof("Skia process is no longer running!")
- break PollLoop
- }
- case <-stop:
- break PollLoop
- case line := <-stdoutLines:
- glog.Info(line)
- case line := <-stderrLines:
- glog.Error(line)
- }
- }
-
- return nil
-}
-
-func main() {
- common.Init()
- args := flag.Args()
- if err := RunApp(ADBFromFlags(), *app, args); err != nil {
- glog.Fatal(err)
- }
-}
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 86cc524..14f73bf 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -121,39 +121,5 @@
],
},
},
- {
- # This target is a dependency for VisualBench application which runs on
- # Android. Since Android requires us to load native code in shared
- # libraries, we need a common entry point to wrap around main(). Here
- # we also change the type of all would-be executables to be shared
- # libraries. The alternative would be to introduce a condition in every
- # executable target which changes to a shared library if the target OS is
- # Android. This is nicer because the switch is in one place.
- 'target_name': 'Android_VisualBench',
- 'type': 'static_library',
- 'direct_dependent_settings': {
- 'target_conditions': [
- # '_type' is an 'automatic variable' which is defined for any
- # target which defines a key-value pair with 'type' as the key (so,
- # all of them). Conditionals inside 'target_conditions' are evaluated
- # *after* all other definitions and conditionals are evaluated, so
- # we're guaranteed that '_type' will be defined when we get here.
- # For more info, see:
- # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
- # - http://codereview.appspot.com/6353065/
- ['_type == "executable"', {
- 'type': 'shared_library',
- }],
- ],
- 'include_dirs': [
- '../../../tools/timer/',
- '../../../tools/VisualBench/',
- ],
- 'sources': [
- '../apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp',
- '../apps/visualbench/src/main/jni/main.cpp',
- ],
- },
- },
]
}
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 844bd6e..fe535b3 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -118,168 +118,5 @@
},
],
},
- {
- 'target_name': 'CopyVisualBenchDeps',
- 'type': 'none',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'visualbench.gyp:visualbench',
- ],
-
- 'copies': [
- # Copy all shared libraries into the Android app's libs folder. Note
- # that this copy requires us to build SkiaAndroidApp after those
- # libraries, so that they exist by the time it occurs. If there are no
- # libraries to copy, this will cause an error in Make, but the app will
- # still build.
- {
- 'destination': '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libskia_android.so',
- '<(SHARED_LIB_DIR)/libvisualbench.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libvisualbench.so',
- ]}
- ],
- ],
- },
- ],
- },
- {
- 'target_name': 'VisualBench_APK',
- 'type': 'none',
- 'dependencies': [
- 'CopyVisualBenchDeps',
- ],
- 'actions': [
- {
- 'action_name': 'SkiaVisualBench_apk',
- 'inputs': [
- '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml',
- '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java',
- '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libvisualbench.so',
- ],
- 'conditions': [
- [ 'skia_shared_lib', {
- 'inputs': [
- '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libskia_android.so',
- ],
- }],
- ],
- 'outputs': [
- '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(android_variant)-<(android_apk_suffix)',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':visualbench:assemble<(android_variant)<(android_buildtype)',
- '-p<(android_base)/apps/visualbench',
- '-PsuppressNativeBuild',
- ],
- },
- ],
- },
- {
- 'target_name': 'VisualBenchTest_APK',
- 'type': 'none',
- 'dependencies': [
- 'VisualBench_APK',
- ],
- 'actions': [
- {
- 'action_name': 'SkiaVisualBench_apk',
- 'inputs': [
- '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml',
- '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java',
- '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java',
- '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libvisualbench.so',
- ],
- 'conditions': [
- [ 'skia_shared_lib', {
- 'inputs': [
- '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libskia_android.so',
- ],
- }],
- ],
- 'outputs': [
- '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(android_variant)-debug-androidTest-unaligned.apk',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':visualbench:assemble<(android_variant)DebugAndroidTest',
- '-p<(android_base)/apps/visualbench',
- '-PsuppressNativeBuild',
- ],
- },
- ],
- },
- # TODO all of this duplicated code can be removed when SDL becomes the default
- # Currently, to use this you have to override skia_use_sdl
- {
- 'target_name': 'CopyVisualBenchSDLDeps',
- 'type': 'none',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'visualbench.gyp:visualbench',
- ],
-
- 'copies': [
- # Copy all shared libraries into the Android app's libs folder. Note
- # that this copy requires us to build SkiaAndroidApp after those
- # libraries, so that they exist by the time it occurs. If there are no
- # libraries to copy, this will cause an error in Make, but the app will
- # still build.
- {
- 'destination': '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libskia_android.so',
- '<(SHARED_LIB_DIR)/libvisualbench.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libvisualbench.so',
- ]}
- ],
- ],
- },
- ],
- },
- {
- 'target_name': 'VisualBenchSDL_APK',
- 'type': 'none',
- 'dependencies': [
- 'CopyVisualBenchSDLDeps',
- ],
- 'actions': [
- {
- 'action_name': 'SkiaVisualBenchSDL_apk',
- 'inputs': [
- '<(android_base)/apps/visualbenchsdl/src/main/AndroidManifest.xml',
- '<(android_base)/apps/visualbenchsdl/src/main/java/org/libsdl/app/SDLActivity.java',
- '<(android_base)/apps/visualbenchsdl/src/main/java/com/skia/VisualBenchActivity.java',
- '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)/libvisualbench.so',
- ],
- 'conditions': [
- [ 'skia_shared_lib', {
- 'inputs': [
- '<(android_base)/apps/visualbenchsdl/src/main/libs/<(android_arch)/libskia_android.so',
- ],
- }],
- ],
- 'outputs': [
- '<(android_base)/apps/visualbenchsdl/build/outputs/apk/visualbench-<(android_variant)-<(android_apk_suffix)',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':visualbenchsdl:assemble<(android_variant)<(android_buildtype)',
- '-p<(android_base)/apps/visualbenchsdl',
- '-PsuppressNativeBuild',
- ],
- },
- ],
- },
],
}
diff --git a/tools/VisualBench/TimingStateMachine.cpp b/tools/VisualBench/TimingStateMachine.cpp
deleted file mode 100644
index 00e0b61..0000000
--- a/tools/VisualBench/TimingStateMachine.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "TimingStateMachine.h"
-
-#include "SkCanvas.h"
-#include "SkCommandLineFlags.h"
-
-DEFINE_int32(gpuFrameLag, 5, "Overestimate of maximum number of frames GPU is allowed to lag.");
-DEFINE_int32(frames, 5, "Number of frames of each skp to render per sample.");
-DEFINE_double(loopMs, 5, "Each benchmark will be tuned until it takes loopsMs millseconds.");
-
-static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
-
-TimingStateMachine::TimingStateMachine()
- : fCurrentFrame(0)
- , fLoops(1)
- , fLastMeasurement(0.)
- , fState(kPreWarm_State)
- , fInnerState(kTuning_InnerState) {
-}
-
-TimingStateMachine::ParentEvents TimingStateMachine::nextFrame(bool preWarmBetweenSamples) {
- ParentEvents parentEvent = kTiming_ParentEvents;
- switch (fState) {
- case kPreWarm_State: {
- if (fCurrentFrame >= FLAGS_gpuFrameLag) {
- fCurrentFrame = 0;
- fStartTime = now_ms();
- fState = kTiming_State;
- } else {
- fCurrentFrame++;
- }
- break;
- }
- case kTiming_State: {
- switch (fInnerState) {
- case kTuning_InnerState: {
- if (1 << 30 == fLoops) {
- // We're about to wrap. Something's wrong with the bench.
- SkDebugf("InnerLoops wrapped\n");
- fLoops = 1;
- } else {
- double elapsedMs = now_ms() - fStartTime;
- if (elapsedMs < FLAGS_loopMs) {
- fLoops *= 2;
- } else {
- fInnerState = kTiming_InnerState;
- }
- fState = kPreWarm_State;
- fCurrentFrame = 0;
- parentEvent = kReset_ParentEvents;
- }
- break;
- }
- case kTiming_InnerState: {
- if (fCurrentFrame >= FLAGS_frames) {
- double now = now_ms();
- fLastMeasurement = (now - fStartTime) / (FLAGS_frames * fLoops);
- fCurrentFrame = 0;
- parentEvent = kTimingFinished_ParentEvents;
- if (preWarmBetweenSamples) {
- fState = kPreWarm_State;
- } else {
- fStartTime = now;
- }
- } else {
- fCurrentFrame++;
- }
- break;
- }
- }
- }
- break;
- }
- return parentEvent;
-}
-
-void TimingStateMachine::nextBenchmark() {
- fLoops = 1;
- fInnerState = kTuning_InnerState;
- fState = kPreWarm_State;
-}
diff --git a/tools/VisualBench/TimingStateMachine.h b/tools/VisualBench/TimingStateMachine.h
deleted file mode 100644
index 9ada223..0000000
--- a/tools/VisualBench/TimingStateMachine.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef TimingStateMachine_DEFINED
-#define TimingStateMachine_DEFINED
-
-#include "Benchmark.h"
-#include "SkTArray.h"
-#include "Timer.h"
-
-class SkCanvas;
-
-/*
- * Manages a timer via a state machine. Can be used by modules to time benchmarks
- *
- * Clients call nextFrame, and must handle any requests from the timing state machine, specifically
- * to reset. When kTimingFinished_ParentEvents is returned, then lastMeasurement() will return the
- * timing and loops() will return the number of loops used to time.
- *
- * A client may continue timing the same benchmark indefinitely. To advance to the next
- * benchmark, the client should call nextBenchmark.
- */
-class TimingStateMachine {
-public:
- TimingStateMachine();
-
- enum ParentEvents {
- kReset_ParentEvents,
- kTiming_ParentEvents,
- kTimingFinished_ParentEvents,// This implies parent can read lastMeasurement() and must
- // reset
- };
-
- ParentEvents nextFrame(bool preWarmBetweenSamples);
-
- /*
- * The caller should call this when they are ready to move to the next benchmark.
- */
- void nextBenchmark();
-
- /*
- * When TimingStateMachine returns kTimingFinished_ParentEvents, then the owner can call
- * lastMeasurement() to get the time
- */
- double lastMeasurement() const { return fLastMeasurement; }
-
- int loops() const { return fLoops; }
-
-private:
- enum State {
- kPreWarm_State,
- kTiming_State,
- };
- enum InnerState {
- kTuning_InnerState,
- kTiming_InnerState,
- };
-
- int fCurrentFrame;
- int fLoops;
- double fLastMeasurement;
- double fStartTime;
- State fState;
- InnerState fInnerState;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualBench.cpp b/tools/VisualBench/VisualBench.cpp
deleted file mode 100644
index 7f2e90c..0000000
--- a/tools/VisualBench/VisualBench.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#include "VisualBench.h"
-
-#include "GrContext.h"
-#include "ProcStats.h"
-#include "SkApplication.h"
-#include "SkCanvas.h"
-#include "SkCommandLineFlags.h"
-#include "SkGraphics.h"
-#include "SkGr.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
-#include "Stats.h"
-#include "VisualDebugModule.h"
-#include "VisualLightweightBenchModule.h"
-#include "VisualInteractiveModule.h"
-#include "gl/GrGLInterface.h"
-
-#include <stdlib.h>
-
-DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
-DEFINE_string(mode, "classic", "one of: classic interactive debugger");
-DEFINE_bool2(dif, d, false, "Use device-independent fonts.");
-
-VisualBench::VisualBench(void* hwnd, int argc, char** argv)
- : INHERITED(hwnd) {
- SkDebugf("Command line arguments: ");
- for (int i = 1; i < argc; ++i) {
- SkDebugf("%s ", argv[i]);
- }
- SkDebugf("\n");
-
- SkCommandLineFlags::Parse(argc, argv);
-
- if (FLAGS_nvpr && !FLAGS_msaa) {
- SkDebugf("Got nvpr without msaa. Exiting.\n");
- exit(-1);
- }
-
- // these have to happen after commandline parsing
- if (FLAGS_dif) {
- const SkSurfaceProps& props(INHERITED::getSurfaceProps());
- uint32_t flags = SkSurfaceProps::kUseDeviceIndependentFonts_Flag | props.flags();
- INHERITED::setSurfaceProps(SkSurfaceProps(flags, props.pixelGeometry()));
- }
- fModule.reset(new VisualLightweightBenchModule(this));
-
- if (FLAGS_mode.count()) {
- SkASSERT(FLAGS_mode.count() == 1);
- SkString mode(FLAGS_mode[0]);
- if (mode == SkString("interactive")) {
- fModule.reset(new VisualInteractiveModule(this));
- } else if (mode == SkString("debugger")) {
- fModule.reset(new VisualDebugModule(this));
- }
- }
-
- this->setTitle();
- this->setupBackend();
-}
-
-VisualBench::~VisualBench() {
- this->tearDownContext();
-}
-
-void VisualBench::setTitle() {
- SkString title("VisualBench");
- INHERITED::setTitle(title.c_str());
-}
-
-SkSurface* VisualBench::createSurface() {
- if (!fSurface) {
- SkSurfaceProps props(INHERITED::getSurfaceProps());
- fSurface.reset(SkSurface::MakeRenderTargetDirect(fRenderTarget, &props).release());
- }
-
- // The caller will wrap the SkSurface in an SkAutoTUnref
- return SkRef(fSurface.get());
-}
-
-bool VisualBench::setupBackend() {
- this->setVisibleP(true);
- this->setClipToBounds(false);
-
- if (FLAGS_fullscreen) {
- if (!this->makeFullscreen()) {
- SkDebugf("Could not go fullscreen!");
- }
- }
-
- this->resetContext();
- return true;
-}
-
-void VisualBench::resetContext() {
- this->tearDownContext();
- this->setupContext();
-}
-
-void VisualBench::setupContext() {
- int screenSamples = FLAGS_offscreen ? 0 : FLAGS_msaa;
- if (!this->attach(kNativeGL_BackEndType, screenSamples, false, &fAttachmentInfo)) {
- SkDebugf("Not possible to create backend.\n");
- INHERITED::release();
- SkFAIL("Could not create backend\n");
- }
-
- this->setVsync(false);
-
- fSurface.reset(nullptr);
-
- fInterface.reset(GrGLCreateNativeInterface());
-
- // TODO use the GLTestContext creation factories and also set this all up in configs
- if (!FLAGS_nvpr) {
- fInterface.reset(GrGLInterfaceRemoveNVPR(fInterface));
- }
- SkASSERT(fInterface);
-
- // setup contexts
- fContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fInterface.get()));
- SkASSERT(fContext);
-
- // setup rendertargets
- this->setupRenderTarget();
-}
-
-void VisualBench::tearDownContext() {
- if (fContext) {
- // We abandon the context in case SkWindow has kept a ref to the surface
- fContext->abandonContext();
- fContext.reset();
- fSurface.reset();
- fInterface.reset();
- this->release();
- }
-}
-
-void VisualBench::setupRenderTarget() {
- if (fContext) {
- fRenderTarget.reset(this->renderTarget(fAttachmentInfo, fInterface, fContext));
- }
-}
-
-void VisualBench::draw(SkCanvas* canvas) {
- fModule->draw(canvas);
-
- // Invalidate the window to force a redraw. Poor man's animation mechanism.
- this->inval(nullptr);
-}
-
-void VisualBench::clear(SkCanvas* canvas, SkColor color, int frames) {
- canvas->clear(color);
- for (int i = 0; i < frames - 1; ++i) {
- canvas->flush();
- this->present();
- canvas->clear(color);
- }
-}
-
-void VisualBench::onSizeChange() {
- this->setupRenderTarget();
-}
-
-bool VisualBench::onHandleChar(SkUnichar unichar) {
- static const auto kEscKey = 27;
- if (kEscKey == unichar) {
- this->closeWindow();
- return true;
- }
-
- return fModule->onHandleChar(unichar);
-}
-
-// Externally declared entry points
-void application_init() {
- SkGraphics::Init();
- SkEvent::Init();
-}
-
-void application_term() {
- SkEvent::Term();
-}
-
-SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
- return new VisualBench(hwnd, argc, argv);
-}
diff --git a/tools/VisualBench/VisualBench.h b/tools/VisualBench/VisualBench.h
deleted file mode 100644
index e965b09..0000000
--- a/tools/VisualBench/VisualBench.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#ifndef VisualBench_DEFINED
-#define VisualBench_DEFINED
-
-#include "SkWindow.h"
-
-#include "SkPicture.h"
-#include "SkString.h"
-#include "SkSurface.h"
-#include "VisualFlags.h"
-#include "VisualModule.h"
-#include "gl/GLTestContext.h"
-
-class GrContext;
-struct GrGLInterface;
-class GrRenderTarget;
-class SkCanvas;
-
-/*
- * A Visual benchmarking tool for gpu benchmarking
- */
-class VisualBench : public SkOSWindow {
-public:
- VisualBench(void* hwnd, int argc, char** argv);
- ~VisualBench() override;
-
- void reset() { this->resetContext(); }
-
- void clear(SkCanvas* canvas, SkColor color, int frames);
-
-protected:
- SkSurface* createSurface() override;
-
- void draw(SkCanvas* canvas) override;
-
- void onSizeChange() override;
-
-private:
- void setTitle();
- bool setupBackend();
- void resetContext();
- void setupRenderTarget();
- bool onHandleChar(SkUnichar unichar) override;
- void tearDownContext();
- void setupContext();
-
- // support framework
- SkAutoTDelete<VisualModule> fModule;
- SkAutoTUnref<SkSurface> fSurface;
- SkAutoTUnref<GrContext> fContext;
- SkAutoTUnref<GrRenderTarget> fRenderTarget;
- AttachmentInfo fAttachmentInfo;
- SkAutoTUnref<const GrGLInterface> fInterface;
-
- typedef SkOSWindow INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp
deleted file mode 100644
index 56780f8..0000000
--- a/tools/VisualBench/VisualBenchmarkStream.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#include <VisualBench/VisualBenchmarkStream.h>
-#include <VisualBench/WrappedBenchmark.h>
-#include "GMBench.h"
-#include "SkOSFile.h"
-#include "SkPath.h"
-#include "SkPictureRecorder.h"
-#include "SkStream.h"
-#include "sk_tool_utils.h"
-#include "VisualFlags.h"
-#include "VisualSKPBench.h"
-
-#if SK_SUPPORT_GPU
-#include "GrContext.h"
-#endif
-
-DEFINE_string2(match, m, nullptr,
- "[~][^]substring[$] [...] of bench name to run.\n"
- "Multiple matches may be separated by spaces.\n"
- "~ causes a matching bench to always be skipped\n"
- "^ requires the start of the bench to match\n"
- "$ requires the end of the bench to match\n"
- "^ and $ requires an exact match\n"
- "If a bench does not match any list entry,\n"
- "it is skipped unless some list entry starts with ~");
-DEFINE_string(skps, "skps", "Directory to read skps from.");
-DEFINE_bool(warmup, true, "Include a warmup bench? (Excluding the warmup may compromise results)");
-
-// We draw a big nonAA path to warmup the gpu / cpu
-#include "SkPerlinNoiseShader.h"
-class WarmupBench : public Benchmark {
-public:
- WarmupBench() {
- sk_tool_utils::make_big_path(fPath);
- fPerlinRect = SkRect::MakeLTRB(0., 0., 400., 400.);
- }
-private:
- const char* onGetName() override { return "warmupbench"; }
- SkIPoint onGetSize() override {
- int w = SkScalarCeilToInt(SkTMax(fPath.getBounds().right(), fPerlinRect.right()));
- int h = SkScalarCeilToInt(SkTMax(fPath.getBounds().bottom(), fPerlinRect.bottom()));
- return SkIPoint::Make(w, h);
- }
- void onDraw(int loops, SkCanvas* canvas) override {
- // We draw a big path to warm up the cpu, and then use perlin noise shader to warm up the
- // gpu
- SkPaint paint;
- paint.setStyle(SkPaint::kStroke_Style);
- paint.setStrokeWidth(2);
-
- SkPaint perlinPaint;
- perlinPaint.setShader(SkPerlinNoiseShader::MakeTurbulence(0.1f, 0.1f, 1, 0, nullptr));
- for (int i = 0; i < loops; i++) {
- canvas->drawPath(fPath, paint);
- canvas->drawRect(fPerlinRect, perlinPaint);
-#if SK_SUPPORT_GPU
- // Ensure the GrContext doesn't batch across draw loops.
- if (GrContext* context = canvas->getGrContext()) {
- context->flush();
- }
-#endif
- }
- }
- SkPath fPath;
- SkRect fPerlinRect;
-};
-
-VisualBenchmarkStream::VisualBenchmarkStream(const SkSurfaceProps& surfaceProps, bool justSKP)
- : fSurfaceProps(surfaceProps)
- , fBenches(BenchRegistry::Head())
- , fGMs(skiagm::GMRegistry::Head())
- , fSourceType(nullptr)
- , fBenchType(nullptr)
- , fCurrentSKP(0)
- , fIsWarmedUp(false) {
- for (int i = 0; i < FLAGS_skps.count(); i++) {
- if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
- fSKPs.push_back() = FLAGS_skps[i];
- } else {
- SkOSFile::Iter it(FLAGS_skps[i], ".skp");
- SkString path;
- while (it.next(&path)) {
- fSKPs.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
- }
- }
- }
-
- if (justSKP) {
- fGMs = nullptr;
- fBenches = nullptr;
- }
-
- // seed with an initial benchmark
- // NOTE the initial benchmark will not have preTimingHooks called, but that is okay because
- // it is the warmupbench
- this->next();
-}
-
-sk_sp<SkPicture> VisualBenchmarkStream::ReadPicture(const char path[]) {
- // Not strictly necessary, as it will be checked again later,
- // but helps to avoid a lot of pointless work if we're going to skip it.
- if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
- return nullptr;
- }
-
- SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
- if (stream.get() == nullptr) {
- SkDebugf("Could not read %s.\n", path);
- return nullptr;
- }
-
- auto pic = SkPicture::MakeFromStream(stream.get());
- if (!pic) {
- SkDebugf("Could not read %s as an SkPicture.\n", path);
- }
- return pic;
-}
-
-Benchmark* VisualBenchmarkStream::next() {
- Benchmark* bench;
- if (FLAGS_warmup && !fIsWarmedUp) {
- fIsWarmedUp = true;
- bench = new WarmupBench;
- } else {
- // skips non matching benches
- while ((bench = this->innerNext()) &&
- (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
- !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
- bench->unref();
- }
- }
-
- // TODO move this all to --config
- if (bench && FLAGS_cpu) {
- bench = new CpuWrappedBenchmark(fSurfaceProps, bench);
- } else if (bench && FLAGS_offscreen) {
- bench = new GpuWrappedBenchmark(fSurfaceProps, bench, FLAGS_msaa);
- }
-
- fBenchmark.reset(bench);
- return fBenchmark;
-}
-
-Benchmark* VisualBenchmarkStream::innerNext() {
- while (fBenches) {
- Benchmark* bench = fBenches->factory()(nullptr);
- fBenches = fBenches->next();
- if (bench->isVisual()) {
- fSourceType = "bench";
- fBenchType = "micro";
- return bench;
- }
- bench->unref();
- }
-
- while (fGMs) {
- SkAutoTDelete<skiagm::GM> gm(fGMs->factory()(nullptr));
- fGMs = fGMs->next();
- if (gm->runAsBench()) {
- fSourceType = "gm";
- fBenchType = "micro";
- return new GMBench(gm.release());
- }
- }
-
- // Render skps
- while (fCurrentSKP < fSKPs.count()) {
- const SkString& path = fSKPs[fCurrentSKP++];
- sk_sp<SkPicture> pic = ReadPicture(path.c_str());
- if (!pic) {
- continue;
- }
-
- SkString name = SkOSPath::Basename(path.c_str());
- fSourceType = "skp";
- fBenchType = "playback";
- return new VisualSKPBench(name.c_str(), pic.get());
- }
-
- return nullptr;
-}
diff --git a/tools/VisualBench/VisualBenchmarkStream.h b/tools/VisualBench/VisualBenchmarkStream.h
deleted file mode 100644
index 71b6c97..0000000
--- a/tools/VisualBench/VisualBenchmarkStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#ifndef VisualBenchmarkStream_DEFINED
-#define VisualBenchmarkStream_DEFINED
-
-#include "Benchmark.h"
-#include "gm.h"
-#include "SkCommandLineFlags.h"
-#include "SkPicture.h"
-
-DECLARE_string(match);
-
-class VisualBenchmarkStream {
-public:
- VisualBenchmarkStream(const SkSurfaceProps&, bool justSKP = false);
-
- static sk_sp<SkPicture> ReadPicture(const char* path);
-
- Benchmark* next();
- Benchmark* current() { return fBenchmark.get(); }
-
-private:
- Benchmark* innerNext();
-
- SkSurfaceProps fSurfaceProps;
- const BenchRegistry* fBenches;
- const skiagm::GMRegistry* fGMs;
- SkTArray<SkString> fSKPs;
- SkAutoTUnref<Benchmark> fBenchmark;
-
- const char* fSourceType; // What we're benching: bench, GM, SKP, ...
- const char* fBenchType; // How we bench it: micro, playback, ...
- int fCurrentSKP;
- bool fIsWarmedUp;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualDebugModule.cpp b/tools/VisualBench/VisualDebugModule.cpp
deleted file mode 100644
index e4e70dd..0000000
--- a/tools/VisualBench/VisualDebugModule.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "VisualDebugModule.h"
-
-#include "SkCanvas.h"
-
-VisualDebugModule::VisualDebugModule(VisualBench* owner)
- : fState(kInit_State)
- , fIndex(0)
- , fOwner(owner) {
- // VisualDebugModule only really makes sense for SKPs
- fBenchmarkStream.reset(new VisualBenchmarkStream(owner->getSurfaceProps(), true));
-}
-
-bool VisualDebugModule::advanceIfNecessary(SkCanvas* canvas) {
- Benchmark* benchmark = fBenchmarkStream->current();
- switch (fState) {
- case kInit_State: {
- // setup new benchmark
- benchmark->delayedSetup();
- fOwner->clear(canvas, SK_ColorWHITE, 3);
- benchmark->preTimingHooks(canvas);
-
- // reset debug canvas
- SkIPoint size = benchmark->getSize();
- fDebugCanvas.reset(new SkDebugCanvas(size.fX, size.fY));
-
- // pour benchmark into canvas
- benchmark->draw(1, fDebugCanvas);
- fIndex = fDebugCanvas->getSize() - 1;
- fState = kPlay_State;
- break;
- }
- case kPlay_State: break;
- case kNext_State:
- // cleanup after the last SKP
- benchmark->postTimingHooks(canvas);
- fOwner->reset();
- if (!fBenchmarkStream->next()) {
- SkDebugf("Exiting VisualBench successfully\n");
- fOwner->closeWindow();
- return false;
- }
- fState = kInit_State;
- break;
- }
- return true;
-}
-
-void VisualDebugModule::draw(SkCanvas* canvas) {
- if (!fBenchmarkStream->current() || !this->advanceIfNecessary(canvas)) {
- return;
- }
-
- fDebugCanvas->drawTo(canvas, fIndex);
- canvas->flush();
- fOwner->present();
-}
-
-bool VisualDebugModule::onHandleChar(SkUnichar c) {
- switch (c) {
- case ' ': fState = kNext_State; break;
- case 'a': fIndex = (fIndex + 1) % (fDebugCanvas->getSize() - 1); break;
- case 's': fIndex = fIndex <= 0 ? fDebugCanvas->getSize() - 1 : fIndex - 1; break;
- default: break;
- }
-
- return true;
-}
diff --git a/tools/VisualBench/VisualDebugModule.h b/tools/VisualBench/VisualDebugModule.h
deleted file mode 100644
index 26385c3..0000000
--- a/tools/VisualBench/VisualDebugModule.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef VisualDebugModule_DEFINED
-#define VisualDebugModule_DEFINED
-
-#include "VisualModule.h"
-
-#include "SkDebugCanvas.h"
-#include "VisualBench.h"
-#include "VisualBenchmarkStream.h"
-
-class VisualDebugModule : public VisualModule {
-public:
- VisualDebugModule(VisualBench* owner);
- void draw(SkCanvas* canvas) override;
- bool onHandleChar(SkUnichar unichar) override;
-
-private:
- enum State {
- kInit_State,
- kPlay_State,
- kNext_State,
- };
-
- bool advanceIfNecessary(SkCanvas*);
-
- State fState;
- SkAutoTUnref<SkDebugCanvas> fDebugCanvas;
- int fIndex;
-
- // support framework
- VisualBench* fOwner;
- SkAutoTDelete<VisualBenchmarkStream> fBenchmarkStream;
-
- typedef VisualModule INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualFlags.cpp b/tools/VisualBench/VisualFlags.cpp
deleted file mode 100644
index 84304c1..0000000
--- a/tools/VisualBench/VisualFlags.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "VisualFlags.h"
-
-DEFINE_int32(msaa, 0, "Number of msaa samples.");
-DEFINE_bool(offscreen, false, "Perform rendering in an offscreen buffer.");
-DEFINE_bool(nvpr, false, "Use nvpr?");
-DEFINE_bool(cpu, false, "Run in CPU mode?");
diff --git a/tools/VisualBench/VisualFlags.h b/tools/VisualBench/VisualFlags.h
deleted file mode 100644
index 58a0970..0000000
--- a/tools/VisualBench/VisualFlags.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef VisualFlags_DEFINED
-#define VisualFlags_DEFINED
-
-#include "SkCommandLineFlags.h"
-
-DECLARE_string(config);
-DECLARE_int32(msaa);
-DECLARE_bool(offscreen);
-DECLARE_bool(nvpr);
-DECLARE_bool(cpu);
-
-#endif
diff --git a/tools/VisualBench/VisualInteractiveModule.cpp b/tools/VisualBench/VisualInteractiveModule.cpp
deleted file mode 100755
index 898315e..0000000
--- a/tools/VisualBench/VisualInteractiveModule.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "VisualInteractiveModule.h"
-
-#include "SkCanvas.h"
-#include "SkCommandLineFlags.h"
-
-VisualInteractiveModule::VisualInteractiveModule(VisualBench* owner)
- : INHERITED(owner)
- , fCurrentMeasurement(0)
- , fAdvance(false) {
- memset(fMeasurements, 0, sizeof(fMeasurements));
-}
-
-void VisualInteractiveModule::renderFrame(SkCanvas* canvas, Benchmark* benchmark, int loops) {
- benchmark->draw(loops, canvas);
- this->drawStats(canvas);
- canvas->flush();
-}
-
-void VisualInteractiveModule::drawStats(SkCanvas* canvas) {
- static const float kPixelPerMS = 2.0f;
- static const int kDisplayWidth = 130;
- static const int kDisplayHeight = 100;
- static const int kDisplayPadding = 10;
- static const int kGraphPadding = 3;
- static const float kBaseMS = 1000.f / 60.f; // ms/frame to hit 60 fps
-
- SkISize canvasSize = canvas->getDeviceSize();
- SkRect rect = SkRect::MakeXYWH(SkIntToScalar(canvasSize.fWidth-kDisplayWidth-kDisplayPadding),
- SkIntToScalar(kDisplayPadding),
- SkIntToScalar(kDisplayWidth), SkIntToScalar(kDisplayHeight));
- SkPaint paint;
- canvas->clipRect(rect);
- paint.setColor(SK_ColorBLACK);
- canvas->drawRect(rect, paint);
- // draw the 16ms line
- paint.setColor(SK_ColorLTGRAY);
- canvas->drawLine(rect.fLeft, rect.fBottom - kBaseMS*kPixelPerMS,
- rect.fRight, rect.fBottom - kBaseMS*kPixelPerMS, paint);
- paint.setColor(SK_ColorRED);
- paint.setStyle(SkPaint::kStroke_Style);
- canvas->drawRect(rect, paint);
-
- int x = SkScalarTruncToInt(rect.fLeft) + kGraphPadding;
- const int xStep = 2;
- const int startY = SkScalarTruncToInt(rect.fBottom);
- int i = fCurrentMeasurement;
- do {
- int endY = startY - (int)(fMeasurements[i] * kPixelPerMS + 0.5); // round to nearest value
- canvas->drawLine(SkIntToScalar(x), SkIntToScalar(startY),
- SkIntToScalar(x), SkIntToScalar(endY), paint);
- i++;
- i &= (kMeasurementCount - 1); // fast mod
- x += xStep;
- } while (i != fCurrentMeasurement);
-
-}
-
-bool VisualInteractiveModule::timingFinished(Benchmark* benchmark, int loops, double measurement) {
- // Record measurements
- fMeasurements[fCurrentMeasurement++] = measurement;
- fCurrentMeasurement &= (kMeasurementCount-1); // fast mod
- SkASSERT(fCurrentMeasurement < kMeasurementCount);
- if (fAdvance) {
- fAdvance = false;
- return true;
- }
- return false;
-}
-
-bool VisualInteractiveModule::onHandleChar(SkUnichar c) {
- if (' ' == c) {
- fAdvance = true;
- }
-
- return true;
-}
diff --git a/tools/VisualBench/VisualInteractiveModule.h b/tools/VisualBench/VisualInteractiveModule.h
deleted file mode 100755
index d4f8f69..0000000
--- a/tools/VisualBench/VisualInteractiveModule.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef VisualInteractiveModule_DEFINED
-#define VisualInteractiveModule_DEFINED
-
-#include "VisualStreamTimingModule.h"
-
-class SkCanvas;
-
-/*
- * This module for VisualBench is designed to display stats data dynamically
- */
-class VisualInteractiveModule : public VisualStreamTimingModule {
-public:
- // TODO get rid of backpointer
- VisualInteractiveModule(VisualBench* owner);
-
- bool onHandleChar(SkUnichar c) override;
-
-private:
- void drawStats(SkCanvas*);
- void renderFrame(SkCanvas*, Benchmark*, int loops) override;
- bool timingFinished(Benchmark*, int loops, double measurement) override;
-
- static const int kMeasurementCount = 64; // should be power of 2 for fast mod
- double fMeasurements[kMeasurementCount];
- int fCurrentMeasurement;
- bool fAdvance;
-
- typedef VisualStreamTimingModule INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualLightweightBenchModule.cpp b/tools/VisualBench/VisualLightweightBenchModule.cpp
deleted file mode 100644
index 4aeeaff..0000000
--- a/tools/VisualBench/VisualLightweightBenchModule.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "VisualLightweightBenchModule.h"
-
-#include "ProcStats.h"
-#include "SkApplication.h"
-#include "SkCanvas.h"
-#include "SkCommandLineFlags.h"
-#include "SkGraphics.h"
-#include "SkGr.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
-#include "Stats.h"
-#include "gl/GrGLInterface.h"
-
-// Between samples we reset context
-// Between frames we swap buffers
-DEFINE_bool2(verbose, v, false, "enable verbose output from the test driver.");
-DEFINE_string(outResultsFile, "", "If given, write results here as JSON.");
-DEFINE_string(key, "",
- "Space-separated key/value pairs to add to JSON identifying this builder.");
-DEFINE_string(properties, "",
- "Space-separated key/value pairs to add to JSON identifying this run.");
-DEFINE_int32(samples, 10, "Number of times to time each skp.");
-
-static SkString humanize(double ms) {
- if (FLAGS_verbose) {
- return SkStringPrintf("%llu", (uint64_t)(ms*1e6));
- }
- return HumanizeMs(ms);
-}
-
-#define HUMANIZE(time) humanize(time).c_str()
-
-VisualLightweightBenchModule::VisualLightweightBenchModule(VisualBench* owner)
- : INHERITED(owner)
- , fCurrentSample(0)
- , fResults(new ResultsWriter) {
- // Print header
- SkDebugf("curr/maxrss\tloops\tmin\tmedian\tmean\tmax\tstddev\t%-*s\tconfig\tbench\n",
- FLAGS_samples, "samples");
-
- // setup json logging if required
- if (!FLAGS_outResultsFile.isEmpty()) {
- fResults.reset(new NanoJSONResultsWriter(FLAGS_outResultsFile[0]));
- }
-
- if (1 == FLAGS_key.count() % 2) {
- SkDebugf("ERROR: --key must be passed with an even number of arguments.\n");
- } else {
- for (int i = 1; i < FLAGS_key.count(); i += 2) {
- fResults->key(FLAGS_key[i - 1], FLAGS_key[i]);
- }
- }
-
- if (1 == FLAGS_properties.count() % 2) {
- SkDebugf("ERROR: --properties must be passed with an even number of arguments.\n");
- } else {
- for (int i = 1; i < FLAGS_properties.count(); i += 2) {
- fResults->property(FLAGS_properties[i - 1], FLAGS_properties[i]);
- }
- }
-
- // seed an initial record
- fRecords.push_back();
-}
-
-void VisualLightweightBenchModule::renderFrame(SkCanvas* canvas, Benchmark* benchmark, int loops) {
- benchmark->draw(loops, canvas);
- canvas->flush();
-}
-
-void VisualLightweightBenchModule::printStats(Benchmark* benchmark, int loops) {
- const SkTArray<double>& measurements = fRecords.back().fMeasurements;
- const char* shortName = benchmark->getUniqueName();
-
- // update log
- // Note: We currently log only the minimum. It would be interesting to log more information
- SkString configName;
- if (FLAGS_cpu) {
- configName.append("cpu");
- } else if (FLAGS_nvpr) {
- if (FLAGS_offscreen) {
- configName.appendf("nvpr_%d", FLAGS_msaa);
- } else {
- configName.appendf("nvpr_msaa_%d", FLAGS_msaa);
- }
- } else if (FLAGS_msaa > 0) {
- if (FLAGS_offscreen) {
- configName.appendf("offscreen_msaa_%d", FLAGS_msaa);
- } else {
- configName.appendf("msaa_%d", FLAGS_msaa);
- }
- } else {
- if (FLAGS_offscreen) {
- configName.append("offscreen");
- } else {
- configName.append("gpu");
- }
- }
- // Log bench name
- fResults->bench(shortName, benchmark->getSize().fX, benchmark->getSize().fY);
-
- fResults->config(configName.c_str());
- fResults->configOption("name", shortName);
- SkASSERT(measurements.count());
- Stats stats(measurements);
- fResults->metric("min_ms", stats.min);
-
- // Print output
- if (FLAGS_verbose) {
- for (int i = 0; i < measurements.count(); i++) {
- SkDebugf("%s ", HUMANIZE(measurements[i]));
- }
- SkDebugf("%s\n", shortName);
- } else {
- const double stdDevPercent = 100 * sqrt(stats.var) / stats.mean;
- SkDebugf("%4d/%-4dMB\t%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\t%s\n",
- sk_tools::getCurrResidentSetSizeMB(),
- sk_tools::getMaxResidentSetSizeMB(),
- loops,
- HUMANIZE(stats.min),
- HUMANIZE(stats.median),
- HUMANIZE(stats.mean),
- HUMANIZE(stats.max),
- stdDevPercent,
- stats.plot.c_str(),
- configName.c_str(),
- shortName);
- }
-}
-
-bool VisualLightweightBenchModule::timingFinished(Benchmark* benchmark, int loops,
- double measurement) {
- fRecords.back().fMeasurements.push_back(measurement);
- if (++fCurrentSample > FLAGS_samples) {
- this->printStats(benchmark, loops);
- fRecords.push_back();
- fCurrentSample = 0;
- return true;
- }
- return false;
-}
-
-bool VisualLightweightBenchModule::onHandleChar(SkUnichar c) {
- return true;
-}
diff --git a/tools/VisualBench/VisualLightweightBenchModule.h b/tools/VisualBench/VisualLightweightBenchModule.h
deleted file mode 100644
index 7618ff2..0000000
--- a/tools/VisualBench/VisualLightweightBenchModule.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef VisualLightweightBenchModule_DEFINED
-#define VisualLightweightBenchModule_DEFINED
-
-#include "VisualStreamTimingModule.h"
-
-#include "ResultsWriter.h"
-#include "SkPicture.h"
-#include "VisualBench.h"
-
-class SkCanvas;
-
-/*
- * This module is designed to be a minimal overhead timing module for VisualBench
- */
-class VisualLightweightBenchModule : public VisualStreamTimingModule {
-public:
- // TODO get rid of backpointer
- VisualLightweightBenchModule(VisualBench* owner);
-
- bool onHandleChar(SkUnichar c) override;
-
-private:
- void renderFrame(SkCanvas*, Benchmark*, int loops) override;
- bool timingFinished(Benchmark*, int loops, double measurement) override;
- void printStats(Benchmark*, int loops);
-
- struct Record {
- SkTArray<double> fMeasurements;
- };
- int fCurrentSample;
- SkTArray<Record> fRecords;
-
- // support framework
- SkAutoTDelete<ResultsWriter> fResults;
-
- typedef VisualStreamTimingModule INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualModule.h b/tools/VisualBench/VisualModule.h
deleted file mode 100644
index 2f83793..0000000
--- a/tools/VisualBench/VisualModule.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#ifndef VisualModule_DEFINED
-#define VisualModule_DEFINED
-
-#include "SkRefCnt.h"
-
-class SkCanvas;
-
-/*
- * VisualModule is the base class for all of the various types of activities VisualBench supports.
- *
- * The common theme tying these all together is they need to display an image to the screen. Later,
- * on we some modules will also be interactive
- */
-class VisualModule : public SkRefCnt {
-public:
- virtual ~VisualModule() {}
-
- virtual void draw(SkCanvas* canvas)=0;
-
- virtual bool onHandleChar(SkUnichar unichar) = 0;
-
-private:
- typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualSKPBench.cpp b/tools/VisualBench/VisualSKPBench.cpp
deleted file mode 100644
index 5d15d7e..0000000
--- a/tools/VisualBench/VisualSKPBench.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#include "VisualSKPBench.h"
-
-#if SK_SUPPORT_GPU
-#include "GrContext.h"
-#endif
-
-VisualSKPBench::VisualSKPBench(const char* name, const SkPicture* pic)
- : fPic(SkRef(pic))
- , fCullRect(fPic->cullRect().roundOut())
- , fName(name) {
- fUniqueName.printf("%s", name);
-}
-
-const char* VisualSKPBench::onGetName() {
- return fName.c_str();
-}
-
-const char* VisualSKPBench::onGetUniqueName() {
- return fUniqueName.c_str();
-}
-
-bool VisualSKPBench::isSuitableFor(Backend backend) {
- return backend != kNonRendering_Backend;
-}
-
-SkIPoint VisualSKPBench::onGetSize() {
- return SkIPoint::Make(fCullRect.width(), fCullRect.height());
-}
-
-void VisualSKPBench::onDraw(int loops, SkCanvas* canvas) {
- bool isOffset = SkToBool(fCullRect.left() | fCullRect.top());
- if (isOffset) {
- canvas->save();
- canvas->translate(SkIntToScalar(-fCullRect.left()), SkIntToScalar(-fCullRect.top()));
- }
-
- for (int i = 0; i < loops; i++) {
- canvas->drawPicture(fPic);
-#if SK_SUPPORT_GPU
- // Ensure the GrContext doesn't batch across draw loops.
- if (GrContext* context = canvas->getGrContext()) {
- context->flush();
- }
-#endif
- }
-
- if (isOffset) {
- canvas->restore();
- }
-}
diff --git a/tools/VisualBench/VisualSKPBench.h b/tools/VisualBench/VisualSKPBench.h
deleted file mode 100644
index dc22fec..0000000
--- a/tools/VisualBench/VisualSKPBench.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- */
-
-#ifndef VisualSKPBench_DEFINED
-#define VisualSKPBench_DEFINED
-
-#include "Benchmark.h"
-#include "SkCanvas.h"
-#include "SkPicture.h"
-
-/**
- * Runs an SkPicture as a benchmark by repeatedly drawing it
- */
-class VisualSKPBench : public Benchmark {
-public:
- VisualSKPBench(const char* name, const SkPicture*);
-
-protected:
- const char* onGetName() override;
- const char* onGetUniqueName() override;
- bool isSuitableFor(Backend backend) override;
- SkIPoint onGetSize() override;
- void onDraw(int loops, SkCanvas* canvas) override;
-
-private:
- SkAutoTUnref<const SkPicture> fPic;
- SkIRect fCullRect;
- SkString fName;
- SkString fUniqueName;
-
- typedef Benchmark INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/VisualStreamTimingModule.cpp b/tools/VisualBench/VisualStreamTimingModule.cpp
deleted file mode 100644
index b572621..0000000
--- a/tools/VisualBench/VisualStreamTimingModule.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "VisualStreamTimingModule.h"
-
-#include "SkCanvas.h"
-
-DEFINE_bool(reset, true, "Reset the GL context between samples.");
-
-VisualStreamTimingModule::VisualStreamTimingModule(VisualBench* owner)
- : fInitState(kReset_InitState)
- , fOwner(owner) {
- fBenchmarkStream.reset(new VisualBenchmarkStream(owner->getSurfaceProps()));
-}
-
-inline void VisualStreamTimingModule::handleInitState(SkCanvas* canvas) {
- switch (fInitState) {
- case kNewBenchmark_InitState:
- fBenchmarkStream->current()->delayedSetup();
- // fallthrough
- case kReset_InitState:
- // This will flicker unfortunately, but as we are reseting the GLTestContext each bench,
- // we unfortunately don't have a choice
- fOwner->clear(canvas, SK_ColorWHITE, 3);
- fBenchmarkStream->current()->preTimingHooks(canvas);
- break;
- case kNone_InitState:
- break;
- }
- fInitState = kNone_InitState;
-}
-
-inline void VisualStreamTimingModule::handleTimingEvent(SkCanvas* canvas,
- TimingStateMachine::ParentEvents event) {
- switch (event) {
- case TimingStateMachine::kTiming_ParentEvents:
- break;
- case TimingStateMachine::kTimingFinished_ParentEvents:
- if (this->timingFinished(fBenchmarkStream->current(), fTSM.loops(),
- fTSM.lastMeasurement())) {
- fBenchmarkStream->current()->postTimingHooks(canvas);
- fOwner->reset();
- fTSM.nextBenchmark();
- if (!fBenchmarkStream->next()) {
- SkDebugf("Exiting VisualBench successfully\n");
- fOwner->closeWindow();
- } else {
- fInitState = kNewBenchmark_InitState;
- }
- break;
- }
- // fallthrough
- case TimingStateMachine::kReset_ParentEvents:
- if (FLAGS_reset) {
- fBenchmarkStream->current()->postTimingHooks(canvas);
- fOwner->reset();
- fInitState = kReset_InitState;
- }
- break;
- }
-}
-
-void VisualStreamTimingModule::draw(SkCanvas* canvas) {
- if (!fBenchmarkStream->current()) {
- // this should never happen but just to be safe
- // TODO research why this does happen on mac
- return;
- }
-
- this->handleInitState(canvas);
- this->renderFrame(canvas, fBenchmarkStream->current(), fTSM.loops());
- fOwner->present();
- TimingStateMachine::ParentEvents event = fTSM.nextFrame(FLAGS_reset);
- this->handleTimingEvent(canvas, event);
-}
diff --git a/tools/VisualBench/VisualStreamTimingModule.h b/tools/VisualBench/VisualStreamTimingModule.h
deleted file mode 100644
index 80c67e8..0000000
--- a/tools/VisualBench/VisualStreamTimingModule.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef VisualStreamTimingModule_DEFINED
-#define VisualStreamTimingModule_DEFINED
-
-#include "VisualModule.h"
-
-#include "TimingStateMachine.h"
-#include "VisualBench.h"
-#include "VisualBenchmarkStream.h"
-
-class SkCanvas;
-
-/*
- * VisualStreamTimingModule is the base class for modules which want to time a stream of Benchmarks.
- *
- * Subclasses should implement renderFrame, which is called for each frame, and timingFinished,
- * which is called when a sample has finished timing.
- */
-class VisualStreamTimingModule : public VisualModule {
-public:
- VisualStreamTimingModule(VisualBench* owner);
- void draw(SkCanvas* canvas) override;
-
-private:
- virtual void renderFrame(SkCanvas*, Benchmark*, int loops)=0;
-
- // subclasses should return true to advance the stream
- virtual bool timingFinished(Benchmark*, int loops, double measurement)=0;
-
- inline void handleInitState(SkCanvas*);
- inline void handleTimingEvent(SkCanvas*, TimingStateMachine::ParentEvents);
-
- TimingStateMachine fTSM;
- SkAutoTDelete<VisualBenchmarkStream> fBenchmarkStream;
- enum InitState {
- kNone_InitState,
- kReset_InitState,
- kNewBenchmark_InitState,
- };
- InitState fInitState;
-
- // support framework
- VisualBench* fOwner;
-
- typedef VisualModule INHERITED;
-};
-
-#endif
diff --git a/tools/VisualBench/WrappedBenchmark.h b/tools/VisualBench/WrappedBenchmark.h
deleted file mode 100644
index 8939fda..0000000
--- a/tools/VisualBench/WrappedBenchmark.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef WrappedBenchmark_DEFINED
-#define WrappedBenchmark_DEFINED
-
-#include "Benchmark.h"
-#include "SkSurface.h"
-#include "GrContext.h"
-#include "GrDrawContext.h"
-#include "GrRenderTarget.h"
-
-// Wrap some other benchmark to allow specialization to either
-// cpu or gpu backends. The derived class will override 'setupOffScreen'
-// to create an offscreen surface in which the actual rendering will occur.
-class WrappedBenchmark : public Benchmark {
-public:
- // Takes ownership of caller's ref on `bench`.
- explicit WrappedBenchmark(const SkSurfaceProps& surfaceProps, Benchmark* bench)
- : fSurfaceProps(surfaceProps)
- , fBench(bench) {}
-
- const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
-
- const char* onGetName() override { return fBench->getName(); }
- const char* onGetUniqueName() override { return fBench->getUniqueName(); }
-
- void onDelayedSetup() override { fBench->delayedSetup(); }
- void onPerCanvasPreDraw(SkCanvas* canvas) override {
- this->setupOffScreen(canvas);
- fOffScreen->getCanvas()->clear(SK_ColorWHITE);
- fBench->perCanvasPreDraw(fOffScreen->getCanvas());
- }
- void onPreDraw(SkCanvas* canvas) override {
- SkASSERT(fOffScreen);
- fBench->preDraw(fOffScreen->getCanvas());
- }
- void onPostDraw(SkCanvas* canvas) override {
- SkASSERT(fOffScreen);
- fBench->postDraw(fOffScreen->getCanvas());
- }
- void onPerCanvasPostDraw(SkCanvas* canvas) override {
- SkASSERT(fOffScreen);
- fBench->perCanvasPostDraw(fOffScreen->getCanvas());
- }
-
- void onDraw(int loops, SkCanvas* canvas) override {
- SkASSERT(fOffScreen);
- fBench->draw(loops, fOffScreen->getCanvas());
- this->blitToScreen(canvas);
- }
-
- virtual SkIPoint onGetSize() override { return fBench->getSize(); }
-
-protected:
- virtual void setupOffScreen(SkCanvas*)=0;
-
- void blitToScreen(SkCanvas* canvas) {
- int w = SkTMin(fBench->getSize().fX, fOffScreen->width());
- int h = SkTMin(fBench->getSize().fY, fOffScreen->width());
- this->onBlitToScreen(canvas, w, h);
- }
-
- virtual void onBlitToScreen(SkCanvas* canvas, int w, int h) = 0;
-
- SkSurfaceProps fSurfaceProps;
- sk_sp<SkSurface> fOffScreen;
- SkAutoTUnref<Benchmark> fBench;
-};
-
-// Create a raster surface for off screen rendering
-class CpuWrappedBenchmark : public WrappedBenchmark {
-public:
- explicit CpuWrappedBenchmark(const SkSurfaceProps& surfaceProps, Benchmark* bench)
- : INHERITED(surfaceProps, bench) {}
-
-private:
- void setupOffScreen(SkCanvas* canvas) override {
- fOffScreen = SkSurface::MakeRaster(canvas->imageInfo(), &this->surfaceProps());
- }
-
- void onBlitToScreen(SkCanvas* canvas, int w, int h) override {
- sk_sp<SkImage> image(fOffScreen->makeImageSnapshot());
- SkPaint blitPaint;
- blitPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
- canvas->drawImageRect(image.get(), SkIRect::MakeWH(w, h),
- SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)), &blitPaint);
- }
-
- typedef WrappedBenchmark INHERITED;
-};
-
-// Create an MSAA & NVPR-enabled GPU backend
-class GpuWrappedBenchmark : public WrappedBenchmark {
-public:
- explicit GpuWrappedBenchmark(const SkSurfaceProps& surfaceProps, Benchmark* bench,
- int numSamples)
- : INHERITED(surfaceProps, bench)
- , fNumSamples(numSamples) {}
-
-private:
- void setupOffScreen(SkCanvas* canvas) override {
- fOffScreen = SkSurface::MakeRenderTarget(canvas->getGrContext(),
- SkBudgeted::kNo,
- canvas->imageInfo(),
- fNumSamples,
- &this->surfaceProps());
- }
-
- void onBlitToScreen(SkCanvas* canvas, int w, int h) override {
- // We call copySurface directly on the underlying GPU surfaces for a more efficient blit.
- GrDrawContext* dstDC = canvas->internal_private_accessTopLayerDrawContext();
- SkASSERT(dstDC);
-
- GrDrawContext* srcDC =
- fOffScreen->getCanvas()->internal_private_accessTopLayerDrawContext();
- SkASSERT(srcDC);
- GrRenderTarget* src = srcDC->accessRenderTarget();
- SkASSERT(src);
-
- SkASSERT(canvas->getGrContext() == fOffScreen->getCanvas()->getGrContext());
-
- dstDC->copySurface(src, SkIRect::MakeWH(w, h), SkIPoint::Make(0, 0));
- }
-
- int fNumSamples;
- typedef WrappedBenchmark INHERITED;
-};
-
-#endif //WrappedBenchmark_DEFINED
diff --git a/tools/kilobench/kilobench.cpp b/tools/kilobench/kilobench.cpp
deleted file mode 100644
index 02c9fc6..0000000
--- a/tools/kilobench/kilobench.cpp
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrCaps.h"
-#include "GrContextFactory.h"
-#include "Benchmark.h"
-#include "ResultsWriter.h"
-#include "SkCommandLineFlags.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
-#include "SkSurface.h"
-#include "SkTime.h"
-#include "SkTLList.h"
-#include "SkThreadUtils.h"
-#include "Stats.h"
-#include "Timer.h"
-#include "VisualSKPBench.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
-#include "../private/SkMutex.h"
-#include "../private/SkSemaphore.h"
-#include "../private/SkGpuFenceSync.h"
-
-// posix only for now
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-using namespace sk_gpu_test;
-
-/*
- * This is an experimental GPU only benchmarking program. The initial implementation will only
- * support SKPs.
- */
-
-static const int kAutoTuneLoops = 0;
-
-static const int kDefaultLoops =
-#ifdef SK_DEBUG
- 1;
-#else
- kAutoTuneLoops;
-#endif
-
-static SkString loops_help_txt() {
- SkString help;
- help.printf("Number of times to run each bench. Set this to %d to auto-"
- "tune for each bench. Timings are only reported when auto-tuning.",
- kAutoTuneLoops);
- return help;
-}
-
-DEFINE_string(skps, "skps", "Directory to read skps from.");
-DEFINE_string2(match, m, nullptr,
- "[~][^]substring[$] [...] of GM name to run.\n"
- "Multiple matches may be separated by spaces.\n"
- "~ causes a matching bench to always be skipped\n"
- "^ requires the start of the bench to match\n"
- "$ requires the end of the bench to match\n"
- "^ and $ requires an exact match\n"
- "If a bench does not match any list entry,\n"
- "it is skipped unless some list entry starts with ~");
-DEFINE_int32(gpuFrameLag, 5, "If unknown, estimated maximum number of frames GPU allows to lag.");
-DEFINE_int32(samples, 10, "Number of samples to measure for each bench.");
-DEFINE_int32(maxLoops, 1000000, "Never run a bench more times than this.");
-DEFINE_int32(loops, kDefaultLoops, loops_help_txt().c_str());
-DEFINE_double(gpuMs, 5, "Target bench time in millseconds for GPU.");
-DEFINE_string2(writePath, w, "", "If set, write bitmaps here as .pngs.");
-DEFINE_bool(useBackgroundThread, true, "If false, kilobench will time cpu / gpu work together");
-DEFINE_bool(useMultiProcess, true, "If false, kilobench will run all tests in one process");
-
-static SkString humanize(double ms) {
- return HumanizeMs(ms);
-}
-#define HUMANIZE(ms) humanize(ms).c_str()
-
-namespace kilobench {
-class BenchmarkStream {
-public:
- BenchmarkStream() : fCurrentSKP(0) {
- for (int i = 0; i < FLAGS_skps.count(); i++) {
- if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
- fSKPs.push_back() = FLAGS_skps[i];
- } else {
- SkOSFile::Iter it(FLAGS_skps[i], ".skp");
- SkString path;
- while (it.next(&path)) {
- fSKPs.push_back() = SkOSPath::Join(FLAGS_skps[0], path.c_str());
- }
- }
- }
- }
-
- Benchmark* next() {
- Benchmark* bench = nullptr;
- // skips non matching benches
- while ((bench = this->innerNext()) &&
- (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
- !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
- delete bench;
- }
- return bench;
- }
-
-private:
- static sk_sp<SkPicture> ReadPicture(const char path[]) {
- // Not strictly necessary, as it will be checked again later,
- // but helps to avoid a lot of pointless work if we're going to skip it.
- if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
- return nullptr;
- }
-
- SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
- if (stream.get() == nullptr) {
- SkDebugf("Could not read %s.\n", path);
- return nullptr;
- }
-
- return SkPicture::MakeFromStream(stream.get());
- }
-
- Benchmark* innerNext() {
- // Render skps
- while (fCurrentSKP < fSKPs.count()) {
- const SkString& path = fSKPs[fCurrentSKP++];
- auto pic = ReadPicture(path.c_str());
- if (!pic) {
- continue;
- }
-
- SkString name = SkOSPath::Basename(path.c_str());
- return new VisualSKPBench(name.c_str(), pic.get());
- }
-
- return nullptr;
- }
-
- SkTArray<SkString> fSKPs;
- int fCurrentSKP;
-};
-
-struct GPUTarget {
- void setup() {
- fGL->makeCurrent();
- // Make sure we're done with whatever came before.
- GR_GL_CALL(fGL->gl(), Finish());
- }
-
- SkCanvas* beginTiming(SkCanvas* canvas) { return canvas; }
-
- void endTiming(bool usePlatformSwapBuffers) {
- if (fGL) {
- GR_GL_CALL(fGL->gl(), Flush());
- if (usePlatformSwapBuffers) {
- fGL->swapBuffers();
- } else {
- fGL->waitOnSyncOrSwap();
- }
- }
- }
- void finish() {
- GR_GL_CALL(fGL->gl(), Finish());
- }
-
- bool needsFrameTiming(int* maxFrameLag) const {
- if (!fGL->getMaxGpuFrameLag(maxFrameLag)) {
- // Frame lag is unknown.
- *maxFrameLag = FLAGS_gpuFrameLag;
- }
- return true;
- }
-
- bool init(Benchmark* bench, GrContextFactory* factory, bool useDfText,
- GrContextFactory::ContextType ctxType,
- GrContextFactory::ContextOptions ctxOptions, int numSamples) {
- GrContext* context = factory->get(ctxType, ctxOptions);
- int maxRTSize = context->caps()->maxRenderTargetSize();
- SkImageInfo info = SkImageInfo::Make(SkTMin(bench->getSize().fX, maxRTSize),
- SkTMin(bench->getSize().fY, maxRTSize),
- kN32_SkColorType, kPremul_SkAlphaType);
- uint32_t flags = useDfText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag :
- 0;
- SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
- fSurface.reset(SkSurface::MakeRenderTarget(context,
- SkBudgeted::kNo, info,
- numSamples, &props).release());
- fGL = factory->getContextInfo(ctxType, ctxOptions).glContext();
- if (!fSurface.get()) {
- return false;
- }
-
- // Kilobench should only be used on platforms with fence sync support
- SkASSERT(fGL->fenceSyncSupport());
- return true;
- }
-
- SkCanvas* getCanvas() const {
- if (!fSurface.get()) {
- return nullptr;
- }
- return fSurface->getCanvas();
- }
-
- bool capturePixels(SkBitmap* bmp) {
- SkCanvas* canvas = this->getCanvas();
- if (!canvas) {
- return false;
- }
- bmp->setInfo(canvas->imageInfo());
- if (!canvas->readPixels(bmp, 0, 0)) {
- SkDebugf("Can't read canvas pixels.\n");
- return false;
- }
- return true;
- }
-
- GLTestContext* gl() { return fGL; }
-
-private:
- GLTestContext* fGL;
- SkAutoTDelete<SkSurface> fSurface;
-};
-
-static bool write_canvas_png(GPUTarget* target, const SkString& filename) {
-
- if (filename.isEmpty()) {
- return false;
- }
- if (target->getCanvas() &&
- kUnknown_SkColorType == target->getCanvas()->imageInfo().colorType()) {
- return false;
- }
-
- SkBitmap bmp;
-
- if (!target->capturePixels(&bmp)) {
- return false;
- }
-
- SkString dir = SkOSPath::Dirname(filename.c_str());
- if (!sk_mkdir(dir.c_str())) {
- SkDebugf("Can't make dir %s.\n", dir.c_str());
- return false;
- }
- SkFILEWStream stream(filename.c_str());
- if (!stream.isValid()) {
- SkDebugf("Can't write %s.\n", filename.c_str());
- return false;
- }
- if (!SkImageEncoder::EncodeStream(&stream, bmp, SkImageEncoder::kPNG_Type, 100)) {
- SkDebugf("Can't encode a PNG.\n");
- return false;
- }
- return true;
-}
-
-static int detect_forever_loops(int loops) {
- // look for a magic run-forever value
- if (loops < 0) {
- loops = SK_MaxS32;
- }
- return loops;
-}
-
-static int clamp_loops(int loops) {
- if (loops < 1) {
- SkDebugf("ERROR: clamping loops from %d to 1. "
- "There's probably something wrong with the bench.\n", loops);
- return 1;
- }
- if (loops > FLAGS_maxLoops) {
- SkDebugf("WARNING: clamping loops from %d to FLAGS_maxLoops, %d.\n", loops, FLAGS_maxLoops);
- return FLAGS_maxLoops;
- }
- return loops;
-}
-
-static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
-
-struct TimingThread {
- TimingThread(GLTestContext* mainContext)
- : fFenceSync(mainContext->fenceSync())
- , fMainContext(mainContext)
- , fDone(false) {}
-
- static void Loop(void* data) {
- TimingThread* timingThread = reinterpret_cast<TimingThread*>(data);
- timingThread->timingLoop();
- }
-
- // To ensure waiting for the sync actually does something, we check to make sure the we exceed
- // some small value
- const double kMinElapsed = 1e-6;
- bool sanity(double start) const {
- double elapsed = now_ms() - start;
- return elapsed > kMinElapsed;
- }
-
- void waitFence(SkPlatformGpuFence sync) {
- SkDEBUGCODE(double start = now_ms());
- fFenceSync->waitFence(sync);
- SkASSERT(sanity(start));
- }
-
- void timingLoop() {
- // Create a context which shares display lists with the main thread
- SkAutoTDelete<GLTestContext> glContext(CreatePlatformGLTestContext(kNone_GrGLStandard,
- fMainContext));
- glContext->makeCurrent();
-
- // Basic timing methodology is:
- // 1) Wait on semaphore until main thread indicates its time to start timing the frame
- // 2) Wait on frame start sync, record time. This is start of the frame.
- // 3) Wait on semaphore until main thread indicates its time to finish timing the frame
- // 4) Wait on frame end sync, record time. FrameEndTime - FrameStartTime = frame time
- // 5) Wait on semaphore until main thread indicates we should time the next frame or quit
- while (true) {
- fSemaphore.wait();
-
- // get start sync
- SkPlatformGpuFence startSync = this->popStartSync();
-
- // wait on sync
- this->waitFence(startSync);
- double start = kilobench::now_ms();
-
- // do we want to sleep here?
- // wait for end sync
- fSemaphore.wait();
-
- // get end sync
- SkPlatformGpuFence endSync = this->popEndSync();
-
- // wait on sync
- this->waitFence(endSync);
- double elapsed = kilobench::now_ms() - start;
-
- // No mutex needed, client won't touch timings until we're done
- fTimings.push_back(elapsed);
-
- // clean up fences
- fFenceSync->deleteFence(startSync);
- fFenceSync->deleteFence(endSync);
-
- fSemaphore.wait();
- if (this->isDone()) {
- break;
- }
- }
- }
-
- void pushStartSync() { this->pushSync(&fFrameStartSyncs, &fFrameStartSyncsMutex); }
-
- SkPlatformGpuFence popStartSync() {
- return this->popSync(&fFrameStartSyncs, &fFrameStartSyncsMutex);
- }
-
- void pushEndSync() { this->pushSync(&fFrameEndSyncs, &fFrameEndSyncsMutex); }
-
- SkPlatformGpuFence popEndSync() { return this->popSync(&fFrameEndSyncs, &fFrameEndSyncsMutex); }
-
- void setDone() {
- SkAutoMutexAcquire done(fDoneMutex);
- fDone = true;
- fSemaphore.signal();
- }
-
- typedef SkTLList<SkPlatformGpuFence, 1> SyncQueue;
-
- void pushSync(SyncQueue* queue, SkMutex* mutex) {
- SkAutoMutexAcquire am(mutex);
- *queue->addToHead() = fFenceSync->insertFence();
- fSemaphore.signal();
- }
-
- SkPlatformGpuFence popSync(SyncQueue* queue, SkMutex* mutex) {
- SkAutoMutexAcquire am(mutex);
- SkPlatformGpuFence sync = *queue->head();
- queue->popHead();
- return sync;
- }
-
- bool isDone() {
- SkAutoMutexAcquire am1(fFrameStartSyncsMutex);
- SkAutoMutexAcquire done(fDoneMutex);
- if (fDone && fFrameStartSyncs.isEmpty()) {
- return true;
- } else {
- return false;
- }
- }
-
- const SkTArray<double>& timings() const { SkASSERT(fDone); return fTimings; }
-
-private:
- SkGpuFenceSync* fFenceSync;
- SkSemaphore fSemaphore;
- SkMutex fFrameStartSyncsMutex;
- SyncQueue fFrameStartSyncs;
- SkMutex fFrameEndSyncsMutex;
- SyncQueue fFrameEndSyncs;
- SkTArray<double> fTimings;
- SkMutex fDoneMutex;
- GLTestContext* fMainContext;
- bool fDone;
-};
-
-static double time(int loops, Benchmark* bench, GPUTarget* target, TimingThread* timingThread) {
- SkCanvas* canvas = target->getCanvas();
- canvas->clear(SK_ColorWHITE);
- bench->preDraw(canvas);
-
- if (timingThread) {
- timingThread->pushStartSync();
- }
- double start = now_ms();
- canvas = target->beginTiming(canvas);
- bench->draw(loops, canvas);
- canvas->flush();
- target->endTiming(timingThread ? true : false);
-
- double elapsed = now_ms() - start;
- if (timingThread) {
- timingThread->pushEndSync();
- timingThread->setDone();
- }
- bench->postDraw(canvas);
- return elapsed;
-}
-
-// TODO For now we don't use the background timing thread to tune loops
-static int setup_gpu_bench(GPUTarget* target, Benchmark* bench, int maxGpuFrameLag) {
- // First, figure out how many loops it'll take to get a frame up to FLAGS_gpuMs.
- int loops = bench->calculateLoops(FLAGS_loops);
- if (kAutoTuneLoops == loops) {
- loops = 1;
- double elapsed = 0;
- do {
- if (1<<30 == loops) {
- // We're about to wrap. Something's wrong with the bench.
- loops = 0;
- break;
- }
- loops *= 2;
- // If the GPU lets frames lag at all, we need to make sure we're timing
- // _this_ round, not still timing last round.
- for (int i = 0; i < maxGpuFrameLag; i++) {
- elapsed = time(loops, bench, target, nullptr);
- }
- } while (elapsed < FLAGS_gpuMs);
-
- // We've overshot at least a little. Scale back linearly.
- loops = (int)ceil(loops * FLAGS_gpuMs / elapsed);
- loops = clamp_loops(loops);
-
- // Make sure we're not still timing our calibration.
- target->finish();
- } else {
- loops = detect_forever_loops(loops);
- }
-
- // Pretty much the same deal as the calibration: do some warmup to make
- // sure we're timing steady-state pipelined frames.
- for (int i = 0; i < maxGpuFrameLag - 1; i++) {
- time(loops, bench, target, nullptr);
- }
-
- return loops;
-}
-
-struct AutoSetupContextBenchAndTarget {
- AutoSetupContextBenchAndTarget(Benchmark* bench) : fBenchmark(bench) {
- GrContextOptions grContextOpts;
- fCtxFactory.reset(new GrContextFactory(grContextOpts));
-
- SkAssertResult(fTarget.init(bench, fCtxFactory, false,
- GrContextFactory::kNativeGL_ContextType,
- GrContextFactory::kNone_ContextOptions, 0));
-
- fCanvas = fTarget.getCanvas();
- fTarget.setup();
-
- bench->perCanvasPreDraw(fCanvas);
- fTarget.needsFrameTiming(&fMaxFrameLag);
- }
-
- int getLoops() { return setup_gpu_bench(&fTarget, fBenchmark, fMaxFrameLag); }
-
- double timeSample(int loops, TimingThread* timingThread) {
- for (int i = 0; i < fMaxFrameLag; i++) {
- time(loops, fBenchmark, &fTarget, timingThread);
- }
-
- return time(loops, fBenchmark, &fTarget, timingThread) / loops;
- }
-
- void teardownBench() { fBenchmark->perCanvasPostDraw(fCanvas); }
-
- SkAutoTDelete<GrContextFactory> fCtxFactory;
- GPUTarget fTarget;
- SkCanvas* fCanvas;
- Benchmark* fBenchmark;
- int fMaxFrameLag;
-};
-
-int setup_loops(Benchmark* bench) {
- AutoSetupContextBenchAndTarget ascbt(bench);
- int loops = ascbt.getLoops();
- ascbt.teardownBench();
-
- if (!FLAGS_writePath.isEmpty() && FLAGS_writePath[0]) {
- SkString pngFilename = SkOSPath::Join(FLAGS_writePath[0], "gpu");
- pngFilename = SkOSPath::Join(pngFilename.c_str(), bench->getUniqueName());
- pngFilename.append(".png");
- write_canvas_png(&ascbt.fTarget, pngFilename);
- }
- return loops;
-}
-
-struct Sample {
- double fCpu;
- double fGpu;
-};
-
-Sample time_sample(Benchmark* bench, int loops) {
- AutoSetupContextBenchAndTarget ascbt(bench);
-
- Sample sample;
- if (FLAGS_useBackgroundThread) {
- TimingThread timingThread(ascbt.fTarget.gl());
- SkAutoTDelete<SkThread> nativeThread(new SkThread(TimingThread::Loop, &timingThread));
- nativeThread->start();
- sample.fCpu = ascbt.timeSample(loops, &timingThread);
- nativeThread->join();
-
- // return the min
- double min = SK_ScalarMax;
- for (int i = 0; i < timingThread.timings().count(); i++) {
- min = SkTMin(min, timingThread.timings()[i]);
- }
- sample.fGpu = min;
- } else {
- sample.fCpu = ascbt.timeSample(loops, nullptr);
- }
-
- ascbt.teardownBench();
-
- return sample;
-}
-
-} // namespace kilobench
-
-static const int kOutResultSize = 1024;
-
-void printResult(const SkTArray<double>& samples, int loops, const char* name, const char* mod) {
- SkString newName(name);
- newName.appendf("_%s", mod);
- Stats stats(samples);
- const double stddev_percent = 100 * sqrt(stats.var) / stats.mean;
- SkDebugf("%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\t%s\n"
- , loops
- , HUMANIZE(stats.min)
- , HUMANIZE(stats.median)
- , HUMANIZE(stats.mean)
- , HUMANIZE(stats.max)
- , stddev_percent
- , stats.plot.c_str()
- , "gpu"
- , newName.c_str()
- );
-}
-
-int kilobench_main() {
- kilobench::BenchmarkStream benchStream;
-
- SkDebugf("loops\tmin\tmedian\tmean\tmax\tstddev\t%-*s\tconfig\tbench\n",
- FLAGS_samples, "samples");
-
- int descriptors[2];
- if (pipe(descriptors) != 0) {
- SkFAIL("Failed to open a pipe\n");
- }
-
- while (Benchmark* b = benchStream.next()) {
- SkAutoTDelete<Benchmark> bench(b);
-
- int loops = 1;
- SkTArray<double> cpuSamples;
- SkTArray<double> gpuSamples;
- for (int i = 0; i < FLAGS_samples + 1; i++) {
- // We fork off a new process to setup the grcontext and run the test while we wait
- if (FLAGS_useMultiProcess) {
- int childPid = fork();
- if (childPid > 0) {
- char result[kOutResultSize];
- if (read(descriptors[0], result, kOutResultSize) < 0) {
- SkFAIL("Failed to read from pipe\n");
- }
-
- // if samples == 0 then parse # of loops
- // else parse float
- if (i == 0) {
- sscanf(result, "%d", &loops);
- } else {
- sscanf(result, "%lf %lf", &cpuSamples.push_back(),
- &gpuSamples.push_back());
- }
-
- // wait until exit
- int status;
- waitpid(childPid, &status, 0);
- } else if (0 == childPid) {
- char result[kOutResultSize];
- if (i == 0) {
- sprintf(result, "%d", kilobench::setup_loops(bench));
- } else {
- kilobench::Sample sample = kilobench::time_sample(bench, loops);
- sprintf(result, "%lf %lf", sample.fCpu, sample.fGpu);
- }
-
- // Make sure to write the null terminator
- if (write(descriptors[1], result, strlen(result) + 1) < 0) {
- SkFAIL("Failed to write to pipe\n");
- }
- return 0;
- } else {
- SkFAIL("Fork failed\n");
- }
- } else {
- if (i == 0) {
- loops = kilobench::setup_loops(bench);
- } else {
- kilobench::Sample sample = kilobench::time_sample(bench, loops);
- cpuSamples.push_back(sample.fCpu);
- gpuSamples.push_back(sample.fGpu);
- }
- }
- }
-
- printResult(cpuSamples, loops, bench->getUniqueName(), "cpu");
- if (FLAGS_useBackgroundThread) {
- printResult(gpuSamples, loops, bench->getUniqueName(), "gpu");
- }
- }
- return 0;
-}
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char** argv) {
- SkCommandLineFlags::Parse(argc, argv);
- return kilobench_main();
-}
-#endif