drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d2e4a166: Merge "Remove dead path code"

Browse Source 
* commit 'd2e4a166ebae4dcf0a9d6cb186283739443b0803':
  Remove dead path code
This commit is contained in:
Jason Sams
2015-03-11 21:06:53 +00:00
committed by Android Git Automerger
parent 6c881ec9d5 d2e4a166eb
commit bb8c910fc1
3 changed files with 1 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
rs/java/android/renderscript/Path.java
View File

@ -1,87 +0,0 @@
/*
* Copyright (C) 2008 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.
*/
package android.renderscript;
/**
* @hide
*
*/
public class Path extends BaseObj {
public enum Primitive {
QUADRATIC_BEZIER(0),
CUBIC_BEZIER(1);
int mID;
Primitive(int id) {
mID = id;
}
}
Allocation mVertexBuffer;
Allocation mLoopBuffer;
Primitive mPrimitive;
float mQuality;
boolean mCoverageToAlpha;
Path(long id, RenderScript rs, Primitive p, Allocation vtx, Allocation loop, float q) {
super(id, rs);
mVertexBuffer = vtx;
mLoopBuffer = loop;
mPrimitive = p;
mQuality = q;
}
public Allocation getVertexAllocation() {
return mVertexBuffer;
}
public Allocation getLoopAllocation() {
return mLoopBuffer;
}
public Primitive getPrimitive() {
return mPrimitive;
}
@Override
void updateFromNative() {
}
public static Path createStaticPath(RenderScript rs, Primitive p, float quality, Allocation vtx) {
long id = rs.nPathCreate(p.mID, false, vtx.getID(rs), 0, quality);
Path newPath = new Path(id, rs, p, null, null, quality);
return newPath;
}
public static Path createStaticPath(RenderScript rs, Primitive p, float quality, Allocation vtx, Allocation loops) {
return null;
}
public static Path createDynamicPath(RenderScript rs, Primitive p, float quality, Allocation vtx) {
return null;
}
public static Path createDynamicPath(RenderScript rs, Primitive p, float quality, Allocation vtx, Allocation loops) {
return null;
}
}

6
rs/java/android/renderscript/RenderScript.java
View File

@ -908,12 +908,6 @@ public class RenderScript {
rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount);
}
native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, long loop, float q);
synchronized long nPathCreate(int prim, boolean isStatic, long vtx, long loop, float q) {
validate();
return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q);
}
native void rsnScriptIntrinsicBLAS_Single(long con, long id, int func, int TransA,
int TransB, int Side, int Uplo, int Diag, int M, int N, int K,
float alpha, long A, long B, float beta, long C, int incX, int incY,

15
rs/jni/android_renderscript_RenderScript.cpp
View File

@ -1315,7 +1315,7 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
jbyte *ptr = _env->GetByteArrayElements(data, nullptr);
rsAllocationElementRead((RsContext)con, (RsAllocation)alloc,
xoff, yoff, zoff,
lod, ptr, sizeBytes, compIdx);
lod, ptr, sizeBytes, compIdx);
_env->ReleaseByteArrayElements(data, ptr, JNI_ABORT);
}
@ -2183,18 +2183,6 @@ nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minF
// ---------------------------------------------------------------------------
static jlong
nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jlong _loop, jfloat q) {
if (kLogApi) {
ALOGD("nPathCreate, con(%p)", (RsContext)con);
}
jlong id = (jlong)(uintptr_t)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic,
(RsAllocation)_vtx,
(RsAllocation)_loop, q);
return id;
}
static jlong
nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _vtx, jlongArray _idx, jintArray _prim)
{
@ -2444,7 +2432,6 @@ static JNINativeMethod methods[] = {
{"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate },
{"rsnPathCreate", "(JIZJJF)J", (void*)nPathCreate },
{"rsnMeshCreate", "(J[J[J[I)J", (void*)nMeshCreate },
{"rsnMeshGetVertexBufferCount", "(JJ)I", (void*)nMeshGetVertexBufferCount },