diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-05 17:34:38 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-05 17:34:38 +0000 |
| commit | 8ff9c7489203d9958ec1aa6ec0aef5f517b42a20 (patch) | |
| tree | 9731cfda812af06370aa51d8570bb9d1976761de | |
| parent | 7191840eec5ac3b5f5814e4df3cf18264b0b0a4d (diff) | |
Reverting r2969, since it broke the GLPrograms RunTests step.
Unreviewed; build fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@2972 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gm/colormatrix.cpp | 13 | ||||
| -rw-r--r-- | src/gpu/GrGLProgram.cpp | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp index 0a4acfd84f..7d57b3278b 100644 --- a/gm/colormatrix.cpp +++ b/gm/colormatrix.cpp @@ -90,19 +90,6 @@ protected: matrix.setYUV2RGB(); filter->setMatrix(matrix); canvas->drawBitmap(fBitmap, 80, 160, &paint); - - SkScalar s1 = SK_Scalar1; - SkScalar s255 = SkIntToScalar(255); - // Move red into alpha, set color to white - SkScalar data[20] = { - 0, 0, 0, 0, s255, - 0, 0, 0, 0, s255, - 0, 0, 0, 0, s255, - s1, 0, 0, 0, 0, - }; - - filter->setArray(data); - canvas->drawBitmap(fBitmap, 160, 160, &paint); } private: diff --git a/src/gpu/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp index 4d733a9df7..ce87b857af 100644 --- a/src/gpu/GrGLProgram.cpp +++ b/src/gpu/GrGLProgram.cpp @@ -373,8 +373,7 @@ static void addColorFilter(GrStringBuilder* fsCode, const char * outputVar, */ static void addColorMatrix(GrStringBuilder* fsCode, const char * outputVar, const char* inColor) { - fsCode->appendf("\t%s = %s * vec4(%s.rgb / %s.a, %s.a) + %s;\n", outputVar, COL_MATRIX_UNI_NAME, inColor, inColor, inColor, COL_MATRIX_VEC_UNI_NAME); - fsCode->appendf("\t%s.rgb *= %s.a;\n", outputVar, outputVar); + fsCode->appendf("%s = %s * %s + %s;\n", outputVar, COL_MATRIX_UNI_NAME, inColor, COL_MATRIX_VEC_UNI_NAME); } namespace { |