Minor cleanups to copy vertex.

Makes the files parsable as c++ files. Bug: chromium:943709 Change-Id: I6f7d718f9773fe4a7f72828ee9cd56beb5577c66 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1545528Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Minor cleanups to copy vertex.
85b04bb2 · Jamie Madill · Commit Bot · 12b25347 · 85b04bb2 · 85b04bb2
Commit 85b04bb2 authored Apr 02, 2019 by Jamie Madill Committed by Commit Bot Apr 04, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 22 deletions

copyvertex.h src/libANGLE/renderer/copyvertex.h +15 -21

copyvertex.inc.h src/libANGLE/renderer/copyvertex.inc.h +0 -0

libGLESv2.gni src/libGLESv2.gni +1 -1

No files found.
--- a/src/libANGLE/renderer/copyvertex.h
+++ b/src/libANGLE/renderer/copyvertex.h
@@ -24,40 +24,34 @@ template <typename T,
          size_t inputComponentCount,
          size_t outputComponentCount,
          uint32_t alphaDefaultValueBits>
-inline void CopyNativeVertexData(const uint8_t *input,
+void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
+template <size_t inputComponentCount, size_t outputComponentCount>
+void Copy8SintTo16SintVertexData(const uint8_t *input,
                                 size_t stride,
                                 size_t count,
                                 uint8_t *output);
-template <size_t inputComponentCount, size_t outputComponentCount>
-inline void Copy8SintTo16SintVertexData(const uint8_t *input,
-                                        size_t stride,
-                                        size_t count,
-                                        uint8_t *output);
 template <size_t componentCount>
-inline void Copy8SnormTo16SnormVertexData(const uint8_t *input,
+void Copy8SnormTo16SnormVertexData(const uint8_t *input,
-                                          size_t stride,
+                                   size_t stride,
-                                          size_t count,
+                                   size_t count,
-                                          uint8_t *output);
+                                   uint8_t *output);
 template <size_t inputComponentCount, size_t outputComponentCount>
-inline void Copy32FixedTo32FVertexData(const uint8_t *input,
+void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
-                                       size_t stride,
-                                       size_t count,
-                                       uint8_t *output);
 template <typename T, size_t inputComponentCount, size_t outputComponentCount, bool normalized>
-inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
+void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
 template <bool isSigned, bool normalized, bool toFloat>
-inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
+void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
-                                           size_t stride,
+                                    size_t stride,
-                                           size_t count,
+                                    size_t count,
-                                           uint8_t *output);
+                                    uint8_t *output);
 }  // namespace rx
-#include "copyvertex.inc"
+#include "copyvertex.inc.h"
 #endif  // LIBANGLE_RENDERER_COPYVERTEX_H_
--- a/src/libANGLE/renderer/copyvertex.inc
+++ b/src/libANGLE/renderer/copyvertex.inc
--- a/src/libGLESv2.gni
+++ b/src/libGLESv2.gni
@@ -317,7 +317,7 @@ libangle_sources = [
  "src/libANGLE/renderer/TransformFeedbackImpl.h",
  "src/libANGLE/renderer/VertexArrayImpl.h",
  "src/libANGLE/renderer/copyvertex.h",
-  "src/libANGLE/renderer/copyvertex.inc",
+  "src/libANGLE/renderer/copyvertex.inc.h",
  "src/libANGLE/renderer/load_functions_table.h",
  "src/libANGLE/renderer/load_functions_table_autogen.cpp",
  "src/libANGLE/renderer/renderer_utils.cpp",