griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Philipp Oeser
2025-06-23 17:52:04 +02:00
parent 0e6dee37fa a7bcea76d7
commit 32d8860316
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/imbuf/opencolorio/intern/libocio/libocio_gpu_shader_binder.cc
View File

@@ -83,8 +83,19 @@ static bool add_gpu_lut_1D2D(internal::GPUTextures &textures,
GPU_R16F;
internal::GPULutTexture lut;
lut.texture = GPU_texture_create_2d(
texture_name, width, height, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values);
/* There does not appear to be an explicit way to check if a texture is 1D or 2D.
* It depends on more than height. So check instead by looking at the source.
* The Blender default config does not use 1D textures, but for example
* studio-config-v3.0.0_aces-v2.0_ocio-v2.4.ocio needs this code. */
std::string sampler1D_name = std::string("sampler1D ") + sampler_name;
if (strstr(shader_desc->getShaderText(), sampler1D_name.c_str()) != nullptr) {
lut.texture = GPU_texture_create_1d(
texture_name, width, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values);
}
else {
lut.texture = GPU_texture_create_2d(
texture_name, width, height, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values);
}
if (lut.texture == nullptr) {
return false;
}