From e8e4a3e6782586680086a0279eafb89969c29f3d Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Mon, 12 Dec 2016 17:20:42 +0000 Subject: 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 Reviewed-by: Greg Daniel --- tests/SkSLErrorTest.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'tests/SkSLErrorTest.cpp') diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index e872977eeb..c653072dd1 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -14,34 +14,21 @@ static void test_failure(skiatest::Reporter* r, const char* src, const char* error) { SkSL::Compiler compiler; SkDynamicMemoryWStream out; - SkSL::Program::Settings settings; - sk_sp caps = SkSL::ShaderCapsFactory::Default(); - settings.fCaps = caps.get(); - std::unique_ptr program = compiler.convertProgram(SkSL::Program::kFragment_Kind, - SkString(src), settings); - if (program) { - SkString ignored; - compiler.toSPIRV(*program, &ignored); - } + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); SkString skError(error); if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, compiler.errorText().c_str()); } + REPORTER_ASSERT(r, !result); REPORTER_ASSERT(r, compiler.errorText() == skError); } static void test_success(skiatest::Reporter* r, const char* src) { SkSL::Compiler compiler; SkDynamicMemoryWStream out; - SkSL::Program::Settings settings; - sk_sp caps = SkSL::ShaderCapsFactory::Default(); - settings.fCaps = caps.get(); - std::unique_ptr program = compiler.convertProgram(SkSL::Program::kFragment_Kind, - SkString(src), settings); - REPORTER_ASSERT(r, program); - SkString ignored; - REPORTER_ASSERT(r, compiler.toSPIRV(*program, &ignored)); + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); + REPORTER_ASSERT(r, result); } DEF_TEST(SkSLUndefinedSymbol, r) { -- cgit v1.2.3