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

Merge "Implement allocation resizing."

Browse Source
This commit is contained in:
Jason Sams
2010-10-05 13:35:47 -07:00
committed by Android (Google) Code Review
parent cd1b8d3665 5edc608a07
commit 68159aabb3
8 changed files with 163 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/java/android/renderscript/Allocation.java
View File

@@ -182,6 +182,24 @@ public class Allocation extends BaseObj {
mRS.nAllocationRead(mID, d);
}
public void resize(int dimX) {
if ((mType.getY() > 0)|| (mType.getZ() > 0) || mType.getFaces() || mType.getLOD()) {
throw new IllegalStateException("Resize only support for 1D allocations at this time.");
}
mRS.nAllocationResize1D(mID, dimX);
}
/*
public void resize(int dimX, int dimY) {
if ((mType.getZ() > 0) || mType.getFaces() || mType.getLOD()) {
throw new IllegalStateException("Resize only support for 2D allocations at this time.");
}
if (mType.getY() == 0) {
throw new IllegalStateException("Resize only support for 2D allocations at this time.");
}
mRS.nAllocationResize2D(mID, dimX, dimY);
}
*/
public class Adapter1D extends BaseObj {
Adapter1D(int id, RenderScript rs) {

9
graphics/java/android/renderscript/RenderScript.java
View File

@@ -254,6 +254,15 @@ public class RenderScript {
return rsnAllocationGetType(mContext, id);
}
native void rsnAllocationResize1D(int con, int id, int dimX);
synchronized void nAllocationResize1D(int id, int dimX) {
rsnAllocationResize1D(mContext, id, dimX);
}
native void rsnAllocationResize2D(int con, int id, int dimX, int dimY);
synchronized void nAllocationResize2D(int id, int dimX, int dimY) {
rsnAllocationResize2D(mContext, id, dimX, dimY);
}
native int rsnFileA3DCreateFromAssetStream(int con, int assetStream);
synchronized int nFileA3DCreateFromAssetStream(int assetStream) {
return rsnFileA3DCreateFromAssetStream(mContext, assetStream);

16
graphics/jni/android_renderscript_RenderScript.cpp
View File

@@ -587,6 +587,20 @@ nAllocationGetType(JNIEnv *_env, jobject _this, RsContext con, jint a)
return (jint) rsAllocationGetType(con, (RsAllocation)a);
}
static void
nAllocationResize1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint dimX)
{
LOG_API("nAllocationResize1D, con(%p), alloc(%p), sizeX(%i)", con, (RsAllocation)alloc, dimX);
rsAllocationResize1D(con, (RsAllocation)alloc, dimX);
}
static void
nAllocationResize2D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint dimX, jint dimY)
{
LOG_API("nAllocationResize1D, con(%p), alloc(%p), sizeX(%i), sizeY(%i)", con, (RsAllocation)alloc, dimX, dimY);
rsAllocationResize2D(con, (RsAllocation)alloc, dimX, dimY);
}
// -----------------------------------
static int
@@ -1252,6 +1266,8 @@ static JNINativeMethod methods[] = {
{"rsnAllocationRead", "(II[I)V", (void*)nAllocationRead_i },
{"rsnAllocationRead", "(II[F)V", (void*)nAllocationRead_f },
{"rsnAllocationGetType", "(II)I", (void*)nAllocationGetType},
{"rsnAllocationResize1D", "(III)V", (void*)nAllocationResize1D },
{"rsnAllocationResize2D", "(IIII)V", (void*)nAllocationResize2D },
{"rsnAdapter1DBindAllocation", "(III)V", (void*)nAdapter1DBindAllocation },
{"rsnAdapter1DSetConstraint", "(IIII)V", (void*)nAdapter1DSetConstraint },

11
libs/rs/rs.spec
View File

@@ -280,6 +280,17 @@ AllocationGetType {
ret const void*
}
AllocationResize1D {
param RsAllocation va
param uint32_t dimX
}
AllocationResize2D {
param RsAllocation va
param uint32_t dimX
param uint32_t dimY
}
SamplerBegin {
}

49
libs/rs/rsAllocation.cpp
View File

@@ -488,12 +488,13 @@ void Allocation::sendDirty() const
}
}
void Allocation::incRefs(const void *ptr, size_t ct) const
void Allocation::incRefs(const void *ptr, size_t ct, size_t startOff) const
{
const uint8_t *p = static_cast<const uint8_t *>(ptr);
const Element *e = mType->getElement();
uint32_t stride = e->getSizeBytes();
p += stride * startOff;
while (ct > 0) {
e->incRefs(p);
ct --;
@@ -501,12 +502,13 @@ void Allocation::incRefs(const void *ptr, size_t ct) const
}
}
void Allocation::decRefs(const void *ptr, size_t ct) const
void Allocation::decRefs(const void *ptr, size_t ct, size_t startOff) const
{
const uint8_t *p = static_cast<const uint8_t *>(ptr);
const Element *e = mType->getElement();
uint32_t stride = e->getSizeBytes();
p += stride * startOff;
while (ct > 0) {
e->decRefs(p);
ct --;
@@ -514,6 +516,37 @@ void Allocation::decRefs(const void *ptr, size_t ct) const
}
}
void Allocation::copyRange1D(Context *rsc, const Allocation *src, int32_t srcOff, int32_t destOff, int32_t len)
{
}
void Allocation::resize1D(Context *rsc, uint32_t dimX)
{
Type *t = mType->cloneAndResize1D(rsc, dimX);
uint32_t oldDimX = mType->getDimX();
if (dimX == oldDimX) {
return;
}
if (dimX < oldDimX) {
decRefs(mPtr, oldDimX - dimX, dimX);
}
mPtr = realloc(mPtr, t->getSizeBytes());
if (dimX > oldDimX) {
const Element *e = mType->getElement();
uint32_t stride = e->getSizeBytes();
memset(((uint8_t *)mPtr) + stride * oldDimX, 0, stride * (dimX - oldDimX));
}
mType.set(t);
}
void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY)
{
LOGE("not implemented");
}
/////////////////
//
@@ -822,6 +855,18 @@ void rsi_AllocationRead(Context *rsc, RsAllocation va, void *data)
a->read(data);
}
void rsi_AllocationResize1D(Context *rsc, RsAllocation va, uint32_t dimX)
{
Allocation *a = static_cast<Allocation *>(va);
a->resize1D(rsc, dimX);
}
void rsi_AllocationResize2D(Context *rsc, RsAllocation va, uint32_t dimX, uint32_t dimY)
{
Allocation *a = static_cast<Allocation *>(va);
a->resize2D(rsc, dimX, dimY);
}
const void* rsi_AllocationGetType(Context *rsc, RsAllocation va)
{
Allocation *a = static_cast<Allocation *>(va);

8
libs/rs/rsAllocation.h
View File

@@ -55,6 +55,10 @@ public:
void uploadToBufferObject(const Context *rsc);
uint32_t getBufferObjectID() const {return mBufferID;}
void copyRange1D(Context *rsc, const Allocation *src, int32_t srcOff, int32_t destOff, int32_t len);
void resize1D(Context *rsc, uint32_t dimX);
void resize2D(Context *rsc, uint32_t dimX, uint32_t dimY);
void data(Context *rsc, const void *data, uint32_t sizeBytes);
void subData(Context *rsc, uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes);
@@ -86,8 +90,8 @@ public:
bool getIsTexture() const {return mIsTexture;}
bool getIsBufferObject() const {return mIsVertexBuffer;}
void incRefs(const void *ptr, size_t ct) const;
void decRefs(const void *ptr, size_t ct) const;
void incRefs(const void *ptr, size_t ct, size_t startOff = 0) const;
void decRefs(const void *ptr, size_t ct, size_t startOff = 0) const;
void sendDirty() const;
bool getHasGraphicsMipmaps() const {return mTextureGenMipmap;}

53
libs/rs/rsType.cpp
View File

@@ -274,6 +274,59 @@ bool Type::isEqual(const Type *other) const {
return false;
}
Type * Type::cloneAndResize1D(Context *rsc, uint32_t dimX) const
{
TypeState * stc = &rsc->mStateType;
for (uint32_t ct=0; ct < stc->mTypes.size(); ct++) {
Type *t = stc->mTypes[ct];
if (t->getElement() != mElement.get()) continue;
if (t->getDimX() != dimX) continue;
if (t->getDimY() != mDimY) continue;
if (t->getDimZ() != mDimZ) continue;
if (t->getDimLOD() != mDimLOD) continue;
if (t->getDimFaces() != mFaces) continue;
t->incUserRef();
return t;
}
Type *nt = new Type(rsc);
nt->mElement.set(mElement);
nt->mDimX = dimX;
nt->mDimY = mDimY;
nt->mDimZ = mDimZ;
nt->mDimLOD = mDimLOD;
nt->mFaces = mFaces;
nt->compute();
return nt;
}
Type * Type::cloneAndResize2D(Context *rsc, uint32_t dimX, uint32_t dimY) const
{
TypeState * stc = &rsc->mStateType;
for (uint32_t ct=0; ct < stc->mTypes.size(); ct++) {
Type *t = stc->mTypes[ct];
if (t->getElement() != mElement.get()) continue;
if (t->getDimX() != dimX) continue;
if (t->getDimY() != dimY) continue;
if (t->getDimZ() != mDimZ) continue;
if (t->getDimLOD() != mDimLOD) continue;
if (t->getDimFaces() != mFaces) continue;
t->incUserRef();
return t;
}
Type *nt = new Type(rsc);
nt->mElement.set(mElement);
nt->mDimX = dimX;
nt->mDimY = dimY;
nt->mDimZ = mDimZ;
nt->mDimLOD = mDimLOD;
nt->mFaces = mFaces;
nt->compute();
return nt;
}
//////////////////////////////////////////////////
//
namespace android {

3
libs/rs/rsType.h
View File

@@ -79,6 +79,9 @@ public:
bool isEqual(const Type *other) const;
Type * cloneAndResize1D(Context *rsc, uint32_t dimX) const;
Type * cloneAndResize2D(Context *rsc, uint32_t dimX, uint32_t dimY) const;
protected:
struct LOD {
size_t mX;