[Bf-blender-cvs] [052150bbcc8] master: Revert "GPU: add negated normal conversion functions"
Campbell Barton
noreply at git.blender.org
Thu Jan 3 07:29:00 CET 2019
Commit: 052150bbcc85ee3440b1ffe372efd991e4d46c4c
Author: Campbell Barton
Date: Thu Jan 3 17:19:05 2019 +1100
Branches: master
https://developer.blender.org/rB052150bbcc85ee3440b1ffe372efd991e4d46c4c
Revert "GPU: add negated normal conversion functions"
This reverts commit d28b29d428cc7fc7eb29f2302b5d80fc63a9f870.
===================================================================
M source/blender/gpu/GPU_vertex_format.h
M source/blender/gpu/intern/gpu_vertex_format.c
===================================================================
diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h
index 74a86fbcb40..7a271caf079 100644
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@ -112,8 +112,6 @@ typedef struct GPUPackedNormal {
} GPUPackedNormal;
GPUPackedNormal GPU_normal_convert_i10_v3(const float data[3]);
-GPUPackedNormal GPU_normal_convert_i10_v3_negated(const float data[3]);
GPUPackedNormal GPU_normal_convert_i10_s3(const short data[3]);
-GPUPackedNormal GPU_normal_convert_i10_s3_negated(const short data[3]);
#endif /* __GPU_VERTEX_FORMAT_H__ */
diff --git a/source/blender/gpu/intern/gpu_vertex_format.c b/source/blender/gpu/intern/gpu_vertex_format.c
index 24f4a1a53f1..ca636d2e231 100644
--- a/source/blender/gpu/intern/gpu_vertex_format.c
+++ b/source/blender/gpu/intern/gpu_vertex_format.c
@@ -478,20 +478,8 @@ GPUPackedNormal GPU_normal_convert_i10_v3(const float data[3])
return n;
}
-GPUPackedNormal GPU_normal_convert_i10_v3_negated(const float data[3])
-{
- GPUPackedNormal n = { .x = quantize(-data[0]), .y = quantize(-data[1]), .z = quantize(-data[2]) };
- return n;
-}
-
GPUPackedNormal GPU_normal_convert_i10_s3(const short data[3])
{
GPUPackedNormal n = { .x = convert_i16(data[0]), .y = convert_i16(data[1]), .z = convert_i16(data[2]) };
return n;
}
-
-GPUPackedNormal GPU_normal_convert_i10_s3_negated(const short data[3])
-{
- GPUPackedNormal n = { .x = convert_i16(-data[0]), .y = convert_i16(-data[1]), .z = convert_i16(-data[2]) };
- return n;
-}
More information about the Bf-blender-cvs
mailing list