src/gpu/gl/GrGLUniformManager.cpp - Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/gl/GrGLUniformManager.cpp

Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/gpu/gl/GrGLUniformManager.cpp

diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp

index 2d0b48a2bedf9defecd5b4389fd460d4fb8021f4..674118b7491da615b2ecdae646cc51b8baa6e423 100644

--- a/src/gpu/gl/GrGLUniformManager.cpp

+++ b/src/gpu/gl/GrGLUniformManager.cpp

@@ -233,7 +233,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),