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

Merge "Start implementing SurfaceTexture streaming into RS allocations."

Browse Source
This commit is contained in:
Jason Sams
2012-02-10 13:51:04 -08:00
committed by Android (Google) Code Review
parent 1137be1a68 532efd3ce2
commit cb66aec0bd
13 changed files with 128 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import android.content.res.Resources;
import android.content.res.AssetManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.SurfaceTexture;
import android.util.Log;
import android.util.TypedValue;
@@ -78,6 +79,8 @@ public class Allocation extends BaseObj {
boolean mConstrainedFace;
boolean mConstrainedY;
boolean mConstrainedZ;
boolean mReadAllowed = true;
boolean mWriteAllowed = true;
int mSelectedY;
int mSelectedZ;
int mSelectedLOD;
@@ -127,6 +130,32 @@ public class Allocation extends BaseObj {
*/
public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010;
/**
* USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be
* used with a SurfaceTexture object. This usage will cause the
* allocation to be created read only.
*
* @hide
*/
public static final int USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE = 0x0020;
/**
* USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be
* used with a SurfaceTexture object. This usage will cause the
* allocation to be created read only.
*
* @hide
*/
public static final int USAGE_IO_INPUT = 0x0040;
/**
* USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be
* used with a SurfaceTexture object. This usage will cause the
* allocation to be created read only.
*
* @hide
*/
public static final int USAGE_IO_OUTPUT = 0x0080;
/**
* Controls mipmap behavior when using the bitmap creation and
@@ -187,10 +216,26 @@ public class Allocation extends BaseObj {
USAGE_GRAPHICS_TEXTURE |
USAGE_GRAPHICS_VERTEX |
USAGE_GRAPHICS_CONSTANTS |
USAGE_GRAPHICS_RENDER_TARGET)) != 0) {
USAGE_GRAPHICS_RENDER_TARGET |
USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE |
USAGE_IO_INPUT |
USAGE_IO_OUTPUT)) != 0) {
throw new RSIllegalArgumentException("Unknown usage specified.");
}
if ((usage & (USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE | USAGE_IO_INPUT)) != 0) {
mWriteAllowed = false;
if ((usage & ~(USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE |
USAGE_IO_INPUT |
USAGE_GRAPHICS_TEXTURE |
USAGE_SCRIPT)) != 0) {
throw new RSIllegalArgumentException("Invalid usage combination.");
}
}
mType = t;
mUsage = usage;
if (t != null) {
updateCacheInfo(t);
@@ -1005,6 +1050,23 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, t, usage);
}
/**
*
*
* @hide
*
*/
public SurfaceTexture getSurfaceTexture() {
if ((mUsage & USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE) == 0) {
throw new RSInvalidStateException("Allocation is not a surface texture.");
}
int id = mRS.nAllocationGetSurfaceTextureID(getID());
return new SurfaceTexture(id);
}
/**
* Creates a non-mipmapped renderscript allocation to use as a
* graphics texture

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

@@ -269,6 +269,12 @@ public class RenderScript {
validate();
rsnAllocationSyncAll(mContext, alloc, src);
}
native int rsnAllocationGetSurfaceTextureID(int con, int alloc);
synchronized int nAllocationGetSurfaceTextureID(int alloc) {
validate();
return rsnAllocationGetSurfaceTextureID(mContext, alloc);
}
native void rsnAllocationGenerateMipmaps(int con, int alloc);
synchronized void nAllocationGenerateMipmaps(int alloc) {
validate();

8
graphics/jni/android_renderscript_RenderScript.cpp
View File

@@ -443,6 +443,13 @@ nAllocationSyncAll(JNIEnv *_env, jobject _this, RsContext con, jint a, jint bits
rsAllocationSyncAll(con, (RsAllocation)a, (RsAllocationUsageType)bits);
}
static jint
nAllocationGetSurfaceTextureID(JNIEnv *_env, jobject _this, RsContext con, jint a)
{
LOG_API("nAllocationGetSurfaceTextureID, con(%p), a(%p)", con, (RsAllocation)a);
return rsAllocationGetSurfaceTextureID(con, (RsAllocation)a);
}
static void
nAllocationGenerateMipmaps(JNIEnv *_env, jobject _this, RsContext con, jint alloc)
{
@@ -1258,6 +1265,7 @@ static JNINativeMethod methods[] = {
{"rsnAllocationCopyToBitmap", "(IILandroid/graphics/Bitmap;)V", (void*)nAllocationCopyToBitmap },
{"rsnAllocationSyncAll", "(III)V", (void*)nAllocationSyncAll },
{"rsnAllocationGetSurfaceTextureID", "(II)I", (void*)nAllocationGetSurfaceTextureID },
{"rsnAllocationData1D", "(IIIII[II)V", (void*)nAllocationData1D_i },
{"rsnAllocationData1D", "(IIIII[SI)V", (void*)nAllocationData1D_s },
{"rsnAllocationData1D", "(IIIII[BI)V", (void*)nAllocationData1D_b },

5
libs/rs/RenderScriptDefines.h
View File

@@ -99,8 +99,11 @@ enum RsAllocationUsageType {
RS_ALLOCATION_USAGE_GRAPHICS_VERTEX = 0x0004,
RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS = 0x0008,
RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET = 0x0010,
RS_ALLOCATION_USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE = 0x0020,
RS_ALLOCATION_USAGE_IO_INPUT = 0x0040,
RS_ALLOCATION_USAGE_IO_OUTPUT = 0x0080,
RS_ALLOCATION_USAGE_ALL = 0x000F
RS_ALLOCATION_USAGE_ALL = 0x00FF
};
enum RsAllocationMipmapControl {

13
libs/rs/driver/rsdAllocation.cpp
View File

@@ -134,6 +134,13 @@ static void Upload2DTexture(const Context *rsc, const Allocation *alloc, bool is
static void UploadToTexture(const Context *rsc, const Allocation *alloc) {
DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE) {
if (!drv->textureID) {
RSD_CALL_GL(glGenTextures, 1, &drv->textureID);
}
return;
}
if (!drv->glType || !drv->glFormat) {
return;
}
@@ -370,6 +377,12 @@ void rsdAllocationMarkDirty(const Context *rsc, const Allocation *alloc) {
drv->uploadDeferred = true;
}
int32_t rsdAllocationInitSurfaceTexture(const Context *rsc, const Allocation *alloc) {
DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
UploadToTexture(rsc, alloc);
return drv->textureID;
}
void rsdAllocationData1D(const Context *rsc, const Allocation *alloc,
uint32_t xoff, uint32_t lod, uint32_t count,
const void *data, uint32_t sizeBytes) {

2
libs/rs/driver/rsdAllocation.h
View File

@@ -67,6 +67,8 @@ void rsdAllocationSyncAll(const android::renderscript::Context *rsc,
RsAllocationUsageType src);
void rsdAllocationMarkDirty(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc);
int32_t rsdAllocationInitSurfaceTexture(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc);
void rsdAllocationData1D(const android::renderscript::Context *rsc,
const android::renderscript::Allocation *alloc,

1
libs/rs/driver/rsdCore.cpp
View File

@@ -72,6 +72,7 @@ static RsdHalFunctions FunctionTable = {
rsdAllocationResize,
rsdAllocationSyncAll,
rsdAllocationMarkDirty,
rsdAllocationInitSurfaceTexture,
rsdAllocationData1D,
rsdAllocationData2D,
rsdAllocationData3D,

7
libs/rs/driver/rsdShader.cpp
View File

@@ -143,7 +143,12 @@ void RsdShader::appendTextures() {
char buf[256];
for (uint32_t ct=0; ct < mRSProgram->mHal.state.texturesCount; ct++) {
if (mRSProgram->mHal.state.textureTargets[ct] == RS_TEXTURE_2D) {
snprintf(buf, sizeof(buf), "uniform sampler2D UNI_Tex%i;\n", ct);
Allocation *a = mRSProgram->mHal.state.textures[ct];
if (a && a->mHal.state.surfaceTextureID) {
snprintf(buf, sizeof(buf), "uniform samplerExternalOES UNI_Tex%i;\n", ct);
} else {
snprintf(buf, sizeof(buf), "uniform sampler2D UNI_Tex%i;\n", ct);
}
mTextureTargets[ct] = GL_TEXTURE_2D;
} else {
snprintf(buf, sizeof(buf), "uniform samplerCube UNI_Tex%i;\n", ct);

6
libs/rs/driver/rsdShaderCache.h
View File

@@ -108,6 +108,7 @@ protected:
}
if (numFragUnis) {
fragUniforms = new UniformData[numFragUnis];
fragUniformIsSTO = new bool[numFragUnis];
}
}
~ProgramEntry() {
@@ -123,6 +124,10 @@ protected:
delete[] fragUniforms;
fragUniforms = NULL;
}
if (fragUniformIsSTO) {
delete[] fragUniformIsSTO;
fragUniformIsSTO = NULL;
}
}
uint32_t vtx;
uint32_t frag;
@@ -131,6 +136,7 @@ protected:
AttrData *vtxAttrs;
UniformData *vtxUniforms;
UniformData *fragUniforms;
bool *fragUniformIsSTO;
};
android::Vector<ProgramEntry*> mEntries;
ProgramEntry *mCurrent;

5
libs/rs/rs.spec
View File

@@ -63,7 +63,10 @@ AllocationCubeCreateFromBitmap {
ret RsAllocation
}
AllocationGetSurfaceTextureID {
param RsAllocation alloc
ret int32_t
}
ContextFinish {
sync

11
libs/rs/rsAllocation.cpp
View File

@@ -413,6 +413,12 @@ void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY) {
ALOGE("not implemented");
}
int32_t Allocation::getSurfaceTextureID(const Context *rsc) {
int32_t id = rsc->mHal.funcs.allocation.initSurfaceTexture(rsc, this);
mHal.state.surfaceTextureID = id;
return id;
}
/////////////////
//
@@ -658,6 +664,11 @@ void rsi_AllocationCopy2DRange(Context *rsc,
(RsAllocationCubemapFace)srcFace);
}
int32_t rsi_AllocationGetSurfaceTextureID(Context *rsc, RsAllocation valloc) {
Allocation *alloc = static_cast<Allocation *>(valloc);
return alloc->getSurfaceTextureID(rsc);
}
}
}

3
libs/rs/rsAllocation.h
View File

@@ -55,6 +55,8 @@ public:
bool hasMipmaps;
bool hasFaces;
bool hasReferences;
void * usrPtr;
int32_t surfaceTextureID;
};
State state;
@@ -123,6 +125,7 @@ public:
return mHal.state.mipmapControl != RS_ALLOCATION_MIPMAP_NONE;
}
int32_t getSurfaceTextureID(const Context *rsc);
protected:
Vector<const Program *> mToDirtyList;

1
libs/rs/rs_hal.h
View File

@@ -114,6 +114,7 @@ typedef struct {
bool zeroNew);
void (*syncAll)(const Context *rsc, const Allocation *alloc, RsAllocationUsageType src);
void (*markDirty)(const Context *rsc, const Allocation *alloc);
int32_t (*initSurfaceTexture)(const Context *rsc, const Allocation *alloc);
void (*data1D)(const Context *rsc, const Allocation *alloc,
uint32_t xoff, uint32_t lod, uint32_t count,