Revert "skslc can now be compiled with no Skia dependencies, in preparation for"
authorEthan Nicholas <ethannicholas@google.com>
Thu, 30 Mar 2017 18:42:48 +0000 (18:42 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Thu, 30 Mar 2017 18:42:59 +0000 (18:42 +0000)
commitbcf35f86d50b784b165de703b404998dd4299f6a
tree9fcd85326b1a5dbda864da9431a878bb62f65191
parent7833466da45bfa1e078427c4a6db94d41c5c1535
Revert "skslc can now be compiled with no Skia dependencies, in preparation for"

This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535.

Reason for revert: Vulkan assertion failure

Original change's description:
> skslc can now be compiled with no Skia dependencies, in preparation for
> its eventual role in Skia's build process.
>
> Bug: skia:
> Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78
> Reviewed-on: https://skia-review.googlesource.com/10282
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
>

TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49
Reviewed-on: https://skia-review.googlesource.com/10758
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
121 files changed:
BUILD.gn
bench/GLBench.cpp
fuzz/fuzz.cpp
gn/sksl.gni
src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
src/gpu/vk/GrVkUtil.cpp
src/sksl/README
src/sksl/SkSLCFGGenerator.cpp
src/sksl/SkSLCFGGenerator.h
src/sksl/SkSLCodeGenerator.h
src/sksl/SkSLCompiler.cpp
src/sksl/SkSLCompiler.h
src/sksl/SkSLContext.h
src/sksl/SkSLErrorReporter.h
src/sksl/SkSLFileOutputStream.h [deleted file]
src/sksl/SkSLGLSLCodeGenerator.cpp
src/sksl/SkSLGLSLCodeGenerator.h
src/sksl/SkSLIRGenerator.cpp
src/sksl/SkSLIRGenerator.h
src/sksl/SkSLMain.cpp
src/sksl/SkSLMemoryLayout.h
src/sksl/SkSLOutputStream.h [deleted file]
src/sksl/SkSLParser.cpp
src/sksl/SkSLParser.h
src/sksl/SkSLPosition.h
src/sksl/SkSLSPIRVCodeGenerator.cpp
src/sksl/SkSLSPIRVCodeGenerator.h
src/sksl/SkSLString.cpp [deleted file]
src/sksl/SkSLString.h [deleted file]
src/sksl/SkSLStringStream.h [deleted file]
src/sksl/SkSLToken.h
src/sksl/SkSLUtil.cpp
src/sksl/SkSLUtil.h
src/sksl/ast/SkSLASTBinaryExpression.h
src/sksl/ast/SkSLASTBlock.h
src/sksl/ast/SkSLASTBoolLiteral.h
src/sksl/ast/SkSLASTBreakStatement.h
src/sksl/ast/SkSLASTCallSuffix.h
src/sksl/ast/SkSLASTContinueStatement.h
src/sksl/ast/SkSLASTDeclaration.h
src/sksl/ast/SkSLASTDiscardStatement.h
src/sksl/ast/SkSLASTDoStatement.h
src/sksl/ast/SkSLASTExpression.h
src/sksl/ast/SkSLASTExpressionStatement.h
src/sksl/ast/SkSLASTExtension.h
src/sksl/ast/SkSLASTFieldSuffix.h
src/sksl/ast/SkSLASTFloatLiteral.h
src/sksl/ast/SkSLASTForStatement.h
src/sksl/ast/SkSLASTFunction.h
src/sksl/ast/SkSLASTIdentifier.h
src/sksl/ast/SkSLASTIfStatement.h
src/sksl/ast/SkSLASTIndexSuffix.h
src/sksl/ast/SkSLASTIntLiteral.h
src/sksl/ast/SkSLASTInterfaceBlock.h
src/sksl/ast/SkSLASTModifiersDeclaration.h
src/sksl/ast/SkSLASTNode.h
src/sksl/ast/SkSLASTParameter.h
src/sksl/ast/SkSLASTPositionNode.h
src/sksl/ast/SkSLASTPrecision.h
src/sksl/ast/SkSLASTPrefixExpression.h
src/sksl/ast/SkSLASTReturnStatement.h
src/sksl/ast/SkSLASTStatement.h
src/sksl/ast/SkSLASTSuffix.h
src/sksl/ast/SkSLASTSuffixExpression.h
src/sksl/ast/SkSLASTSwitchCase.h
src/sksl/ast/SkSLASTSwitchStatement.h
src/sksl/ast/SkSLASTTernaryExpression.h
src/sksl/ast/SkSLASTType.h
src/sksl/ast/SkSLASTVarDeclaration.h
src/sksl/ast/SkSLASTVarDeclarationStatement.h
src/sksl/ast/SkSLASTWhileStatement.h
src/sksl/ir/SkSLBinaryExpression.h
src/sksl/ir/SkSLBlock.h
src/sksl/ir/SkSLBoolLiteral.h
src/sksl/ir/SkSLBreakStatement.h
src/sksl/ir/SkSLConstructor.h
src/sksl/ir/SkSLContinueStatement.h
src/sksl/ir/SkSLDiscardStatement.h
src/sksl/ir/SkSLDoStatement.h
src/sksl/ir/SkSLExpressionStatement.h
src/sksl/ir/SkSLExtension.h
src/sksl/ir/SkSLField.h
src/sksl/ir/SkSLFieldAccess.h
src/sksl/ir/SkSLFloatLiteral.h
src/sksl/ir/SkSLForStatement.h
src/sksl/ir/SkSLFunctionCall.h
src/sksl/ir/SkSLFunctionDeclaration.h
src/sksl/ir/SkSLFunctionDefinition.h
src/sksl/ir/SkSLFunctionReference.h
src/sksl/ir/SkSLIRNode.h
src/sksl/ir/SkSLIfStatement.h
src/sksl/ir/SkSLIndexExpression.h
src/sksl/ir/SkSLIntLiteral.h
src/sksl/ir/SkSLInterfaceBlock.h
src/sksl/ir/SkSLLayout.h
src/sksl/ir/SkSLModifiers.h
src/sksl/ir/SkSLModifiersDeclaration.h
src/sksl/ir/SkSLPostfixExpression.h
src/sksl/ir/SkSLPrefixExpression.h
src/sksl/ir/SkSLProgram.h
src/sksl/ir/SkSLProgramElement.h
src/sksl/ir/SkSLReturnStatement.h
src/sksl/ir/SkSLStatement.h
src/sksl/ir/SkSLSwitchCase.h
src/sksl/ir/SkSLSwitchStatement.h
src/sksl/ir/SkSLSwizzle.h
src/sksl/ir/SkSLSymbol.h
src/sksl/ir/SkSLSymbolTable.cpp
src/sksl/ir/SkSLSymbolTable.h
src/sksl/ir/SkSLTernaryExpression.h
src/sksl/ir/SkSLType.cpp
src/sksl/ir/SkSLType.h
src/sksl/ir/SkSLTypeReference.h
src/sksl/ir/SkSLUnresolvedFunction.h
src/sksl/ir/SkSLVarDeclarations.h
src/sksl/ir/SkSLVarDeclarationsStatement.h
src/sksl/ir/SkSLVariable.h
src/sksl/ir/SkSLVariableReference.h
src/sksl/ir/SkSLWhileStatement.h
tests/SkSLErrorTest.cpp
tests/SkSLGLSLTest.cpp