corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset c4a259f05a18 (bug 1012407) for reftest 5 test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-05-23 10:37:03 +02:00
parent 165d84ee87
commit 6d6bf667c2
5 changed files with 40 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/layers/opengl/OGLShaderProgram.h
View File

@@ -52,10 +52,10 @@ public:
LayerTransform = 0,
MaskTransform,
LayerRects,
LayerRect,
MatrixProj,
TextureTransform,
TextureRects,
TextureRect,
RenderTargetOffset,
LayerOpacity,
Texture,
@@ -322,12 +322,9 @@ public:
SetMatrixUniform(KnownUniform::MaskTransform, aMatrix);
}
void SetLayerRects(const gfx::Rect* aRects) {
float vals[16] = { aRects[0].x, aRects[0].y, aRects[0].width, aRects[0].height,
aRects[1].x, aRects[1].y, aRects[1].width, aRects[1].height,
aRects[2].x, aRects[2].y, aRects[2].width, aRects[2].height,
aRects[3].x, aRects[3].y, aRects[3].width, aRects[3].height };
SetUniform(KnownUniform::LayerRects, 16, vals);
void SetLayerRect(const gfx::Rect& aRect) {
float vals[4] = { float(aRect.x), float(aRect.y), float(aRect.width), float(aRect.height) };
SetUniform(KnownUniform::LayerRect, 4, vals);
}
void SetProjectionMatrix(const gfx::Matrix4x4& aMatrix) {
@@ -339,12 +336,9 @@ public:
SetMatrixUniform(KnownUniform::TextureTransform, aMatrix);
}
void SetTextureRects(const gfx::Rect* aRects) {
float vals[16] = { aRects[0].x, aRects[0].y, aRects[0].width, aRects[0].height,
aRects[1].x, aRects[1].y, aRects[1].width, aRects[1].height,
aRects[2].x, aRects[2].y, aRects[2].width, aRects[2].height,
aRects[3].x, aRects[3].y, aRects[3].width, aRects[3].height };
SetUniform(KnownUniform::TextureRects, 16, vals);
void SetTextureRect(const gfx::Rect& aRect) {
float vals[4] = { float(aRect.x), float(aRect.y), float(aRect.width), float(aRect.height) };
SetUniform(KnownUniform::TextureRect, 4, vals);
}
void SetRenderOffset(const nsIntPoint& aOffset) {
@@ -477,7 +471,6 @@ protected:
case 2: mGL->fUniform2fv(ku.mLocation, 1, ku.mValue.f16v); break;
case 3: mGL->fUniform3fv(ku.mLocation, 1, ku.mValue.f16v); break;
case 4: mGL->fUniform4fv(ku.mLocation, 1, ku.mValue.f16v); break;
case 16: mGL->fUniform4fv(ku.mLocation, 4, ku.mValue.f16v); break;
default:
NS_NOTREACHED("Bogus aLength param");
}