Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: src/gpu/GrColorSpaceXform.cpp

Issue 2326093002: Fix color gamut xform matrices in GPU code (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/gpu/glsl/GrGLSLShaderBuilder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrColorSpaceXform.h" 8 #include "GrColorSpaceXform.h"
9 #include "SkColorSpace.h" 9 #include "SkColorSpace.h"
10 #include "SkColorSpace_Base.h" 10 #include "SkColorSpace_Base.h"
(...skipping 19 matching lines...) Expand all
30 sk_float_almost_equals(m.getFloat(2, 2), 1.0f, tol) && 30 sk_float_almost_equals(m.getFloat(2, 2), 1.0f, tol) &&
31 sk_float_almost_equals(m.getFloat(2, 3), 0.0f, tol) && 31 sk_float_almost_equals(m.getFloat(2, 3), 0.0f, tol) &&
32 sk_float_almost_equals(m.getFloat(3, 0), 0.0f, tol) && 32 sk_float_almost_equals(m.getFloat(3, 0), 0.0f, tol) &&
33 sk_float_almost_equals(m.getFloat(3, 1), 0.0f, tol) && 33 sk_float_almost_equals(m.getFloat(3, 1), 0.0f, tol) &&
34 sk_float_almost_equals(m.getFloat(3, 2), 0.0f, tol) && 34 sk_float_almost_equals(m.getFloat(3, 2), 0.0f, tol) &&
35 sk_float_almost_equals(m.getFloat(3, 3), 1.0f, tol); 35 sk_float_almost_equals(m.getFloat(3, 3), 1.0f, tol);
36 } 36 }
37 37
38 GrColorSpaceXform::GrColorSpaceXform(const SkMatrix44& srcToDst, SkAlphaType src AlphaType) 38 GrColorSpaceXform::GrColorSpaceXform(const SkMatrix44& srcToDst, SkAlphaType src AlphaType)
39 : fSrcAlphaType(srcAlphaType) { 39 : fSrcAlphaType(srcAlphaType) {
40 // TODO: Fix this, and store things as column major! 40 srcToDst.asColMajorf(fSrcToDst);
41 srcToDst.asRowMajorf(fSrcToDst);
42 } 41 }
43 42
44 sk_sp<GrColorSpaceXform> GrColorSpaceXform::Make(SkColorSpace* src, SkColorSpace * dst, 43 sk_sp<GrColorSpaceXform> GrColorSpaceXform::Make(SkColorSpace* src, SkColorSpace * dst,
45 SkAlphaType srcAlphaType) { 44 SkAlphaType srcAlphaType) {
46 if (!src || !dst) { 45 if (!src || !dst) {
47 // Invalid 46 // Invalid
48 return nullptr; 47 return nullptr;
49 } 48 }
50 49
51 if (src == dst) { 50 if (src == dst) {
52 // Quick equality check - no conversion needed in this case 51 // Quick equality check - no conversion needed in this case
53 return nullptr; 52 return nullptr;
54 } 53 }
55 54
56 SkMatrix44 srcToDst(SkMatrix44::kUninitialized_Constructor); 55 SkMatrix44 srcToDst(SkMatrix44::kUninitialized_Constructor);
57 srcToDst.setConcat(as_CSB(dst)->fromXYZD50(), src->toXYZD50()); 56 srcToDst.setConcat(as_CSB(dst)->fromXYZD50(), src->toXYZD50());
58 57
59 if (matrix_is_almost_identity(srcToDst)) { 58 if (matrix_is_almost_identity(srcToDst)) {
60 return nullptr; 59 return nullptr;
61 } 60 }
62 61
63 return sk_make_sp<GrColorSpaceXform>(srcToDst, srcAlphaType); 62 return sk_make_sp<GrColorSpaceXform>(srcToDst, srcAlphaType);
64 } 63 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/glsl/GrGLSLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698