diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-18 14:10:39 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-18 18:32:13 +0000 |
| commit | f7b8820dc813d1eb0b6b43fe4581dded0da38caf (patch) | |
| tree | 518d313a9fa571a9f9ca26af7c381664694a4706 /src/sksl/SkSLCompiler.cpp | |
| parent | 47a540f503bc722393b61c4b822e95b17f200125 (diff) | |
re-land of new SkSL precisions
Bug: skia:
Change-Id: Ic1deb3db2cbda6ca45f93dee99832971a36a2119
Reviewed-on: https://skia-review.googlesource.com/47841
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLCompiler.cpp')
| -rw-r--r-- | src/sksl/SkSLCompiler.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp index 638e4d64bf..5373f9d5a2 100644 --- a/src/sksl/SkSLCompiler.cpp +++ b/src/sksl/SkSLCompiler.cpp @@ -196,9 +196,8 @@ Compiler::Compiler(Flags flags) *fContext.fSkArgs_Type, Variable::kGlobal_Storage); fIRGenerator->fSymbolTable->add(skArgsName, std::unique_ptr<Symbol>(skArgs)); - Modifiers::Flag ignored1; - std::vector<std::unique_ptr<ProgramElement>> ignored2; - fIRGenerator->convertProgram(SKSL_INCLUDE, strlen(SKSL_INCLUDE), *fTypes, &ignored1, &ignored2); + std::vector<std::unique_ptr<ProgramElement>> ignored; + fIRGenerator->convertProgram(SKSL_INCLUDE, strlen(SKSL_INCLUDE), *fTypes, &ignored); fIRGenerator->fSymbolTable->markAllFunctionsBuiltin(); if (fErrorCount) { printf("Unexpected errors: %s\n", fErrorText.c_str()); @@ -1134,31 +1133,28 @@ std::unique_ptr<Program> Compiler::convertProgram(Program::Kind kind, String tex fErrorCount = 0; fIRGenerator->start(&settings); std::vector<std::unique_ptr<ProgramElement>> elements; - Modifiers::Flag ignored; switch (kind) { case Program::kVertex_Kind: fIRGenerator->convertProgram(SKSL_VERT_INCLUDE, strlen(SKSL_VERT_INCLUDE), *fTypes, - &ignored, &elements); + &elements); break; case Program::kFragment_Kind: fIRGenerator->convertProgram(SKSL_FRAG_INCLUDE, strlen(SKSL_FRAG_INCLUDE), *fTypes, - &ignored, &elements); + &elements); break; case Program::kGeometry_Kind: fIRGenerator->convertProgram(SKSL_GEOM_INCLUDE, strlen(SKSL_GEOM_INCLUDE), *fTypes, - &ignored, &elements); + &elements); break; case Program::kFragmentProcessor_Kind: fIRGenerator->convertProgram(SKSL_FP_INCLUDE, strlen(SKSL_FP_INCLUDE), *fTypes, - &ignored, &elements); + &elements); break; } fIRGenerator->fSymbolTable->markAllFunctionsBuiltin(); - Modifiers::Flag defaultPrecision; std::unique_ptr<String> textPtr(new String(std::move(text))); fSource = textPtr.get(); - fIRGenerator->convertProgram(textPtr->c_str(), textPtr->size(), *fTypes, &defaultPrecision, - &elements); + fIRGenerator->convertProgram(textPtr->c_str(), textPtr->size(), *fTypes, &elements); if (!fErrorCount) { for (auto& element : elements) { if (element->fKind == ProgramElement::kFunction_Kind) { @@ -1166,8 +1162,10 @@ std::unique_ptr<Program> Compiler::convertProgram(Program::Kind kind, String tex } } } - auto result = std::unique_ptr<Program>(new Program(kind, std::move(textPtr), settings, - defaultPrecision, &fContext, + auto result = std::unique_ptr<Program>(new Program(kind, + std::move(textPtr), + settings, + &fContext, std::move(elements), fIRGenerator->fSymbolTable, fIRGenerator->fInputs)); |