Revert "GPU: add negated normal conversion functions"
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 06:19:05 +0000 (17:19 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 06:19:05 +0000 (17:19 +1100)
This reverts commit d28b29d428cc7fc7eb29f2302b5d80fc63a9f870.

source/blender/gpu/GPU_vertex_format.h
source/blender/gpu/intern/gpu_vertex_format.c

index 74a86fbcb40ef43d0dd8bcd72f73e1ed6a9cdd57..7a271caf079f5bb3de7804e0328c06760ab40551 100644 (file)
@@ -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__ */
index 24f4a1a53f152696234c9ad9ddf3643068bb500a..ca636d2e2317c8c218319f97560f87b8e8ee6fdf 100644 (file)
@@ -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;
-}