platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp - Issue 1935523002: Fix Vulkan Build in Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp

Issue 1935523002: Fix Vulkan Build in Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp » ('j') | platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp

diff --git a/platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp b/platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp

index e5c6660921c8f8d27c2f59725b30a3ff29a3888e..f04faab6d201f39d3e4a7fc29a6ce4f80647e1b8 100644

--- a/platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp

+++ b/platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp

@@ -61,7 +61,7 @@ SkOSWindow::SkOSWindow(void*) : fDestroyRequested(false) {

SkOSWindow::~SkOSWindow() {

}

-bool SkOSWindow::attach(SkBackEndTypes /* attachType */, int /*msaaSampleCount*/, AttachmentInfo* info)

jvanverth1 2016/04/29 15:25:11 I don't think this should be removed -- it's not p

+bool SkOSWindow::attach(SkBackEndTypes /* attachType */, int /*msaaSampleCount*/)

{

JNIEnv* env = gActivityGlue.m_env;

if (!env || !gWindowGlue.m_getMSAASampleCount || !gWindowGlue.m_obj) {