aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ir/SkSLProgram.h
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2016-12-12 17:20:42 +0000
committerGravatar Greg Daniel <egdaniel@google.com>2016-12-12 17:22:28 +0000
commite8e4a3e6782586680086a0279eafb89969c29f3d (patch)
tree93e27a37cd75c69fe85fab990f6daf17c80ed794 /src/sksl/ir/SkSLProgram.h
parentd737bee1470bbba8af5c9d74cbec2d731da33804 (diff)
Revert "added sk_FragCoord support to skslc"
This reverts commit ce33f10677630e34187b661a02161378d8304d68. Reason for revert: Breaking many gpu bots Change-Id: I94c813ed6a9311458c872f74bb1b0792f46ff414 Reviewed-on: https://skia-review.googlesource.com/5737 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLProgram.h')
-rw-r--r--src/sksl/ir/SkSLProgram.h43
1 files changed, 6 insertions, 37 deletions
diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h
index ac49d6dcc7..8393341269 100644
--- a/src/sksl/ir/SkSLProgram.h
+++ b/src/sksl/ir/SkSLProgram.h
@@ -4,73 +4,42 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
+
#ifndef SKSL_PROGRAM
#define SKSL_PROGRAM
#include <vector>
#include <memory>
-#include "SkSLContext.h"
#include "SkSLModifiers.h"
#include "SkSLProgramElement.h"
#include "SkSLSymbolTable.h"
-// name of the render target height uniform
-#define SKSL_RTHEIGHT_NAME "u_skRTHeight"
-
namespace SkSL {
/**
* Represents a fully-digested program, ready for code generation.
*/
struct Program {
- struct Settings {
- const GrShaderCaps* fCaps = nullptr;
- bool fFlipY = false;
- };
-
- struct Inputs {
- // if true, this program requires the render target height uniform to be defined
- bool fRTHeight;
-
- void reset() {
- fRTHeight = false;
- }
-
- bool isEmpty() {
- return !fRTHeight;
- }
- };
-
enum Kind {
kFragment_Kind,
kVertex_Kind
};
- Program(Kind kind,
- Settings settings,
+ Program(Kind kind,
Modifiers::Flag defaultPrecision,
- Context* context,
- std::vector<std::unique_ptr<ProgramElement>> elements,
- std::shared_ptr<SymbolTable> symbols,
- Inputs inputs)
- : fKind(kind)
- , fSettings(settings)
+ std::vector<std::unique_ptr<ProgramElement>> elements,
+ std::shared_ptr<SymbolTable> symbols)
+ : fKind(kind)
, fDefaultPrecision(defaultPrecision)
- , fContext(context)
, fElements(std::move(elements))
- , fSymbols(symbols)
- , fInputs(inputs) {}
+ , fSymbols(symbols) {}
Kind fKind;
- Settings fSettings;
// FIXME handle different types; currently it assumes this is for floats
Modifiers::Flag fDefaultPrecision;
- Context* fContext;
std::vector<std::unique_ptr<ProgramElement>> fElements;
std::shared_ptr<SymbolTable> fSymbols;
- Inputs fInputs;
};
} // namespace