aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/SkSLErrorTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
-rw-r--r--tests/SkSLErrorTest.cpp21
1 files changed, 4 insertions, 17 deletions
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<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
- settings.fCaps = caps.get();
- std::unique_ptr<SkSL::Program> 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<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
- settings.fCaps = caps.get();
- std::unique_ptr<SkSL::Program> 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) {