Skip to content

A
angle
Commit 85b04bb2 by Jamie Madill Committed by Commit Bot
Options

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: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 12b25347
Showing with 151 additions and 80 deletions
src/libANGLE/renderer/copyvertex.h
...@@ -24,40 +24,34 @@ template <typename T, ...@@ -24,40 +24,34 @@ template <typename T,
size_t inputComponentCount, size_t inputComponentCount,
size_t outputComponentCount, size_t outputComponentCount,
uint32_t alphaDefaultValueBits> 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);
size_t stride,
size_t count,
uint8_t *output);
template <size_t inputComponentCount, size_t outputComponentCount> template <size_t inputComponentCount, size_t outputComponentCount>
inline void Copy8SintTo16SintVertexData(const uint8_t *input, void Copy8SintTo16SintVertexData(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 componentCount> 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> 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> 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> 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 } // namespace rx
#include "copyvertex.inc" #include "copyvertex.inc.h"
#endif // LIBANGLE_RENDERER_COPYVERTEX_H_ #endif // LIBANGLE_RENDERER_COPYVERTEX_H_
src/libANGLE/renderer/copyvertex.inc → src/libANGLE/renderer/copyvertex.inc.h
...@@ -4,15 +4,18 @@ ...@@ -4,15 +4,18 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// copyvertex.inc: Implementation of vertex buffer copying and conversion functions // copyvertex.inc.h: Implementation of vertex buffer copying and conversion functions
namespace rx namespace rx
{ {
template <typename T, size_t inputComponentCount, size_t outputComponentCount, uint32_t alphaDefaultValueBits> template <typename T,
size_t inputComponentCount,
size_t outputComponentCount,
uint32_t alphaDefaultValueBits>
inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output) inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
{ {
const size_t attribSize = sizeof(T)* inputComponentCount; const size_t attribSize = sizeof(T) * inputComponentCount;
if (attribSize == stride && inputComponentCount == outputComponentCount) if (attribSize == stride && inputComponentCount == outputComponentCount)
{ {
...@@ -24,8 +27,8 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou ...@@ -24,8 +27,8 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride)); const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount; T *offsetOutput = reinterpret_cast<T *>(output) + i * outputComponentCount;
memcpy(offsetOutput, offsetInput, attribSize); memcpy(offsetOutput, offsetInput, attribSize);
} }
...@@ -37,8 +40,8 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou ...@@ -37,8 +40,8 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride)); const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount; T *offsetOutput = reinterpret_cast<T *>(output) + i * outputComponentCount;
memcpy(offsetOutput, offsetInput, attribSize); memcpy(offsetOutput, offsetInput, attribSize);
...@@ -58,14 +61,17 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou ...@@ -58,14 +61,17 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou
} }
template <size_t inputComponentCount, size_t outputComponentCount> template <size_t inputComponentCount, size_t outputComponentCount>
inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output) inline void Copy8SintTo16SintVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output)
{ {
const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3); const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride); const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort*>(output)+i * outputComponentCount; GLshort *offsetOutput = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++) for (size_t j = 0; j < inputComponentCount; j++)
{ {
...@@ -87,20 +93,25 @@ inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, siz ...@@ -87,20 +93,25 @@ inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, siz
} }
template <size_t inputComponentCount, size_t outputComponentCount> template <size_t inputComponentCount, size_t outputComponentCount>
inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output) inline void Copy8SnormTo16SnormVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output)
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride); const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort*>(output) + i * outputComponentCount; GLshort *offsetOutput = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++) for (size_t j = 0; j < inputComponentCount; j++)
{ {
// The original GLbyte value ranges from -128 to +127 (INT8_MAX). // The original GLbyte value ranges from -128 to +127 (INT8_MAX).
// When converted to GLshort, the value must be scaled to between -32768 and +32767 (INT16_MAX). // When converted to GLshort, the value must be scaled to between -32768 and +32767
// (INT16_MAX).
if (offsetInput[j] > 0) if (offsetInput[j] > 0)
{ {
offsetOutput[j] = offsetInput[j] << 8 | offsetInput[j] << 1 | ((offsetInput[j] & 0x40) >> 6); offsetOutput[j] =
offsetInput[j] << 8 | offsetInput[j] << 1 | ((offsetInput[j] & 0x40) >> 6);
} }
else else
{ {
...@@ -123,7 +134,10 @@ inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, s ...@@ -123,7 +134,10 @@ inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, s
} }
template <size_t inputComponentCount, size_t outputComponentCount> template <size_t inputComponentCount, size_t outputComponentCount>
inline void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output) inline void Copy32FixedTo32FVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output)
{ {
static const float divisor = 1.0f / (1 << 16); static const float divisor = 1.0f / (1 << 16);
...@@ -153,7 +167,8 @@ inline void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size ...@@ -153,7 +167,8 @@ inline void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size
// 4-component output formats would need special padding in the alpha channel. // 4-component output formats would need special padding in the alpha channel.
static_assert(!(inputComponentCount < 4 && outputComponentCount == 4), static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
"An inputComponentCount less than 4 and an outputComponentCount equal to 4 is not supported."); "An inputComponentCount less than 4 and an outputComponentCount equal to 4 "
"is not supported.");
for (size_t j = inputComponentCount; j < outputComponentCount; j++) for (size_t j = inputComponentCount; j < outputComponentCount; j++)
{ {
...@@ -169,8 +184,8 @@ inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t coun ...@@ -169,8 +184,8 @@ inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t coun
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
const T *offsetInput = reinterpret_cast<const T*>(input + (stride * i)); const T *offsetInput = reinterpret_cast<const T *>(input + (stride * i));
float *offsetOutput = reinterpret_cast<float*>(output) + i * outputComponentCount; float *offsetOutput = reinterpret_cast<float *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++) for (size_t j = 0; j < inputComponentCount; j++)
{ {
...@@ -194,7 +209,8 @@ inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t coun ...@@ -194,7 +209,8 @@ inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t coun
// This would require special padding. // This would require special padding.
static_assert(!(inputComponentCount < 4 && outputComponentCount == 4), static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
"An inputComponentCount less than 4 and an outputComponentCount equal to 4 is not supported."); "An inputComponentCount less than 4 and an outputComponentCount equal to 4 "
"is not supported.");
for (size_t j = inputComponentCount; j < outputComponentCount; j++) for (size_t j = inputComponentCount; j < outputComponentCount; j++)
{ {
...@@ -214,7 +230,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output) ...@@ -214,7 +230,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
if (toFloat) if (toFloat)
{ {
GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output); GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
if (isSigned) if (isSigned)
{ {
GLfloat finalValue = 0; GLfloat finalValue = 0;
...@@ -234,8 +250,8 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output) ...@@ -234,8 +250,8 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
const int32_t minValue = 0xFFFFFE01; // Inverse of maxValue const int32_t minValue = 0xFFFFFE01; // Inverse of maxValue
// A 10-bit two's complement number has the possibility of being minValue - 1 but // A 10-bit two's complement number has the possibility of being minValue - 1 but
// OpenGL's normalization rules dictate that it should be clamped to minValue in this // OpenGL's normalization rules dictate that it should be clamped to minValue in
// case. // this case.
if (finalValue < minValue) if (finalValue < minValue)
{ {
finalValue = minValue; finalValue = minValue;
...@@ -266,7 +282,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output) ...@@ -266,7 +282,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
{ {
if (isSigned) if (isSigned)
{ {
GLshort *intOutput = reinterpret_cast<GLshort*>(output); GLshort *intOutput = reinterpret_cast<GLshort *>(output);
if (data & rgbSignMask) if (data & rgbSignMask)
{ {
...@@ -279,7 +295,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output) ...@@ -279,7 +295,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
} }
else else
{ {
GLushort *uintOutput = reinterpret_cast<GLushort*>(output); GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
*uintOutput = static_cast<GLushort>(data); *uintOutput = static_cast<GLushort>(data);
} }
} }
...@@ -290,29 +306,47 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output) ...@@ -290,29 +306,47 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
{ {
if (toFloat) if (toFloat)
{ {
GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output); GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
if (isSigned) if (isSigned)
{ {
if (normalized) if (normalized)
{ {
switch (data) switch (data)
{ {
case 0x0: *floatOutput = 0.0f; break; case 0x0:
case 0x1: *floatOutput = 1.0f; break; *floatOutput = 0.0f;
case 0x2: *floatOutput = -1.0f; break; break;
case 0x3: *floatOutput = -1.0f; break; case 0x1:
default: UNREACHABLE(); *floatOutput = 1.0f;
break;
case 0x2:
*floatOutput = -1.0f;
break;
case 0x3:
*floatOutput = -1.0f;
break;
default:
UNREACHABLE();
} }
} }
else else
{ {
switch (data) switch (data)
{ {
case 0x0: *floatOutput = 0.0f; break; case 0x0:
case 0x1: *floatOutput = 1.0f; break; *floatOutput = 0.0f;
case 0x2: *floatOutput = -2.0f; break; break;
case 0x3: *floatOutput = -1.0f; break; case 0x1:
default: UNREACHABLE(); *floatOutput = 1.0f;
break;
case 0x2:
*floatOutput = -2.0f;
break;
case 0x3:
*floatOutput = -1.0f;
break;
default:
UNREACHABLE();
} }
} }
} }
...@@ -322,22 +356,40 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output) ...@@ -322,22 +356,40 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
{ {
switch (data) switch (data)
{ {
case 0x0: *floatOutput = 0.0f / 3.0f; break; case 0x0:
case 0x1: *floatOutput = 1.0f / 3.0f; break; *floatOutput = 0.0f / 3.0f;
case 0x2: *floatOutput = 2.0f / 3.0f; break; break;
case 0x3: *floatOutput = 3.0f / 3.0f; break; case 0x1:
default: UNREACHABLE(); *floatOutput = 1.0f / 3.0f;
break;
case 0x2:
*floatOutput = 2.0f / 3.0f;
break;
case 0x3:
*floatOutput = 3.0f / 3.0f;
break;
default:
UNREACHABLE();
} }
} }
else else
{ {
switch (data) switch (data)
{ {
case 0x0: *floatOutput = 0.0f; break; case 0x0:
case 0x1: *floatOutput = 1.0f; break; *floatOutput = 0.0f;
case 0x2: *floatOutput = 2.0f; break; break;
case 0x3: *floatOutput = 3.0f; break; case 0x1:
default: UNREACHABLE(); *floatOutput = 1.0f;
break;
case 0x2:
*floatOutput = 2.0f;
break;
case 0x3:
*floatOutput = 3.0f;
break;
default:
UNREACHABLE();
} }
} }
} }
...@@ -346,35 +398,56 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output) ...@@ -346,35 +398,56 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
{ {
if (isSigned) if (isSigned)
{ {
GLshort *intOutput = reinterpret_cast<GLshort*>(output); GLshort *intOutput = reinterpret_cast<GLshort *>(output);
switch (data) switch (data)
{ {
case 0x0: *intOutput = 0; break; case 0x0:
case 0x1: *intOutput = 1; break; *intOutput = 0;
case 0x2: *intOutput = -2; break; break;
case 0x3: *intOutput = -1; break; case 0x1:
default: UNREACHABLE(); *intOutput = 1;
break;
case 0x2:
*intOutput = -2;
break;
case 0x3:
*intOutput = -1;
break;
default:
UNREACHABLE();
} }
} }
else else
{ {
GLushort *uintOutput = reinterpret_cast<GLushort*>(output); GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
switch (data) switch (data)
{ {
case 0x0: *uintOutput = 0; break; case 0x0:
case 0x1: *uintOutput = 1; break; *uintOutput = 0;
case 0x2: *uintOutput = 2; break; break;
case 0x3: *uintOutput = 3; break; case 0x1:
default: UNREACHABLE(); *uintOutput = 1;
break;
case 0x2:
*uintOutput = 2;
break;
case 0x3:
*uintOutput = 3;
break;
default:
UNREACHABLE();
} }
} }
} }
} }
} } // namespace priv
template <bool isSigned, bool normalized, bool toFloat> template <bool isSigned, bool normalized, bool toFloat>
inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output) inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output)
{ {
const size_t outputComponentSize = toFloat ? 4 : 2; const size_t outputComponentSize = toFloat ? 4 : 2;
const size_t componentCount = 4; const size_t componentCount = 4;
...@@ -389,14 +462,18 @@ inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input, size_t stride, ...@@ -389,14 +462,18 @@ inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input, size_t stride,
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
GLuint packedValue = *reinterpret_cast<const GLuint*>(input + (i * stride)); GLuint packedValue = *reinterpret_cast<const GLuint *>(input + (i * stride));
uint8_t *offsetOutput = output + (i * outputComponentSize * componentCount); uint8_t *offsetOutput = output + (i * outputComponentSize * componentCount);
priv::CopyPackedRGB<isSigned, normalized, toFloat>( (packedValue >> redShift) & rgbMask, offsetOutput + (0 * outputComponentSize)); priv::CopyPackedRGB<isSigned, normalized, toFloat>(
priv::CopyPackedRGB<isSigned, normalized, toFloat>( (packedValue >> greenShift) & rgbMask, offsetOutput + (1 * outputComponentSize)); (packedValue >> redShift) & rgbMask, offsetOutput + (0 * outputComponentSize));
priv::CopyPackedRGB<isSigned, normalized, toFloat>( (packedValue >> blueShift) & rgbMask, offsetOutput + (2 * outputComponentSize)); priv::CopyPackedRGB<isSigned, normalized, toFloat>(
priv::CopyPackedAlpha<isSigned, normalized, toFloat>((packedValue >> alphaShift) & alphaMask, offsetOutput + (3 * outputComponentSize)); (packedValue >> greenShift) & rgbMask, offsetOutput + (1 * outputComponentSize));
priv::CopyPackedRGB<isSigned, normalized, toFloat>(
(packedValue >> blueShift) & rgbMask, offsetOutput + (2 * outputComponentSize));
priv::CopyPackedAlpha<isSigned, normalized, toFloat>(
(packedValue >> alphaShift) & alphaMask, offsetOutput + (3 * outputComponentSize));
} }
} }
} } // namespace rx
src/libGLESv2.gni
...@@ -317,7 +317,7 @@ libangle_sources = [ ...@@ -317,7 +317,7 @@ libangle_sources = [
"src/libANGLE/renderer/TransformFeedbackImpl.h", "src/libANGLE/renderer/TransformFeedbackImpl.h",
"src/libANGLE/renderer/VertexArrayImpl.h", "src/libANGLE/renderer/VertexArrayImpl.h",
"src/libANGLE/renderer/copyvertex.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.h",
"src/libANGLE/renderer/load_functions_table_autogen.cpp", "src/libANGLE/renderer/load_functions_table_autogen.cpp",
"src/libANGLE/renderer/renderer_utils.cpp", "src/libANGLE/renderer/renderer_utils.cpp",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment