From 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 19 Jul 2018 20:10:37 +0000 Subject: Reland "Revert "added GrSkSLFP and converted DitherEffect to use it"" This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c. Reason for revert: Breaking ANGLE. Original change's description: > Revert "Revert "added GrSkSLFP and converted DitherEffect to use it"" > > This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4. > > Bug: skia: > Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e > Reviewed-on: https://skia-review.googlesource.com/137391 > Commit-Queue: Ethan Nicholas > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142588 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/sksl/SkSLJIT.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/sksl/SkSLJIT.h') diff --git a/src/sksl/SkSLJIT.h b/src/sksl/SkSLJIT.h index 54f6254e9c..b23e31237f 100644 --- a/src/sksl/SkSLJIT.h +++ b/src/sksl/SkSLJIT.h @@ -10,6 +10,7 @@ #ifdef SK_LLVM_AVAILABLE +#include "ir/SkSLAppendStage.h" #include "ir/SkSLBinaryExpression.h" #include "ir/SkSLBreakStatement.h" #include "ir/SkSLContinueStatement.h" @@ -44,8 +45,6 @@ class SkRasterPipeline; namespace SkSL { -struct AppendStage; - /** * A just-in-time compiler for SkSL code which uses an LLVM backend. Only available when the * skia_llvm_path gn arg is set. @@ -55,8 +54,7 @@ struct AppendStage; * #ifdef SK_LLVM_AVAILABLE * SkSL::Compiler compiler; * SkSL::Program::Settings settings; - * std::unique_ptr program = compiler.convertProgram( - SkSL::Program::kPipelineStage_Kind, + * std::unique_ptr program = compiler.convertProgram(SkSL::Program::kCPU_Kind, * "void swap(int x, int y, inout float4 color) {" * " color.rb = color.br;" * "}", @@ -306,10 +304,6 @@ private: LLVMBasicBlockRef fCurrentBlock; LLVMTypeRef fVoidType; LLVMTypeRef fInt1Type; - LLVMTypeRef fInt1VectorType; - LLVMTypeRef fInt1Vector2Type; - LLVMTypeRef fInt1Vector3Type; - LLVMTypeRef fInt1Vector4Type; LLVMTypeRef fInt8Type; LLVMTypeRef fInt8PtrType; LLVMTypeRef fInt32Type; @@ -338,12 +332,6 @@ private: std::vector fBreakTarget; std::vector fContinueTarget; - LLVMValueRef fFoldAnd2Func; - LLVMValueRef fFoldOr2Func; - LLVMValueRef fFoldAnd3Func; - LLVMValueRef fFoldOr3Func; - LLVMValueRef fFoldAnd4Func; - LLVMValueRef fFoldOr4Func; LLVMValueRef fAppendFunc; LLVMValueRef fAppendCallbackFunc; LLVMValueRef fDebugFunc; -- cgit v1.2.3