From 66e534da8e2b3de928f7ce132da61947a73ab7cb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 1 Nov 2012 14:02:43 +0000 Subject: Revert r6233 while investigating bot failures. git-svn-id: http://skia.googlecode.com/svn/trunk@6235 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/GrGLUniformManager.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/gpu/gl/GrGLUniformManager.cpp') diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp index 7a92d25b28..684ef8c37e 100644 --- a/src/gpu/gl/GrGLUniformManager.cpp +++ b/src/gpu/gl/GrGLUniformManager.cpp @@ -8,7 +8,6 @@ #include "gl/GrGLShaderBuilder.h" #include "gl/GrGLProgram.h" #include "gl/GrGLUniformHandle.h" -#include "SkMatrix.h" #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, OFFSET, COUNT) \ GrAssert(offset + arrayCount <= uni.fArrayCount || \ @@ -232,23 +231,6 @@ void GrGLUniformManager::setMatrix4fv(UniformHandle u, } } -void GrGLUniformManager::setSkMatrix(UniformHandle u, const SkMatrix& matrix) const { - GR_STATIC_ASSERT(SK_SCALAR_IS_FLOAT); - GrGLfloat mt[] = { - matrix.get(SkMatrix::kMScaleX), - matrix.get(SkMatrix::kMSkewY), - matrix.get(SkMatrix::kMPersp0), - matrix.get(SkMatrix::kMSkewX), - matrix.get(SkMatrix::kMScaleY), - matrix.get(SkMatrix::kMPersp1), - matrix.get(SkMatrix::kMTransX), - matrix.get(SkMatrix::kMTransY), - matrix.get(SkMatrix::kMPersp2), - }; - this->setMatrix3f(u, mt); -} - - void GrGLUniformManager::getUniformLocations(GrGLuint programID, const BuilderUniformArray& uniforms) { GrAssert(uniforms.count() == fUniforms.count()); int count = fUniforms.count(); -- cgit v1.2.3