Combine widen and defaultBits params of copyVertexData.

Since we never, and never will use a default value of zero for the alpha channel, we can use a value of zero to indicate no widening. This has the benefit of not needing a default value where it does not apply. BUG=angle:550 Change-Id: Ifdfedcb16039aa1d7f8ee644b65c6b4d89f9a384 Reviewed-on: https://chromium-review.googlesource.com/188432Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Combine widen and defaultBits params of copyVertexData.
2f612290 · Jamie Madill · 0027fa9f · 2f612290 · 2f612290
Commit 2f612290 authored Mar 05, 2014 by Jamie Madill
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

copyvertex.h src/libGLESv2/renderer/copyvertex.h +5 -2

formatutils11.cpp src/libGLESv2/renderer/d3d11/formatutils11.cpp +0 -0

No files found.
--- a/src/libGLESv2/renderer/copyvertex.h
+++ b/src/libGLESv2/renderer/copyvertex.h
@@ -11,11 +11,14 @@
 #include "common/mathutil.h"
-template <typename T, unsigned int componentCount, bool widen, unsigned int defaultValueBits>
+// 'widenDefaultValueBits' gives the default value for the alpha channel (4th component)
+//  the sentinel value 0 means we do not want to widen the input or add an alpha channel
+template <typename T, unsigned int componentCount, unsigned int widenDefaultValueBits>
 inline void copyVertexData(const void *input, size_t stride, size_t count, void *output)
 {
    const unsigned int attribSize = sizeof(T) * componentCount;
-    const T defaultValue = gl::bitCast<T>(defaultValueBits);
+    const T defaultValue = gl::bitCast<T>(widenDefaultValueBits);
+    const bool widen = (widenDefaultValueBits != 0);
    if (attribSize == stride && !widen)
    {

--- a/src/libGLESv2/renderer/d3d11/formatutils11.cpp
+++ b/src/libGLESv2/renderer/d3d11/formatutils11.cpp