ffeb6f2339
The previous CLs have removed the last significant differences between SkSL::String and std::string. This CL removes SkSL::String entirely and replaces it with std::string throughout the code. Apologies for the very long CL, but I have done my best to make it as simple and reviewable as possible. The vast majority of changes are simple replacement of `SkSL::String` with `std::string`. In the rare spots where code is moved from one place to another, it is logically unchanged. Change-Id: I39563d2db45da229f17f4504dfd63e00bde7a96e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503339 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
190 lines
9.9 KiB
C++
190 lines
9.9 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/sksl/SkSLErrorReporter.h"
|
|
#include "src/sksl/SkSLContext.h"
|
|
#include "src/sksl/SkSLMangler.h"
|
|
#include "src/sksl/SkSLMemoryLayout.h"
|
|
|
|
#include "tests/Test.h"
|
|
|
|
DEF_TEST(SkSLMemoryLayout140Test, r) {
|
|
SkSL::TestingOnly_AbortErrorReporter errors;
|
|
SkSL::ShaderCaps caps;
|
|
SkSL::Mangler mangler;
|
|
SkSL::Context context(errors, caps, mangler);
|
|
SkSL::MemoryLayout layout(SkSL::MemoryLayout::k140_Standard);
|
|
|
|
// basic types
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fFloat));
|
|
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fFloat2));
|
|
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fFloat3));
|
|
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat4));
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fInt));
|
|
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fInt2));
|
|
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fInt3));
|
|
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fInt4));
|
|
REPORTER_ASSERT(r, 1 == layout.size(*context.fTypes.fBool));
|
|
REPORTER_ASSERT(r, 2 == layout.size(*context.fTypes.fBool2));
|
|
REPORTER_ASSERT(r, 3 == layout.size(*context.fTypes.fBool3));
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fBool4));
|
|
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x2));
|
|
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x4));
|
|
REPORTER_ASSERT(r, 48 == layout.size(*context.fTypes.fFloat3x3));
|
|
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x2));
|
|
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x4));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fFloat));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fInt));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fInt2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt4));
|
|
REPORTER_ASSERT(r, 1 == layout.alignment(*context.fTypes.fBool));
|
|
REPORTER_ASSERT(r, 2 == layout.alignment(*context.fTypes.fBool2));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool3));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool4));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x4));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3x3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x4));
|
|
|
|
// struct 1
|
|
std::vector<SkSL::Type::Field> fields1;
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"),
|
|
context.fTypes.fFloat3.get());
|
|
std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, std::string("s1"), fields1);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*s1));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
|
|
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
|
|
std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, std::string("s2"), fields1);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*s2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
|
|
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
|
|
std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, std::string("s3"), fields1);
|
|
REPORTER_ASSERT(r, 32 == layout.size(*s3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
|
|
|
|
// struct 2
|
|
std::vector<SkSL::Type::Field> fields2;
|
|
fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
|
|
std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, std::string("s4"), fields2);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*s4));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s4));
|
|
|
|
fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"),
|
|
context.fTypes.fFloat3.get());
|
|
std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, std::string("s5"), fields2);
|
|
REPORTER_ASSERT(r, 32 == layout.size(*s5));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
|
|
|
|
// arrays
|
|
std::unique_ptr<SkSL::Type> array1 =
|
|
SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
|
|
REPORTER_ASSERT(r, 64 == layout.size(*array1));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*array1));
|
|
REPORTER_ASSERT(r, 16 == layout.stride(*array1));
|
|
|
|
std::unique_ptr<SkSL::Type> array2 =
|
|
SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
|
|
REPORTER_ASSERT(r, 64 == layout.size(*array2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
|
|
REPORTER_ASSERT(r, 16 == layout.stride(*array2));
|
|
}
|
|
|
|
DEF_TEST(SkSLMemoryLayout430Test, r) {
|
|
SkSL::TestingOnly_AbortErrorReporter errors;
|
|
SkSL::ShaderCaps caps;
|
|
SkSL::Mangler mangler;
|
|
SkSL::Context context(errors, caps, mangler);
|
|
SkSL::MemoryLayout layout(SkSL::MemoryLayout::k430_Standard);
|
|
|
|
// basic types
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fFloat));
|
|
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fFloat2));
|
|
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fFloat3));
|
|
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat4));
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fInt));
|
|
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fInt2));
|
|
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fInt3));
|
|
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fInt4));
|
|
REPORTER_ASSERT(r, 1 == layout.size(*context.fTypes.fBool));
|
|
REPORTER_ASSERT(r, 2 == layout.size(*context.fTypes.fBool2));
|
|
REPORTER_ASSERT(r, 3 == layout.size(*context.fTypes.fBool3));
|
|
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fBool4));
|
|
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat2x2));
|
|
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x4));
|
|
REPORTER_ASSERT(r, 48 == layout.size(*context.fTypes.fFloat3x3));
|
|
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat4x2));
|
|
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x4));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fFloat));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fInt));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fInt2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt4));
|
|
REPORTER_ASSERT(r, 1 == layout.alignment(*context.fTypes.fBool));
|
|
REPORTER_ASSERT(r, 2 == layout.alignment(*context.fTypes.fBool2));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool3));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool4));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2x2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x4));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3x3));
|
|
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat4x2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x4));
|
|
|
|
// struct 1
|
|
std::vector<SkSL::Type::Field> fields1;
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"),
|
|
context.fTypes.fFloat3.get());
|
|
std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, std::string("s1"), fields1);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*s1));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
|
|
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
|
|
std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, std::string("s2"), fields1);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*s2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
|
|
|
|
fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
|
|
std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, std::string("s3"), fields1);
|
|
REPORTER_ASSERT(r, 32 == layout.size(*s3));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
|
|
|
|
// struct 2
|
|
std::vector<SkSL::Type::Field> fields2;
|
|
fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
|
|
std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, std::string("s4"), fields2);
|
|
REPORTER_ASSERT(r, 4 == layout.size(*s4));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*s4));
|
|
|
|
fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"),
|
|
context.fTypes.fFloat3.get());
|
|
std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, std::string("s5"), fields2);
|
|
REPORTER_ASSERT(r, 32 == layout.size(*s5));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
|
|
|
|
// arrays
|
|
std::unique_ptr<SkSL::Type> array1 =
|
|
SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
|
|
REPORTER_ASSERT(r, 16 == layout.size(*array1));
|
|
REPORTER_ASSERT(r, 4 == layout.alignment(*array1));
|
|
REPORTER_ASSERT(r, 4 == layout.stride(*array1));
|
|
|
|
std::unique_ptr<SkSL::Type> array2 =
|
|
SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
|
|
REPORTER_ASSERT(r, 64 == layout.size(*array2));
|
|
REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
|
|
REPORTER_ASSERT(r, 16 == layout.stride(*array2));
|
|
}
|