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 178 additions and 107 deletions
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,
size_t stride,
size_t count,
uint8_t *output);
void Copy8SnormTo16SnormVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output);
template <size_t inputComponentCount, size_t outputComponentCount>
inline void Copy32FixedTo32FVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output);
void Copy32FixedTo32FVertexData(const uint8_t *input, 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,
size_t stride,
size_t count,
uint8_t *output);
void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
size_t stride,
size_t count,
uint8_t *output);
} // namespace rx
#include "copyvertex.inc"
#include "copyvertex.inc.h"
#endif // LIBANGLE_RENDERER_COPYVERTEX_H_
src/libANGLE/renderer/copyvertex.inc → src/libANGLE/renderer/copyvertex.inc.h
......@@ -4,15 +4,18 @@
// 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
{
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)
{
const size_t attribSize = sizeof(T)* inputComponentCount;
const size_t attribSize = sizeof(T) * inputComponentCount;
if (attribSize == stride && inputComponentCount == outputComponentCount)
{
......@@ -24,21 +27,21 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou
{
for (size_t i = 0; i < count; i++)
{
const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount;
const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T *>(output) + i * outputComponentCount;
memcpy(offsetOutput, offsetInput, attribSize);
}
return;
}
const T defaultAlphaValue = gl::bitCast<T>(alphaDefaultValueBits);
const T defaultAlphaValue = gl::bitCast<T>(alphaDefaultValueBits);
const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
for (size_t i = 0; i < count; i++)
{
const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount;
const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
T *offsetOutput = reinterpret_cast<T *>(output) + i * outputComponentCount;
memcpy(offsetOutput, offsetInput, attribSize);
......@@ -58,14 +61,17 @@ inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t cou
}
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);
for (size_t i = 0; i < count; i++)
{
const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort*>(output)+i * outputComponentCount;
const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++)
{
......@@ -87,20 +93,25 @@ inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, siz
}
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++)
{
const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort*>(output) + i * outputComponentCount;
const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
GLshort *offsetOutput = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++)
{
// 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)
{
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
{
......@@ -123,7 +134,10 @@ inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, s
}
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);
......@@ -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.
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++)
{
......@@ -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++)
{
const T *offsetInput = reinterpret_cast<const T*>(input + (stride * i));
float *offsetOutput = reinterpret_cast<float*>(output) + i * outputComponentCount;
const T *offsetInput = reinterpret_cast<const T *>(input + (stride * i));
float *offsetOutput = reinterpret_cast<float *>(output) + i * outputComponentCount;
for (size_t j = 0; j < inputComponentCount; j++)
{
......@@ -179,22 +194,23 @@ inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t coun
if (NL::is_signed)
{
const float divisor = 1.0f / (2 * static_cast<float>(NL::max()) + 1);
offsetOutput[j] = (2 * static_cast<float>(offsetInput[j]) + 1) * divisor;
offsetOutput[j] = (2 * static_cast<float>(offsetInput[j]) + 1) * divisor;
}
else
{
offsetOutput[j] = static_cast<float>(offsetInput[j]) / NL::max();
offsetOutput[j] = static_cast<float>(offsetInput[j]) / NL::max();
}
}
else
{
offsetOutput[j] = static_cast<float>(offsetInput[j]);
offsetOutput[j] = static_cast<float>(offsetInput[j]);
}
}
// This would require special padding.
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++)
{
......@@ -209,19 +225,19 @@ namespace priv
template <bool isSigned, bool normalized, bool toFloat>
static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
{
const uint32_t rgbSignMask = 0x200; // 1 set at the 9 bit
const uint32_t negativeMask = 0xFFFFFC00; // All bits from 10 to 31 set to 1
const uint32_t rgbSignMask = 0x200; // 1 set at the 9 bit
const uint32_t negativeMask = 0xFFFFFC00; // All bits from 10 to 31 set to 1
if (toFloat)
{
GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output);
GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
if (isSigned)
{
GLfloat finalValue = 0;
if (data & rgbSignMask)
{
int negativeNumber = data | negativeMask;
finalValue = static_cast<GLfloat>(negativeNumber);
finalValue = static_cast<GLfloat>(negativeNumber);
}
else
{
......@@ -230,19 +246,19 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
if (normalized)
{
const int32_t maxValue = 0x1FF; // 1 set in bits 0 through 8
const int32_t minValue = 0xFFFFFE01; // Inverse of maxValue
const int32_t maxValue = 0x1FF; // 1 set in bits 0 through 8
const int32_t minValue = 0xFFFFFE01; // Inverse of maxValue
// 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
// case.
// OpenGL's normalization rules dictate that it should be clamped to minValue in
// this case.
if (finalValue < minValue)
{
finalValue = minValue;
}
const int32_t halfRange = (maxValue - minValue) >> 1;
*floatOutput = ((finalValue - minValue) / halfRange) - 1.0f;
*floatOutput = ((finalValue - minValue) / halfRange) - 1.0f;
}
else
{
......@@ -253,7 +269,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
{
if (normalized)
{
const uint32_t maxValue = 0x3FF; // 1 set in bits 0 through 9
const uint32_t maxValue = 0x3FF; // 1 set in bits 0 through 9
*floatOutput = static_cast<GLfloat>(data) / static_cast<GLfloat>(maxValue);
}
else
......@@ -266,7 +282,7 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
{
if (isSigned)
{
GLshort *intOutput = reinterpret_cast<GLshort*>(output);
GLshort *intOutput = reinterpret_cast<GLshort *>(output);
if (data & rgbSignMask)
{
......@@ -279,8 +295,8 @@ static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
}
else
{
GLushort *uintOutput = reinterpret_cast<GLushort*>(output);
*uintOutput = static_cast<GLushort>(data);
GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
*uintOutput = static_cast<GLushort>(data);
}
}
}
......@@ -290,29 +306,47 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
{
if (toFloat)
{
GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output);
GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
if (isSigned)
{
if (normalized)
{
switch (data)
{
case 0x0: *floatOutput = 0.0f; break;
case 0x1: *floatOutput = 1.0f; break;
case 0x2: *floatOutput = -1.0f; break;
case 0x3: *floatOutput = -1.0f; break;
default: UNREACHABLE();
case 0x0:
*floatOutput = 0.0f;
break;
case 0x1:
*floatOutput = 1.0f;
break;
case 0x2:
*floatOutput = -1.0f;
break;
case 0x3:
*floatOutput = -1.0f;
break;
default:
UNREACHABLE();
}
}
else
{
switch (data)
{
case 0x0: *floatOutput = 0.0f; break;
case 0x1: *floatOutput = 1.0f; break;
case 0x2: *floatOutput = -2.0f; break;
case 0x3: *floatOutput = -1.0f; break;
default: UNREACHABLE();
case 0x0:
*floatOutput = 0.0f;
break;
case 0x1:
*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)
{
switch (data)
{
case 0x0: *floatOutput = 0.0f / 3.0f; break;
case 0x1: *floatOutput = 1.0f / 3.0f; break;
case 0x2: *floatOutput = 2.0f / 3.0f; break;
case 0x3: *floatOutput = 3.0f / 3.0f; break;
default: UNREACHABLE();
case 0x0:
*floatOutput = 0.0f / 3.0f;
break;
case 0x1:
*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
{
switch (data)
{
case 0x0: *floatOutput = 0.0f; break;
case 0x1: *floatOutput = 1.0f; break;
case 0x2: *floatOutput = 2.0f; break;
case 0x3: *floatOutput = 3.0f; break;
default: UNREACHABLE();
case 0x0:
*floatOutput = 0.0f;
break;
case 0x1:
*floatOutput = 1.0f;
break;
case 0x2:
*floatOutput = 2.0f;
break;
case 0x3:
*floatOutput = 3.0f;
break;
default:
UNREACHABLE();
}
}
}
......@@ -346,57 +398,82 @@ inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
{
if (isSigned)
{
GLshort *intOutput = reinterpret_cast<GLshort*>(output);
GLshort *intOutput = reinterpret_cast<GLshort *>(output);
switch (data)
{
case 0x0: *intOutput = 0; break;
case 0x1: *intOutput = 1; break;
case 0x2: *intOutput = -2; break;
case 0x3: *intOutput = -1; break;
default: UNREACHABLE();
case 0x0:
*intOutput = 0;
break;
case 0x1:
*intOutput = 1;
break;
case 0x2:
*intOutput = -2;
break;
case 0x3:
*intOutput = -1;
break;
default:
UNREACHABLE();
}
}
else
{
GLushort *uintOutput = reinterpret_cast<GLushort*>(output);
GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
switch (data)
{
case 0x0: *uintOutput = 0; break;
case 0x1: *uintOutput = 1; break;
case 0x2: *uintOutput = 2; break;
case 0x3: *uintOutput = 3; break;
default: UNREACHABLE();
case 0x0:
*uintOutput = 0;
break;
case 0x1:
*uintOutput = 1;
break;
case 0x2:
*uintOutput = 2;
break;
case 0x3:
*uintOutput = 3;
break;
default:
UNREACHABLE();
}
}
}
}
}
} // namespace priv
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 componentCount = 4;
const size_t componentCount = 4;
const uint32_t rgbMask = 0x3FF; // 1 set in bits 0 through 9
const size_t redShift = 0; // red is bits 0 through 9
const size_t greenShift = 10; // green is bits 10 through 19
const size_t blueShift = 20; // blue is bits 20 through 29
const uint32_t rgbMask = 0x3FF; // 1 set in bits 0 through 9
const size_t redShift = 0; // red is bits 0 through 9
const size_t greenShift = 10; // green is bits 10 through 19
const size_t blueShift = 20; // blue is bits 20 through 29
const uint32_t alphaMask = 0x3; // 1 set in bits 0 and 1
const size_t alphaShift = 30; // Alpha is the 30 and 31 bits
const uint32_t alphaMask = 0x3; // 1 set in bits 0 and 1
const size_t alphaShift = 30; // Alpha is the 30 and 31 bits
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);
priv::CopyPackedRGB<isSigned, normalized, toFloat>( (packedValue >> redShift) & rgbMask, offsetOutput + (0 * outputComponentSize));
priv::CopyPackedRGB<isSigned, normalized, toFloat>( (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));
priv::CopyPackedRGB<isSigned, normalized, toFloat>(
(packedValue >> redShift) & rgbMask, offsetOutput + (0 * outputComponentSize));
priv::CopyPackedRGB<isSigned, normalized, toFloat>(
(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 = [
"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",
......
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