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

Side by Side Diff: src/sksl/ir/SkSLFieldAccess.h

Issue 2300023002: minor SkSL changes to avoid compiler errors in Chromium (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 | « src/sksl/SkSLSPIRVCodeGenerator.cpp ('k') | src/sksl/ir/SkSLSymbolTable.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 #ifndef SKSL_FIELDACCESS 8 #ifndef SKSL_FIELDACCESS
9 #define SKSL_FIELDACCESS 9 #define SKSL_FIELDACCESS
10 10
11 #include "SkSLExpression.h" 11 #include "SkSLExpression.h"
12 #include "SkSLUtil.h" 12 #include "SkSLUtil.h"
13 13
14 namespace SkSL { 14 namespace SkSL {
15 15
16 /** 16 /**
17 * An expression which extracts a field from a struct, as in 'foo.bar'. 17 * An expression which extracts a field from a struct, as in 'foo.bar'.
18 */ 18 */
19 struct FieldAccess : public Expression { 19 struct FieldAccess : public Expression {
20 enum OwnerKind { 20 enum OwnerKind {
21 kDefault_OwnerKind, 21 kDefault_OwnerKind,
22 // this field access is to a field of an anonymous interface block (and thus, the field name 22 // this field access is to a field of an anonymous interface block (and thus, the field name
23 // is actually in global scope, so only the field name needs to be writt en in GLSL) 23 // is actually in global scope, so only the field name needs to be writt en in GLSL)
24 kAnonymousInterfaceBlock_OwnerKind 24 kAnonymousInterfaceBlock_OwnerKind
25 }; 25 };
26 26
27 FieldAccess(std::unique_ptr<Expression> base, int fieldIndex, 27 FieldAccess(std::unique_ptr<Expression> base, int fieldIndex,
28 OwnerKind ownerKind = kDefault_OwnerKind) 28 OwnerKind ownerKind = kDefault_OwnerKind)
29 : INHERITED(base->fPosition, kFieldAccess_Kind, base->fType.fields()[fieldIn dex].fType) 29 : INHERITED(base->fPosition, kFieldAccess_Kind, *base->fType.fields()[fieldI ndex].fType)
30 , fBase(std::move(base)) 30 , fBase(std::move(base))
31 , fFieldIndex(fieldIndex) 31 , fFieldIndex(fieldIndex)
32 , fOwnerKind(ownerKind) {} 32 , fOwnerKind(ownerKind) {}
33 33
34 virtual std::string description() const override { 34 virtual std::string description() const override {
35 return fBase->description() + "." + fBase->fType.fields()[fFieldIndex].f Name; 35 return fBase->description() + "." + fBase->fType.fields()[fFieldIndex].f Name;
36 } 36 }
37 37
38 const std::unique_ptr<Expression> fBase; 38 const std::unique_ptr<Expression> fBase;
39 const int fFieldIndex; 39 const int fFieldIndex;
40 const OwnerKind fOwnerKind; 40 const OwnerKind fOwnerKind;
41 41
42 typedef Expression INHERITED; 42 typedef Expression INHERITED;
43 }; 43 };
44 44
45 } // namespace 45 } // namespace
46 46
47 #endif 47 #endif
OLDNEW
« no previous file with comments | « src/sksl/SkSLSPIRVCodeGenerator.cpp ('k') | src/sksl/ir/SkSLSymbolTable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698