Briefly about this change: - OpenColorIO C-API is removed. - The information about color spaces in ImBuf module is removed. It was stored in global ListBase in colormanagement.cc. - Both OpenColorIO and fallback implementation supports GPU drawing. - Fallback implementation supports white point, RGB curves, etc. - Removed check for support of GPU drawing in IMB. Historically it was implemented in a separate library with C-API, this is because way back C++ code needed to stay in intern. This causes all sort of overheads, and even calls that are strictly considered bad level. This change moves OpenColorIO integration into a module within imbuf, next to movie, and next to IMB_colormanagement which is the main user of it. This allows to avoid copy of color spaces, displays, views etc in the ImBuf: they were used to help quickly querying information to be shown on the interface. With this change it can be stored in the same data structures as what is used by the OpenColorIO integration. While it might not be fully avoiding duplication it is now less, and there is no need in the user code to maintain the copies. In a lot of cases this change also avoids allocations done per access to the OpenColorIO. For example, it is not needed anymore to allocate image descriptor in a heap. The bigger user-visible change is that the fallback implementation now supports GLSL drawing, with the whole list of supported features, such as curve mapping and white point. This should help simplifying code which relies on color space conversion on GPU: there is no need to figure out fallback solution in such cases. The only case when drawing will not work is when there is some actual bug, or driver issue, and shader has failed to compile. The change avoids having an opaque type for color space, and instead uses forward declaration. It is a bit verbose on declaration, but helps avoiding unsafe type-casts. There are ways to solve this in the future, like having a header for forward declaration, or to flatten the name space a bit. There should be no user-level changes under normal operation. When building without OpenColorIO or the configuration has a typo or is missing a fuller set of color management tools is applies (such as the white point correction). Pull Request: https://projects.blender.org/blender/blender/pulls/138433
91 lines
2.3 KiB
C++
91 lines
2.3 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#include "BLI_string_utils.hh"
|
|
|
|
#include <string>
|
|
|
|
#include "testing/testing.h"
|
|
|
|
#include "BLI_vector.hh"
|
|
|
|
namespace blender {
|
|
|
|
TEST(BLI_string_utils, BLI_string_replace)
|
|
{
|
|
{
|
|
std::string s = "foo bar baz";
|
|
BLI_string_replace(s, "bar", "hello");
|
|
EXPECT_EQ(s, "foo hello baz");
|
|
}
|
|
|
|
{
|
|
std::string s = "foo bar baz world bar";
|
|
BLI_string_replace(s, "bar", "hello");
|
|
EXPECT_EQ(s, "foo hello baz world hello");
|
|
}
|
|
}
|
|
|
|
TEST(BLI_string_utils, BLI_uniquename_cb)
|
|
{
|
|
const Vector<std::string> current_names{"Foo", "Bar", "Bar.003", "Baz.001", "Big.999"};
|
|
|
|
{
|
|
auto unique_check_func = [&](const StringRef check_name) {
|
|
return current_names.contains(check_name);
|
|
};
|
|
|
|
{
|
|
char name[64] = "";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Default Name");
|
|
}
|
|
|
|
{
|
|
char name[64] = "Baz";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Baz");
|
|
}
|
|
|
|
{
|
|
char name[64] = "Foo";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Foo.001");
|
|
}
|
|
|
|
{
|
|
char name[64] = "Baz.001";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Baz.002");
|
|
}
|
|
|
|
{
|
|
char name[64] = "Bar.003";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Bar.004");
|
|
}
|
|
|
|
{
|
|
char name[64] = "Big.999";
|
|
BLI_uniquename_cb(unique_check_func, "Default Name", '.', name, sizeof(name));
|
|
EXPECT_STREQ(name, "Big.1000");
|
|
}
|
|
}
|
|
|
|
{
|
|
const auto unique_check = [&](const blender::StringRef name) -> bool {
|
|
return current_names.contains(name);
|
|
};
|
|
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', ""), "");
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', "Baz"), "Baz");
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', "Foo"), "Foo.001");
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', "Baz.001"), "Baz.002");
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', "Bar.003"), "Bar.004");
|
|
EXPECT_EQ(BLI_uniquename_cb(unique_check, '.', "Big.999"), "Big.1000");
|
|
}
|
|
}
|
|
|
|
} // namespace blender
|