Backout 4987ffd173a4 (bug 687267) for bustage
This commit is contained in:
@@ -111,12 +111,10 @@ struct ProgramProfileOGL
|
||||
nsTArray<Argument> mAttributes;
|
||||
PRUint32 mTextureCount;
|
||||
bool mHasMatrixProj;
|
||||
bool mHasTextureTransform;
|
||||
private:
|
||||
ProgramProfileOGL() :
|
||||
mTextureCount(0),
|
||||
mHasMatrixProj(false),
|
||||
mHasTextureTransform(false) {}
|
||||
mHasMatrixProj(false) {}
|
||||
};
|
||||
|
||||
|
||||
@@ -144,6 +142,7 @@ public:
|
||||
mIsProjectionMatrixStale(false), mGL(aGL), mProgram(0),
|
||||
mProfile(aProfile), mProgramState(STATE_NEW) { }
|
||||
|
||||
|
||||
~ShaderProgramOGL() {
|
||||
if (mProgram <= 0) {
|
||||
return;
|
||||
@@ -247,12 +246,6 @@ public:
|
||||
mIsProjectionMatrixStale = false;
|
||||
}
|
||||
|
||||
// sets this program's texture transform, if it uses one
|
||||
void SetTextureTransform(const gfx3DMatrix& aMatrix) {
|
||||
if (mProfile.mHasTextureTransform)
|
||||
SetMatrixUniform(mProfile.LookupUniformLocation("uTextureTransform"), aMatrix);
|
||||
}
|
||||
|
||||
void SetRenderOffset(const nsIntPoint& aOffset) {
|
||||
float vals[4] = { float(aOffset.x), float(aOffset.y), 0.0f, 0.0f };
|
||||
SetUniform(mProfile.LookupUniformLocation("uRenderTargetOffset"), 4, vals);
|
||||
|
||||
Reference in New Issue
Block a user