36bef0bf30
This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
45 lines
1.6 KiB
Java
45 lines
1.6 KiB
Java
/*
|
|
* Copyright (C) 2006 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
// This file was generated from the C++ include file: SkXfermode.h
|
|
// Any changes made to this file will be discarded by the build.
|
|
// To change this file, either edit the include, or device/tools/gluemaker/main.cpp,
|
|
// or one of the auxilary file specifications in device/tools/gluemaker.
|
|
|
|
package android.graphics;
|
|
|
|
/**
|
|
* Xfermode is the base class for objects that are called to implement custom
|
|
* "transfer-modes" in the drawing pipeline. The static function Create(Modes)
|
|
* can be called to return an instance of any of the predefined subclasses as
|
|
* specified in the Modes enum. When an Xfermode is assigned to an Paint, then
|
|
* objects drawn with that paint have the xfermode applied.
|
|
*/
|
|
public class Xfermode {
|
|
|
|
protected void finalize() throws Throwable {
|
|
try {
|
|
finalizer(native_instance);
|
|
} finally {
|
|
super.finalize();
|
|
}
|
|
}
|
|
|
|
private static native void finalizer(long native_instance);
|
|
|
|
long native_instance;
|
|
}
|