OSDN Git Service

AArch64: Make graphics classes 64-bit compatible
authorAshok Bhat <ashok.bhat@arm.com>
Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)
committerNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 10:02:43 +0000 (10:02 +0000)
commit36bef0bf30d6bae48cf3837df351075ca4fce654
tree9b4ac2bcd764da7526d309e0341be30ab63c9f1d
parent729b12c7a91f9caa65af77197cf6a8814a5a2051
AArch64: Make graphics classes 64-bit compatible

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
87 files changed:
core/java/android/view/DisplayList.java
core/java/android/view/GLES20Canvas.java
core/java/android/view/GLES20Layer.java
core/java/android/view/GLES20RecordingCanvas.java
core/java/android/view/GLRenderer.java
core/java/android/view/GraphicBuffer.java
core/java/android/view/HardwareCanvas.java
core/java/android/view/HardwareRenderer.java
core/java/android/view/Surface.java
core/java/android/view/SurfaceControl.java
core/java/android/view/TextureView.java
core/java/android/view/ThreadedRenderer.java
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/BitmapFactory.cpp
core/jni/android/graphics/Camera.cpp
core/jni/android/graphics/Canvas.cpp
core/jni/android/graphics/ColorFilter.cpp
core/jni/android/graphics/DrawFilter.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/LayerRasterizer.cpp
core/jni/android/graphics/MaskFilter.cpp
core/jni/android/graphics/Matrix.cpp
core/jni/android/graphics/NinePatch.cpp
core/jni/android/graphics/Paint.cpp
core/jni/android/graphics/Path.cpp
core/jni/android/graphics/PathEffect.cpp
core/jni/android/graphics/Picture.cpp
core/jni/android/graphics/PorterDuff.cpp
core/jni/android/graphics/Rasterizer.cpp
core/jni/android/graphics/Region.cpp
core/jni/android/graphics/Shader.cpp
core/jni/android/graphics/Typeface.cpp
core/jni/android/graphics/Xfermode.cpp
core/jni/android/opengl/util.cpp
core/jni/android_view_DisplayList.cpp
core/jni/android_view_GLES20Canvas.cpp
core/jni/android_view_GraphicBuffer.cpp
core/jni/android_view_Surface.cpp
core/jni/android_view_SurfaceControl.cpp
core/jni/android_view_TextureView.cpp
core/jni/com_google_android_gles_jni_EGLImpl.cpp
graphics/java/android/graphics/AvoidXfermode.java
graphics/java/android/graphics/Bitmap.java
graphics/java/android/graphics/BitmapFactory.java
graphics/java/android/graphics/BitmapShader.java
graphics/java/android/graphics/BlurMaskFilter.java
graphics/java/android/graphics/Camera.java
graphics/java/android/graphics/Canvas.java
graphics/java/android/graphics/ColorFilter.java
graphics/java/android/graphics/ColorMatrixColorFilter.java
graphics/java/android/graphics/ComposePathEffect.java
graphics/java/android/graphics/ComposeShader.java
graphics/java/android/graphics/CornerPathEffect.java
graphics/java/android/graphics/DashPathEffect.java
graphics/java/android/graphics/DiscretePathEffect.java
graphics/java/android/graphics/DrawFilter.java
graphics/java/android/graphics/EmbossMaskFilter.java
graphics/java/android/graphics/LargeBitmap.java
graphics/java/android/graphics/LayerRasterizer.java
graphics/java/android/graphics/LightingColorFilter.java
graphics/java/android/graphics/LinearGradient.java
graphics/java/android/graphics/MaskFilter.java
graphics/java/android/graphics/Matrix.java
graphics/java/android/graphics/NinePatch.java
graphics/java/android/graphics/Paint.java
graphics/java/android/graphics/PaintFlagsDrawFilter.java
graphics/java/android/graphics/Path.java
graphics/java/android/graphics/PathDashPathEffect.java
graphics/java/android/graphics/PathEffect.java
graphics/java/android/graphics/Picture.java
graphics/java/android/graphics/PixelXorXfermode.java
graphics/java/android/graphics/PorterDuffColorFilter.java
graphics/java/android/graphics/PorterDuffXfermode.java
graphics/java/android/graphics/RadialGradient.java
graphics/java/android/graphics/Rasterizer.java
graphics/java/android/graphics/Region.java
graphics/java/android/graphics/RegionIterator.java
graphics/java/android/graphics/Shader.java
graphics/java/android/graphics/SumPathEffect.java
graphics/java/android/graphics/SweepGradient.java
graphics/java/android/graphics/TableMaskFilter.java
graphics/java/android/graphics/Typeface.java
graphics/java/android/graphics/Xfermode.java
media/jni/android_media_MediaMetadataRetriever.cpp
rs/jni/android_renderscript_RenderScript.cpp
services/core/java/com/android/server/AssetAtlasService.java
services/core/jni/com_android_server_AssetAtlasService.cpp