Support MSAA4 and (non-ES) OpenGL in Android SampleApp

platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp

 
 /*
  * Copyright 2011 Skia
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "com_skia_SkiaSampleRenderer.h"
 
 #include "GrContext.h"
@@ skipping 26 matching lines @@
         m_setSlideList = NULL;
         m_addToDownloads = NULL;
     }
 } gActivityGlue;
 
 struct WindowGlue {
     jweak m_obj;
     jmethodID m_inval;
     jmethodID m_queueSkEvent;
     jmethodID m_startTimer;
+    jmethodID m_getMSAASampleCount;
     WindowGlue() {
         m_obj = NULL;
         m_inval = NULL;
         m_queueSkEvent = NULL;
         m_startTimer = NULL;
+        m_getMSAASampleCount = NULL;
     }
 } gWindowGlue;
 
 SampleWindow* gWindow;
 
 ///////////////////////////////////////////
 ///////////// SkOSWindow impl /////////////
 ///////////////////////////////////////////
 
+bool SkOSWindow::attach(SkBackEndTypes /* attachType */, int msaaSampleCount, AttachmentInfo* info)
+{
+    JNIEnv* env = gActivityGlue.m_env;
+    if (!env || !gWindowGlue.m_getMSAASampleCount || !gWindowGlue.m_obj) {
+        return false;
+    }
+    if (env->IsSameObject(gWindowGlue.m_obj, NULL)) {
+        SkDebugf("ERROR: The JNI WeakRef to the Window is invalid");
+        return false;
+    }
+    info->fSampleCount = env->CallIntMethod(gWindowGlue.m_obj, gWindowGlue.m_getMSAASampleCount);
+
+    // This is the value requested in SkiaSampleView.java.
+    info->fStencilBits = 8;
+    return true;
+}
+
 void SkOSWindow::onSetTitle(const char title[])
 {
     JNIEnv* env = gActivityGlue.m_env;
     if (!env) {
         return;
     }
     if (env->IsSameObject(gActivityGlue.m_obj, NULL)) {
         SkDebugf("ERROR: The JNI WeakRef to the Activity is invalid");
         return;
     }
@@ skipping 77 matching lines @@
 
 static jmethodID GetJMethod(JNIEnv* env, jclass clazz, const char name[],
         const char signature[])
 {
     jmethodID m = env->GetMethodID(clazz, name, signature);
     if (!m) SkDebugf("Could not find Java method %s\n", name);
     return m;
 }
 
 JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_init(JNIEnv* env,
-        jobject thiz, jobject jsampleActivity)
+        jobject thiz, jobject jsampleActivity, jint msaaSampleCount)
 {
     // setup jni hooks to the java activity
     gActivityGlue.m_env = env;
     jclass clazz = env->FindClass("com/skia/SkiaSampleActivity");
     gActivityGlue.m_obj = env->NewWeakGlobalRef(jsampleActivity);
     gActivityGlue.m_setTitle = GetJMethod(env, clazz, "setTitle", "(Ljava/lang/CharSequence;)V");
     gActivityGlue.m_setSlideList = GetJMethod(env, clazz, "setSlideList", "([Ljava/lang/String;)V");
     gActivityGlue.m_addToDownloads = GetJMethod(env, clazz, "addToDownloads",
             "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
     env->DeleteLocalRef(clazz);
 
     // setup jni hooks to the java renderer
     clazz = env->FindClass("com/skia/SkiaSampleRenderer");
     gWindowGlue.m_obj = env->NewWeakGlobalRef(thiz);
     gWindowGlue.m_inval = GetJMethod(env, clazz, "requestRender", "()V");
     gWindowGlue.m_queueSkEvent = GetJMethod(env, clazz, "queueSkEvent", "()V");
     gWindowGlue.m_startTimer = GetJMethod(env, clazz, "startTimer", "(I)V");
+    gWindowGlue.m_getMSAASampleCount = GetJMethod(env, clazz, "getMSAASampleCount", "()I");
     env->DeleteLocalRef(clazz);
 
     application_init();
+    SkTArray<const char*> args;
+
+    args.push_back("SampleApp");
     // TODO: push ability to select skp dir into the UI
-    const char* argv[] = { "SampleApp", "--pictureDir", "/sdcard/skiabot/skia_skp" };
-    gWindow = new SampleWindow(NULL, sizeof(argv)/sizeof(char*), const_cast<char**>(argv), NULL);
+    args.push_back("--pictureDir");
+    args.push_back("/sdcard/skiabot/skia_skp");
+
+    SkString msaaSampleCountString;
+    if (msaaSampleCount > 0) {
+        args.push_back("--msaa");
+        msaaSampleCountString.printf("%d", msaaSampleCount);

[djsollen, 2013/11/07 16:57:43]

printf in this case is a little more than you need you can just use
msaaSampleCountString.appendS32(msaaSampleCount)

[Kimmo Kinnunen, 2013/11/20 13:45:00]

Done.

+        args.push_back(msaaSampleCountString.c_str());
+    }
+
+    gWindow = new SampleWindow(NULL, args.count(), const_cast<char**>(args.begin()), NULL);
 
     // send the list of slides up to the activity
     const int slideCount = gWindow->sampleCount();
     jobjectArray slideList = env->NewObjectArray(slideCount, env->FindClass("java/lang/String"), env->NewStringUTF(""));
     for (int i = 0; i < slideCount; i++) {
         jstring slideTitle = env->NewStringUTF(gWindow->getSampleTitle(i).c_str());
         env->SetObjectArrayElement(slideList, i, slideTitle);
         env->DeleteLocalRef(slideTitle);
     }
     env->CallVoidMethod(gActivityGlue.m_obj, gActivityGlue.m_setSlideList, slideList);
@@ skipping 123 matching lines @@
         JNIEnv* env, jobject thiz)
 {
     gWindow->saveToPdf();
 }
 
 JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_postInval(
         JNIEnv* env, jobject thiz)
 {
     gWindow->postInvalDelay();
 }