Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More refactoring"

Browse Source
This commit is contained in:
John Reck
2013-11-11 17:38:18 +00:00
committed by Android (Google) Code Review
parent 2ee011a3c4 3083579424
commit e77a040f3a
8 changed files with 1645 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/view/DisplayList.java
View File

@@ -86,18 +86,15 @@ import android.graphics.Matrix;
*
* <pre class="prettyprint">
* private void createDisplayList() {
* HardwareRenderer renderer = getHardwareRenderer();
* if (renderer != null) {
* mDisplayList = renderer.createDisplayList();
* HardwareCanvas canvas = mDisplayList.start(width, height);
* try {
* for (Bitmap b : mBitmaps) {
* canvas.drawBitmap(b, 0.0f, 0.0f, null);
* canvas.translate(0.0f, b.getHeight());
* }
* } finally {
* displayList.end();
* mDisplayList = DisplayList.create("MyDisplayList");
* HardwareCanvas canvas = mDisplayList.start(width, height);
* try {
* for (Bitmap b : mBitmaps) {
* canvas.drawBitmap(b, 0.0f, 0.0f, null);
* canvas.translate(0.0f, b.getHeight());
* }
* } finally {
* displayList.end();
* }
* }
*

1610
core/java/android/view/GLRenderer.java Normal file
View File

File diff suppressed because it is too large Load Diff

1650
core/java/android/view/HardwareRenderer.java
View File

File diff suppressed because it is too large Load Diff

14
core/java/android/view/View.java
View File

@@ -13357,20 +13357,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
return !(mAttachInfo == null || mAttachInfo.mHardwareRenderer == null);
}
/**
* @return The {@link HardwareRenderer} associated with that view or null if
* hardware rendering is not supported or this view is not attached
* to a window.
*
* @hide
*/
public HardwareRenderer getHardwareRenderer() {
if (mAttachInfo != null) {
return mAttachInfo.mHardwareRenderer;
}
return null;
}
/**
* Returns a DisplayList. If the incoming displayList is null, one will be created.
* Otherwise, the same display list will be returned (after having been rendered into

2
core/java/android/view/ViewRootImpl.java
View File

@@ -718,7 +718,7 @@ public final class ViewRootImpl implements ViewParent,
}
final boolean translucent = attrs.format != PixelFormat.OPAQUE;
mAttachInfo.mHardwareRenderer = HardwareRenderer.createGlRenderer(2, translucent);
mAttachInfo.mHardwareRenderer = HardwareRenderer.create(translucent);
if (mAttachInfo.mHardwareRenderer != null) {
mAttachInfo.mHardwareRenderer.setName(attrs.getTitle().toString());
mAttachInfo.mHardwareAccelerated =

2
core/jni/Android.mk
View File

@@ -51,8 +51,8 @@ LOCAL_SRC_FILES:= \
android_view_InputQueue.cpp \
android_view_KeyEvent.cpp \
android_view_KeyCharacterMap.cpp \
android_view_HardwareRenderer.cpp \
android_view_GraphicBuffer.cpp \
android_view_GLRenderer.cpp \
android_view_GLES20DisplayList.cpp \
android_view_GLES20Canvas.cpp \
android_view_MotionEvent.cpp \

4
core/jni/AndroidRuntime.cpp
View File

@@ -122,7 +122,7 @@ extern int register_android_view_DisplayEventReceiver(JNIEnv* env);
extern int register_android_view_GraphicBuffer(JNIEnv* env);
extern int register_android_view_GLES20DisplayList(JNIEnv* env);
extern int register_android_view_GLES20Canvas(JNIEnv* env);
extern int register_android_view_HardwareRenderer(JNIEnv* env);
extern int register_android_view_GLRenderer(JNIEnv* env);
extern int register_android_view_Surface(JNIEnv* env);
extern int register_android_view_SurfaceControl(JNIEnv* env);
extern int register_android_view_SurfaceSession(JNIEnv* env);
@@ -1118,7 +1118,7 @@ static const RegJNIRec gRegJNI[] = {
REG_JNI(register_android_view_GraphicBuffer),
REG_JNI(register_android_view_GLES20DisplayList),
REG_JNI(register_android_view_GLES20Canvas),
REG_JNI(register_android_view_HardwareRenderer),
REG_JNI(register_android_view_GLRenderer),
REG_JNI(register_android_view_Surface),
REG_JNI(register_android_view_SurfaceControl),
REG_JNI(register_android_view_SurfaceSession),

32
core/jni/android_view_HardwareRenderer.cpp → core/jni/android_view_GLRenderer.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "HardwareRenderer"
#define LOG_TAG "GLRenderer"
#include "jni.h"
#include <nativehelper/JNIHelp.h>
@@ -60,7 +60,7 @@ namespace android {
// Surface and display management
// ----------------------------------------------------------------------------
static jboolean android_view_HardwareRenderer_preserveBackBuffer(JNIEnv* env, jobject clazz) {
static jboolean android_view_GLRenderer_preserveBackBuffer(JNIEnv* env, jobject clazz) {
EGLDisplay display = eglGetCurrentDisplay();
EGLSurface surface = eglGetCurrentSurface(EGL_DRAW);
@@ -75,7 +75,7 @@ static jboolean android_view_HardwareRenderer_preserveBackBuffer(JNIEnv* env, jo
return error == EGL_SUCCESS;
}
static jboolean android_view_HardwareRenderer_isBackBufferPreserved(JNIEnv* env, jobject clazz) {
static jboolean android_view_GLRenderer_isBackBufferPreserved(JNIEnv* env, jobject clazz) {
EGLDisplay display = eglGetCurrentDisplay();
EGLSurface surface = eglGetCurrentSurface(EGL_DRAW);
EGLint value;
@@ -95,14 +95,14 @@ static jboolean android_view_HardwareRenderer_isBackBufferPreserved(JNIEnv* env,
// Tracing and debugging
// ----------------------------------------------------------------------------
static bool android_view_HardwareRenderer_loadProperties(JNIEnv* env, jobject clazz) {
static bool android_view_GLRenderer_loadProperties(JNIEnv* env, jobject clazz) {
if (uirenderer::Caches::hasInstance()) {
return uirenderer::Caches::getInstance().initProperties();
}
return false;
}
static void android_view_HardwareRenderer_beginFrame(JNIEnv* env, jobject clazz,
static void android_view_GLRenderer_beginFrame(JNIEnv* env, jobject clazz,
jintArray size) {
EGLDisplay display = eglGetCurrentDisplay();
@@ -124,7 +124,7 @@ static void android_view_HardwareRenderer_beginFrame(JNIEnv* env, jobject clazz,
eglBeginFrame(display, surface);
}
static jlong android_view_HardwareRenderer_getSystemTime(JNIEnv* env, jobject clazz) {
static jlong android_view_GLRenderer_getSystemTime(JNIEnv* env, jobject clazz) {
if (uirenderer::Extensions::getInstance().hasNvSystemTime()) {
return eglGetSystemTimeNV();
}
@@ -137,7 +137,7 @@ static jlong android_view_HardwareRenderer_getSystemTime(JNIEnv* env, jobject cl
// Shaders
// ----------------------------------------------------------------------------
static void android_view_HardwareRenderer_setupShadersDiskCache(JNIEnv* env, jobject clazz,
static void android_view_GLRenderer_setupShadersDiskCache(JNIEnv* env, jobject clazz,
jstring diskCachePath) {
const char* cacheArray = env->GetStringUTFChars(diskCachePath, NULL);
@@ -149,24 +149,24 @@ static void android_view_HardwareRenderer_setupShadersDiskCache(JNIEnv* env, job
// JNI Glue
// ----------------------------------------------------------------------------
const char* const kClassPathName = "android/view/HardwareRenderer";
const char* const kClassPathName = "android/view/GLRenderer";
static JNINativeMethod gMethods[] = {
#ifdef USE_OPENGL_RENDERER
{ "nIsBackBufferPreserved", "()Z", (void*) android_view_HardwareRenderer_isBackBufferPreserved },
{ "nPreserveBackBuffer", "()Z", (void*) android_view_HardwareRenderer_preserveBackBuffer },
{ "nLoadProperties", "()Z", (void*) android_view_HardwareRenderer_loadProperties },
{ "isBackBufferPreserved", "()Z", (void*) android_view_GLRenderer_isBackBufferPreserved },
{ "preserveBackBuffer", "()Z", (void*) android_view_GLRenderer_preserveBackBuffer },
{ "loadProperties", "()Z", (void*) android_view_GLRenderer_loadProperties },
{ "nBeginFrame", "([I)V", (void*) android_view_HardwareRenderer_beginFrame },
{ "beginFrame", "([I)V", (void*) android_view_GLRenderer_beginFrame },
{ "nGetSystemTime", "()J", (void*) android_view_HardwareRenderer_getSystemTime },
{ "getSystemTime", "()J", (void*) android_view_GLRenderer_getSystemTime },
#endif
{ "nSetupShadersDiskCache", "(Ljava/lang/String;)V",
(void*) android_view_HardwareRenderer_setupShadersDiskCache },
{ "setupShadersDiskCache", "(Ljava/lang/String;)V",
(void*) android_view_GLRenderer_setupShadersDiskCache },
};
int register_android_view_HardwareRenderer(JNIEnv* env) {
int register_android_view_GLRenderer(JNIEnv* env) {
return AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods));
}