[Bf-blender-cvs] [2db277092d8] blender-v2.91-release: Fix T83625: Shading attribute names cause compilation error.
Jeroen Bakker
noreply at git.blender.org
Wed Jan 13 14:31:18 CET 2021
Commit: 2db277092d8322abc3851ba18368ac370e2dd0dd
Author: Jeroen Bakker
Date: Fri Dec 18 09:56:28 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB2db277092d8322abc3851ba18368ac370e2dd0dd
Fix T83625: Shading attribute names cause compilation error.
Some GPU platforms don't support having more than one underscore in
sequence in an attribute name. This change will remove the underscore
as a possible character when encoding to save names.
===================================================================
M source/blender/gpu/intern/gpu_vertex_format.cc
===================================================================
diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc
index 3b0aa055588..57be56112f2 100644
--- a/source/blender/gpu/intern/gpu_vertex_format.cc
+++ b/source/blender/gpu/intern/gpu_vertex_format.cc
@@ -262,13 +262,12 @@ void GPU_vertformat_attr_rename(GPUVertFormat *format, int attr_id, const char *
/* Encode 8 original bytes into 11 safe bytes. */
static void safe_bytes(char out[11], const char data[8])
{
- char safe_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+ char safe_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
uint64_t in = *(uint64_t *)data;
for (int i = 0; i < 11; i++) {
- /* Encoding in base63 */
- out[i] = safe_chars[in % 63lu];
- in /= 63lu;
+ out[i] = safe_chars[in % 62lu];
+ in /= 62lu;
}
}
More information about the Bf-blender-cvs
mailing list