'visualbench.gyp:visualbench',
'fuzz.gyp:fuzz',
'kilobench.gyp:kilobench',
- 'vulkanviewer.gyp:vulkanviewer',
+ 'viewer.gyp:viewer',
],
'conditions': [
[ 'skia_gpu == 0', {
'dependencies!': [
'visualbench.gyp:visualbench',
'kilobench.gyp:kilobench',
- 'vulkanviewer.gyp:vulkanviewer',
+ 'viewer.gyp:viewer',
]
}],
[ 'skia_os != "android" and skia_os != "linux"', {
}],
[ 'skia_vulkan == 1', {
'dependencies': [
- 'android_system.gyp:VulkanViewer_APK',
+ 'android_system.gyp:Viewer_APK',
],
}],
],
}],
[ 'skia_vulkan == 0 or (skia_os != "win" and skia_os != "android")', {
'dependencies!': [
- 'vulkanviewer.gyp:vulkanviewer',
+ 'viewer.gyp:viewer',
],
}],
[ 'skia_skip_gui',
],
'targets': [
{
- 'target_name': 'vulkanviewer',
+ 'target_name': 'viewer',
'type': 'executable',
'includes' : [
'gmslides.gypi',
],
'sources': [
'../gm/gm.cpp',
- '<!@(python find.py ../tools/vulkan "*.cpp")',
+ '<!@(python find.py ../tools/viewer "*.cpp")',
],
'dependencies': [
'flags.gyp:flags',
include ':visualbench'
include ':visualbenchsdl'
include ':canvasproof'
-include ':vulkanviewer'
+include ':viewer'
compileSdkVersion 19
buildToolsVersion "22.0.1"
defaultConfig {
- applicationId "org.skia.vulkanviewer"
+ applicationId "org.skia.viewer"
minSdkVersion 19
targetSdkVersion 19
versionCode 1
sourceSets.main.jniLibs.srcDir "src/main/libs"
productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; }
- setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyVulkanViewerDeps", true)
+ setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyViewerDeps", true)
}
<?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.skia.vulkanviewer"
+ package="org.skia.viewer"
android:versionCode="1"
android:versionName="1.0">
<application
android:allowBackup="false"
- android:label="VulkanViewer">
+ android:label="Viewer">
- <activity android:name=".VulkanViewerActivity"
- android:label="VulkanViewer"
+ <activity android:name=".ViewerActivity"
+ android:label="Viewer"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
<meta-data android:name="android.app.lib_name"
- android:value="vulkanviewer" />
+ android:value="viewer" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
* found in the LICENSE file.
*/
-package org.skia.vulkanviewer;
+package org.skia.viewer;
import android.app.ActionBar;
import android.os.Bundle;
import android.view.View;
import android.view.WindowManager;
-public class VulkanViewerActivity extends android.app.NativeActivity {
+public class ViewerActivity extends android.app.NativeActivity {
static {
System.loadLibrary("skia_android");
}
},
'includes' : [
'canvasproof.gypi',
- 'vulkanviewer.gypi',
+ 'viewer.gypi',
],
'targets': [
{
--- /dev/null
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+ 'targets': [
+ {
+ 'target_name': 'CopyViewerDeps',
+ 'type': 'none',
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'viewer.gyp:viewer',
+ ],
+ 'copies': [
+ {
+ 'destination': '<(android_base)/apps/viewer/src/main/libs/<(android_arch)',
+ 'conditions': [
+ [ 'skia_shared_lib', {
+ 'files': [
+ '<(SHARED_LIB_DIR)/libskia_android.so',
+ '<(SHARED_LIB_DIR)/libviewer.so',
+ ]}, {
+ 'files': [
+ '<(SHARED_LIB_DIR)/libviewer.so',
+ ]}
+ ],
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'Viewer_APK',
+ 'type': 'none',
+ 'dependencies': [ 'CopyViewerDeps', ],
+ 'actions': [
+ {
+ 'action_name': 'SkiaViewer_apk',
+ 'inputs': [
+ '<(android_base)/apps/viewer/src/main/AndroidManifest.xml',
+ '<(android_base)/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java',
+ '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libviewer.so',
+
+ ],
+ 'conditions': [
+ [ 'skia_shared_lib', {
+ 'inputs': [
+ '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libskia_android.so',
+ ],
+ }],
+ ],
+ 'outputs': [
+ '../apps/viewer/build/outputs/apk/',
+ ],
+ 'action': [
+ '<(android_base)/apps/gradlew',
+ ':viewer:assemble<(android_variant)<(android_buildtype)',
+ '-p<(android_base)/apps/viewer',
+ '-PsuppressNativeBuild',
+ '--daemon',
+ ],
+ },
+ ],
+ },
+ ],
+}
+++ /dev/null
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'targets': [
- {
- 'target_name': 'CopyVulkanViewerDeps',
- 'type': 'none',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'vulkanviewer.gyp:vulkanviewer',
- ],
- 'copies': [
- {
- 'destination': '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libskia_android.so',
- '<(SHARED_LIB_DIR)/libvulkanviewer.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libvulkanviewer.so',
- ]}
- ],
- ],
- },
- ],
- },
- {
- 'target_name': 'VulkanViewer_APK',
- 'type': 'none',
- 'dependencies': [ 'CopyVulkanViewerDeps', ],
- 'actions': [
- {
- 'action_name': 'SkiaVulkanViewer_apk',
- 'inputs': [
- '<(android_base)/apps/vulkanviewer/src/main/AndroidManifest.xml',
- '<(android_base)/apps/vulkanviewer/src/main/java/com/skia/vulkanviewer/VulkanViewerActivity.java',
- '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)/libvulkanviewer.so',
-
- ],
- 'conditions': [
- [ 'skia_shared_lib', {
- 'inputs': [
- '<(android_base)/apps/vulkanviewer/src/main/libs/<(android_arch)/libskia_android.so',
- ],
- }],
- ],
- 'outputs': [
- '../apps/vulkanviewer/build/outputs/apk/',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':vulkanviewer:assemble<(android_variant)<(android_buildtype)',
- '-p<(android_base)/apps/vulkanviewer',
- '-PsuppressNativeBuild',
- '--daemon',
- ],
- },
- ],
- },
- ],
-}
#ifndef Application_DEFINED
#define Application_DEFINED
+namespace sk_app {
+
class Application {
public:
static Application* Create(int argc, char** argv, void* platformData);
virtual void onIdle(double ms) = 0;
};
+} // namespace sk_app
+
#endif
#include "SkCanvas.h"
#include "VulkanTestContext.h"
+namespace sk_app {
+
static bool default_char_func(SkUnichar c, uint32_t modifiers, void* userData) {
return false;
}
fHeight = h;
fTestContext->resize(w, h);
}
+
+} // namespace sk_app
class SkCanvas;
class VulkanTestContext;
+namespace sk_app {
+
class Window {
public:
static Window* CreateNativeWindow(void* platformData);
VulkanTestContext* fTestContext;
};
-
+} // namespace sk_app
#endif
#include "VulkanTestContext_android.h"
+namespace sk_app {
+
Window* Window::CreateNativeWindow(void* platformData) {
Window_android* window = new Window_android();
if (!window->init((android_app*)platformData)) {
}
void Window_android::inval() {
- android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
+ android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
}
void Window_android::paintIfNeeded() {
int32_t modifiers = 0;
if (AKeyEvent_getRepeatCount(event) == 0) {
- modifiers |= Window::kFirstPress_ModifierKey;
+ modifiers |= Window::kFirstPress_ModifierKey;
}
for (size_t i = 0; i < SK_ARRAY_COUNT(gPair); i++) {
}
return 0;
}
+
+} // namespace sk_app
#include "../Window.h"
#include <android_native_app_glue.h>
+namespace sk_app {
+
enum {
/**
* Leave plenty of space between this item and the ones defined in the glue layer
int mSampleCount = 0;
};
+} // namespace sk_app
+
#endif
static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
+using sk_app::Application;
+
/**
* This is the main entry point of a native application that is using
* android_native_app_glue. It runs in its own thread, with its own
app_dummy();
static const char* gCmdLine[] = {
- "vulkanviewer",
+ "viewer",
"--skps",
"/data/local/tmp/skp",
};
* found in the LICENSE file.
*/
-#include "VulkanViewer.h"
+#include "Viewer.h"
#include "GMSlide.h"
#include "SKPSlide.h"
#include "SkRandom.h"
#include "SkStream.h"
+using namespace sk_app;
+
Application* Application::Create(int argc, char** argv, void* platformData) {
- return new VulkanViewer(argc, argv, platformData);
+ return new Viewer(argc, argv, platformData);
}
static bool on_key_handler(Window::Key key, Window::InputState state, uint32_t modifiers,
void* userData) {
- VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+ Viewer* vv = reinterpret_cast<Viewer*>(userData);
return vv->onKey(key, state, modifiers);
}
static bool on_char_handler(SkUnichar c, uint32_t modifiers, void* userData) {
- VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+ Viewer* vv = reinterpret_cast<Viewer*>(userData);
return vv->onChar(c, modifiers);
}
static void on_paint_handler(SkCanvas* canvas, void* userData) {
- VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+ Viewer* vv = reinterpret_cast<Viewer*>(userData);
return vv->onPaint(canvas);
}
"it is skipped unless some list entry starts with ~");
DEFINE_string(skps, "skps", "Directory to read skps from.");
-VulkanViewer::VulkanViewer(int argc, char** argv, void* platformData)
+Viewer::Viewer(int argc, char** argv, void* platformData)
: fCurrentMeasurement(0)
, fDisplayStats(false)
, fZoomCenterX(0.0f)
fWindow->show();
}
-void VulkanViewer::initSlides() {
+void Viewer::initSlides() {
const skiagm::GMRegistry* gms(skiagm::GMRegistry::Head());
while (gms) {
SkAutoTDelete<skiagm::GM> gm(gms->factory()(nullptr));
}
-VulkanViewer::~VulkanViewer() {
+Viewer::~Viewer() {
fWindow->detach();
delete fWindow;
}
-void VulkanViewer::setupCurrentSlide(int previousSlide) {
- SkString title("VulkanViewer: ");
+void Viewer::setupCurrentSlide(int previousSlide) {
+ SkString title("Viewer: ");
title.append(fSlides[fCurrentSlide]->getName());
fSlides[fCurrentSlide]->load();
if (previousSlide >= 0) {
#define MAX_ZOOM_LEVEL 8
#define MIN_ZOOM_LEVEL -8
-void VulkanViewer::changeZoomLevel(float delta) {
+void Viewer::changeZoomLevel(float delta) {
fZoomLevel += delta;
if (fZoomLevel > 0) {
fZoomLevel = SkMinScalar(fZoomLevel, MAX_ZOOM_LEVEL);
this->updateMatrix();
}
-void VulkanViewer::updateMatrix(){
+void Viewer::updateMatrix(){
SkMatrix m;
m.reset();
fLocalMatrix = m;
}
-bool VulkanViewer::onKey(Window::Key key, Window::InputState state, uint32_t modifiers) {
+bool Viewer::onKey(Window::Key key, Window::InputState state, uint32_t modifiers) {
if (Window::kDown_InputState == state) {
switch (key) {
case Window::kRight_Key: {
if (fCurrentSlide < 0) {
fCurrentSlide = fSlides.count() - 1;
}
- SkString title("VulkanViewer: ");
+ SkString title("Viewer: ");
title.append(fSlides[fCurrentSlide]->getName());
fWindow->setTitle(title.c_str());
setupCurrentSlide(previousSlide);
return false;
}
-bool VulkanViewer::onChar(SkUnichar c, uint32_t modifiers) {
+bool Viewer::onChar(SkUnichar c, uint32_t modifiers) {
if ('s' == c) {
fDisplayStats = !fDisplayStats;
return true;
return false;
}
-void VulkanViewer::onPaint(SkCanvas* canvas) {
+void Viewer::onPaint(SkCanvas* canvas) {
int count = canvas->save();
}
}
-void VulkanViewer::drawStats(SkCanvas* canvas) {
+void Viewer::drawStats(SkCanvas* canvas) {
static const float kPixelPerMS = 2.0f;
static const int kDisplayWidth = 130;
static const int kDisplayHeight = 100;
canvas->restore();
}
-void VulkanViewer::onIdle(double ms) {
+void Viewer::onIdle(double ms) {
// Record measurements
fMeasurements[fCurrentMeasurement++] = ms;
fCurrentMeasurement &= (kMeasurementCount - 1); // fast mod
* found in the LICENSE file.
*/
-#ifndef VulkanViewer_DEFINED
-#define VulkanViewer_DEFINED
+#ifndef Viewer_DEFINED
+#define Viewer_DEFINED
#include "../Application.h"
#include "../Window.h"
class SkCanvas;
-class VulkanViewer : public Application {
+class Viewer : public sk_app::Application {
public:
- VulkanViewer(int argc, char** argv, void* platformData);
- ~VulkanViewer() override;
+ Viewer(int argc, char** argv, void* platformData);
+ ~Viewer() override;
- bool onKey(Window::Key key, Window::InputState state, uint32_t modifiers);
+ bool onKey(sk_app::Window::Key key, sk_app::Window::InputState state, uint32_t modifiers);
bool onChar(SkUnichar, uint32_t modifiers);
void onPaint(SkCanvas* canvas);
void onIdle(double ms) override;
void changeZoomLevel(float delta);
void updateMatrix();
- Window* fWindow;
+ sk_app::Window* fWindow;
static const int kMeasurementCount = 64; // should be power of 2 for fast mod
double fMeasurements[kMeasurementCount];
#include "SkUtils.h"
#include "VulkanTestContext_win.h"
+namespace sk_app {
+
Window* Window::CreateNativeWindow(void* platformData) {
HINSTANCE hInstance = (HINSTANCE)platformData;
void Window_win::inval() {
InvalidateRect(fHWnd, nullptr, false);
}
+
+} // namespace sk_app
#include <windows.h>
#include "../Window.h"
+namespace sk_app {
+
class Window_win : public Window {
public:
Window_win() : Window() {}
HWND fHWnd;
};
+} // namespace sk_app
+
#endif
#include "Window_win.h"
#include "../Application.h"
+using sk_app::Application;
+
static char* tchar_to_utf8(const TCHAR* str) {
#ifdef _UNICODE
int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), NULL, 0, NULL, NULL);
projects / platform / upstream / libSkiaSharp.git / commitdiff