Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.cpp modified: libs/rs/rsContext.h modified: libs/rs/rsProgram.cpp modified: libs/rs/rsProgram.h Delete the old rollo sample which is obsolete. Fix film init Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly. Fix film Beging GL2 user shaders. Switch master to using GL2 by default. Implement RS tracked defered texture and buffer object uploads. Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.h modified: libs/rs/rsProgramFragment.cpp modified: libs/rs/rsSimpleMesh.cpp Remove check for surface valid that is no longer valid. Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info. Continue es2 shader dev Conflicts: graphics/java/android/renderscript/Program.java graphics/java/android/renderscript/ProgramVertex.java Place shader logging behind prop to declutter logs. Fix emulated glColor in es2 mode. Fix live wallpaper many. Z coordinate was being ignored for draw quad call. Add argument checking to sampler builder to disallow illegal modes. Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode. Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures. This will break some apps, checkings for other projects will follow to unbreak them. Disable excessive RS logging. Add RS support for generic attribs as input to vertex programs. More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity. Support npot on es 2.0 HW. Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots. Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor. Implement type generation for user uniforms in vertex shader. Remove excessive logging, fix error in GLSL uniform generation. Fix RS mipmap generation for 8 bit alpha textures. Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names. Fix some minor bugs with GL state setup that were exposed by Droids driver. Implement drawSpriteCropped on es2.0
323 lines
9.4 KiB
Java
323 lines
9.4 KiB
Java
/*
|
|
* 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;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
|
|
import android.content.res.Resources;
|
|
import android.content.res.AssetManager;
|
|
import android.graphics.Bitmap;
|
|
import android.graphics.BitmapFactory;
|
|
import android.util.Log;
|
|
import android.util.TypedValue;
|
|
|
|
/**
|
|
* @hide
|
|
*
|
|
**/
|
|
public class Allocation extends BaseObj {
|
|
Type mType;
|
|
|
|
Allocation(int id, RenderScript rs, Type t) {
|
|
super(rs);
|
|
mID = id;
|
|
mType = t;
|
|
}
|
|
|
|
public Type getType() {
|
|
return mType;
|
|
}
|
|
|
|
public void uploadToTexture(int baseMipLevel) {
|
|
mRS.validate();
|
|
mRS.nAllocationUploadToTexture(mID, baseMipLevel);
|
|
}
|
|
|
|
public void uploadToBufferObject() {
|
|
mRS.validate();
|
|
mRS.nAllocationUploadToBufferObject(mID);
|
|
}
|
|
|
|
public void data(int[] d) {
|
|
mRS.validate();
|
|
subData1D(0, mType.getElementCount(), d);
|
|
}
|
|
public void data(short[] d) {
|
|
mRS.validate();
|
|
subData1D(0, mType.getElementCount(), d);
|
|
}
|
|
public void data(byte[] d) {
|
|
mRS.validate();
|
|
subData1D(0, mType.getElementCount(), d);
|
|
}
|
|
public void data(float[] d) {
|
|
mRS.validate();
|
|
subData1D(0, mType.getElementCount(), d);
|
|
}
|
|
|
|
private void data1DChecks(int off, int count, int len, int dataSize) {
|
|
mRS.validate();
|
|
if((off < 0) || (count < 1) || ((off + count) > mType.getElementCount())) {
|
|
throw new IllegalArgumentException("Offset or Count out of bounds.");
|
|
}
|
|
if((len) < dataSize) {
|
|
throw new IllegalArgumentException("Array too small for allocation type.");
|
|
}
|
|
}
|
|
|
|
public void subData1D(int off, int count, int[] d) {
|
|
int dataSize = mType.mElement.getSizeBytes() * count;
|
|
data1DChecks(off, count, d.length * 4, dataSize);
|
|
mRS.nAllocationSubData1D(mID, off, count, d, dataSize);
|
|
}
|
|
public void subData1D(int off, int count, short[] d) {
|
|
int dataSize = mType.mElement.getSizeBytes() * count;
|
|
data1DChecks(off, count, d.length * 2, dataSize);
|
|
mRS.nAllocationSubData1D(mID, off, count, d, dataSize);
|
|
}
|
|
public void subData1D(int off, int count, byte[] d) {
|
|
int dataSize = mType.mElement.getSizeBytes() * count;
|
|
data1DChecks(off, count, d.length, dataSize);
|
|
mRS.nAllocationSubData1D(mID, off, count, d, dataSize);
|
|
}
|
|
public void subData1D(int off, int count, float[] d) {
|
|
int dataSize = mType.mElement.getSizeBytes() * count;
|
|
data1DChecks(off, count, d.length * 4, dataSize);
|
|
mRS.nAllocationSubData1D(mID, off, count, d, dataSize);
|
|
}
|
|
|
|
|
|
|
|
public void subData2D(int xoff, int yoff, int w, int h, int[] d) {
|
|
mRS.validate();
|
|
mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d, d.length * 4);
|
|
}
|
|
|
|
public void subData2D(int xoff, int yoff, int w, int h, float[] d) {
|
|
mRS.validate();
|
|
mRS.nAllocationSubData2D(mID, xoff, yoff, w, h, d, d.length * 4);
|
|
}
|
|
|
|
public void readData(int[] d) {
|
|
mRS.validate();
|
|
mRS.nAllocationRead(mID, d);
|
|
}
|
|
|
|
public void readData(float[] d) {
|
|
mRS.validate();
|
|
mRS.nAllocationRead(mID, d);
|
|
}
|
|
|
|
public void data(Object o) {
|
|
mRS.validate();
|
|
mRS.nAllocationSubDataFromObject(mID, mType, 0, o);
|
|
}
|
|
|
|
public void read(Object o) {
|
|
mRS.validate();
|
|
mRS.nAllocationSubReadFromObject(mID, mType, 0, o);
|
|
}
|
|
|
|
public void subData(int offset, Object o) {
|
|
mRS.validate();
|
|
mRS.nAllocationSubDataFromObject(mID, mType, offset, o);
|
|
}
|
|
|
|
public class Adapter1D extends BaseObj {
|
|
Adapter1D(int id, RenderScript rs) {
|
|
super(rs);
|
|
mID = id;
|
|
}
|
|
|
|
public void setConstraint(Dimension dim, int value) {
|
|
mRS.validate();
|
|
mRS.nAdapter1DSetConstraint(mID, dim.mID, value);
|
|
}
|
|
|
|
public void data(int[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter1DData(mID, d);
|
|
}
|
|
|
|
public void data(float[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter1DData(mID, d);
|
|
}
|
|
|
|
public void subData(int off, int count, int[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter1DSubData(mID, off, count, d);
|
|
}
|
|
|
|
public void subData(int off, int count, float[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter1DSubData(mID, off, count, d);
|
|
}
|
|
}
|
|
|
|
public Adapter1D createAdapter1D() {
|
|
mRS.validate();
|
|
int id = mRS.nAdapter1DCreate();
|
|
if(id == 0) {
|
|
throw new IllegalStateException("allocation failed.");
|
|
}
|
|
mRS.nAdapter1DBindAllocation(id, mID);
|
|
return new Adapter1D(id, mRS);
|
|
}
|
|
|
|
|
|
public class Adapter2D extends BaseObj {
|
|
Adapter2D(int id, RenderScript rs) {
|
|
super(rs);
|
|
mID = id;
|
|
}
|
|
|
|
public void setConstraint(Dimension dim, int value) {
|
|
mRS.validate();
|
|
mRS.nAdapter2DSetConstraint(mID, dim.mID, value);
|
|
}
|
|
|
|
public void data(int[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter2DData(mID, d);
|
|
}
|
|
|
|
public void data(float[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter2DData(mID, d);
|
|
}
|
|
|
|
public void subData(int xoff, int yoff, int w, int h, int[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter2DSubData(mID, xoff, yoff, w, h, d);
|
|
}
|
|
|
|
public void subData(int xoff, int yoff, int w, int h, float[] d) {
|
|
mRS.validate();
|
|
mRS.nAdapter2DSubData(mID, xoff, yoff, w, h, d);
|
|
}
|
|
}
|
|
|
|
public Adapter2D createAdapter2D() {
|
|
mRS.validate();
|
|
int id = mRS.nAdapter2DCreate();
|
|
if(id == 0) {
|
|
throw new IllegalStateException("allocation failed.");
|
|
}
|
|
mRS.nAdapter2DBindAllocation(id, mID);
|
|
return new Adapter2D(id, mRS);
|
|
}
|
|
|
|
|
|
// creation
|
|
|
|
private static BitmapFactory.Options mBitmapOptions = new BitmapFactory.Options();
|
|
static {
|
|
mBitmapOptions.inScaled = false;
|
|
}
|
|
|
|
static public Allocation createTyped(RenderScript rs, Type type)
|
|
throws IllegalArgumentException {
|
|
|
|
rs.validate();
|
|
if(type.mID == 0) {
|
|
throw new IllegalStateException("Bad Type");
|
|
}
|
|
int id = rs.nAllocationCreateTyped(type.mID);
|
|
return new Allocation(id, rs, type);
|
|
}
|
|
|
|
static public Allocation createSized(RenderScript rs, Element e, int count)
|
|
throws IllegalArgumentException {
|
|
|
|
rs.validate();
|
|
Type.Builder b = new Type.Builder(rs, e);
|
|
b.add(Dimension.X, count);
|
|
Type t = b.create();
|
|
|
|
int id = rs.nAllocationCreateTyped(t.mID);
|
|
if(id == 0) {
|
|
throw new IllegalStateException("Bad element.");
|
|
}
|
|
return new Allocation(id, rs, t);
|
|
}
|
|
|
|
static public Allocation createFromBitmap(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)
|
|
throws IllegalArgumentException {
|
|
|
|
rs.validate();
|
|
int id = rs.nAllocationCreateFromBitmap(dstFmt.mID, genMips, b);
|
|
if(id == 0) {
|
|
throw new IllegalStateException("Load failed.");
|
|
}
|
|
return new Allocation(id, rs, null);
|
|
}
|
|
|
|
static Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)
|
|
throws IllegalArgumentException {
|
|
|
|
rs.validate();
|
|
int id = rs.nAllocationCreateFromBitmapBoxed(dstFmt.mID, genMips, b);
|
|
if(id == 0) {
|
|
throw new IllegalStateException("Load failed.");
|
|
}
|
|
return new Allocation(id, rs, null);
|
|
}
|
|
|
|
static public Allocation createFromBitmapResource(RenderScript rs, Resources res, int id, Element dstFmt, boolean genMips)
|
|
throws IllegalArgumentException {
|
|
|
|
rs.validate();
|
|
InputStream is = null;
|
|
try {
|
|
final TypedValue value = new TypedValue();
|
|
is = res.openRawResource(id, value);
|
|
|
|
int asset = ((AssetManager.AssetInputStream) is).getAssetInt();
|
|
int allocationId = rs.nAllocationCreateFromAssetStream(dstFmt.mID, genMips,
|
|
asset);
|
|
|
|
if(allocationId == 0) {
|
|
throw new IllegalStateException("Load failed.");
|
|
}
|
|
return new Allocation(allocationId, rs, null);
|
|
} catch (Exception e) {
|
|
// Ignore
|
|
} finally {
|
|
if (is != null) {
|
|
try {
|
|
is.close();
|
|
} catch (IOException e) {
|
|
// Ignore
|
|
}
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
static public Allocation createFromBitmapResourceBoxed(RenderScript rs, Resources res, int id, Element dstFmt, boolean genMips)
|
|
throws IllegalArgumentException {
|
|
|
|
Bitmap b = BitmapFactory.decodeResource(res, id, mBitmapOptions);
|
|
return createFromBitmapBoxed(rs, b, dstFmt, genMips);
|
|
}
|
|
}
|
|
|
|
|