Hash :
71c88b31
Author :
Date :
2017-09-14T22:20:29
Enable [[nodiscard]] for gl::Error. This forces all return values to be checked for gl::Error. Requires quite a bit of minor refactoring. I also added a macro to swallow an error without returning from a function. We could look at storing the errors in the Context at some point, since almost always when we're generating errors that we need to discard we have access to the Context as a parameter. BUG=angleproject:2150 Change-Id: I457e48a30c002eda0993acbcd3180ba87bf169fb Reviewed-on: https://chromium-review.googlesource.com/665173 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
//
// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// VertexBuffer.cpp: Defines the abstract VertexBuffer class and VertexBufferInterface
// class with derivations, classes that perform graphics API agnostic vertex buffer operations.
#include "libANGLE/renderer/d3d/VertexBuffer.h"
#include "common/mathutil.h"
#include "libANGLE/renderer/d3d/BufferD3D.h"
#include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/VertexAttribute.h"
namespace rx
{
// VertexBuffer Implementation
unsigned int VertexBuffer::mNextSerial = 1;
VertexBuffer::VertexBuffer() : mRefCount(1)
{
updateSerial();
}
VertexBuffer::~VertexBuffer()
{
}
void VertexBuffer::updateSerial()
{
mSerial = mNextSerial++;
}
unsigned int VertexBuffer::getSerial() const
{
return mSerial;
}
void VertexBuffer::addRef()
{
mRefCount++;
}
void VertexBuffer::release()
{
ASSERT(mRefCount > 0);
mRefCount--;
if (mRefCount == 0)
{
delete this;
}
}
// VertexBufferInterface Implementation
VertexBufferInterface::VertexBufferInterface(BufferFactoryD3D *factory, bool dynamic)
: mFactory(factory), mVertexBuffer(factory->createVertexBuffer()), mDynamic(dynamic)
{
}
VertexBufferInterface::~VertexBufferInterface()
{
if (mVertexBuffer)
{
mVertexBuffer->release();
}
}
unsigned int VertexBufferInterface::getSerial() const
{
return mVertexBuffer->getSerial();
}
unsigned int VertexBufferInterface::getBufferSize() const
{
return mVertexBuffer->getBufferSize();
}
gl::Error VertexBufferInterface::setBufferSize(unsigned int size)
{
if (mVertexBuffer->getBufferSize() == 0)
{
return mVertexBuffer->initialize(size, mDynamic);
}
return mVertexBuffer->setBufferSize(size);
}
gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired(
const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
GLsizei count,
GLsizei instances) const
{
unsigned int spaceRequired = 0;
ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, count, instances),
spaceRequired);
// Align to 16-byte boundary
unsigned int alignedSpaceRequired = roundUp(spaceRequired, 16u);
if (alignedSpaceRequired < spaceRequired)
{
return gl::OutOfMemory()
<< "Vertex buffer overflow in VertexBufferInterface::getSpaceRequired.";
}
return alignedSpaceRequired;
}
gl::Error VertexBufferInterface::discard()
{
return mVertexBuffer->discard();
}
VertexBuffer *VertexBufferInterface::getVertexBuffer() const
{
return mVertexBuffer;
}
// StreamingVertexBufferInterface Implementation
StreamingVertexBufferInterface::StreamingVertexBufferInterface(BufferFactoryD3D *factory,
std::size_t initialSize)
: VertexBufferInterface(factory, true), mWritePosition(0), mReservedSpace(0)
{
// TODO(jmadill): Make an initialize method that can return an error.
ANGLE_SWALLOW_ERR(setBufferSize(static_cast<unsigned int>(initialSize)));
}
StreamingVertexBufferInterface::~StreamingVertexBufferInterface()
{
}
gl::Error StreamingVertexBufferInterface::reserveSpace(unsigned int size)
{
unsigned int curBufferSize = getBufferSize();
if (size > curBufferSize)
{
ANGLE_TRY(setBufferSize(std::max(size, 3 * curBufferSize / 2)));
mWritePosition = 0;
}
else if (mWritePosition + size > curBufferSize)
{
ANGLE_TRY(discard());
mWritePosition = 0;
}
return gl::NoError();
}
gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
GLenum currentValueType,
GLint start,
GLsizei count,
GLsizei instances,
unsigned int *outStreamOffset,
const uint8_t *sourceData)
{
unsigned int spaceRequired = 0;
ANGLE_TRY_RESULT(getSpaceRequired(attrib, binding, count, instances), spaceRequired);
// Protect against integer overflow
angle::CheckedNumeric<unsigned int> checkedPosition(mWritePosition);
checkedPosition += spaceRequired;
if (!checkedPosition.IsValid())
{
return gl::OutOfMemory()
<< "Internal error, new vertex buffer write position would overflow.";
}
ANGLE_TRY(reserveSpace(mReservedSpace));
mReservedSpace = 0;
ANGLE_TRY(mVertexBuffer->storeVertexAttributes(attrib, binding, currentValueType, start, count,
instances, mWritePosition, sourceData));
if (outStreamOffset)
{
*outStreamOffset = mWritePosition;
}
mWritePosition += spaceRequired;
return gl::NoError();
}
gl::Error StreamingVertexBufferInterface::reserveVertexSpace(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
GLsizei count,
GLsizei instances)
{
unsigned int requiredSpace = 0;
ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, count, instances),
requiredSpace);
// Align to 16-byte boundary
auto alignedRequiredSpace = rx::CheckedRoundUp(requiredSpace, 16u);
alignedRequiredSpace += mReservedSpace;
// Protect against integer overflow
if (!alignedRequiredSpace.IsValid())
{
return gl::OutOfMemory()
<< "Unable to reserve " << requiredSpace
<< " extra bytes in internal vertex buffer, it would result in an overflow.";
}
mReservedSpace = alignedRequiredSpace.ValueOrDie();
return gl::NoError();
}
// StaticVertexBufferInterface Implementation
StaticVertexBufferInterface::AttributeSignature::AttributeSignature()
: type(GL_NONE), size(0), stride(0), normalized(false), pureInteger(false), offset(0)
{
}
bool StaticVertexBufferInterface::AttributeSignature::matchesAttribute(
const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding) const
{
size_t attribStride = ComputeVertexAttributeStride(attrib, binding);
if (type != attrib.type || size != attrib.size || static_cast<GLuint>(stride) != attribStride ||
normalized != attrib.normalized || pureInteger != attrib.pureInteger)
{
return false;
}
size_t attribOffset =
(static_cast<size_t>(ComputeVertexAttributeOffset(attrib, binding)) % attribStride);
return (offset == attribOffset);
}
void StaticVertexBufferInterface::AttributeSignature::set(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding)
{
type = attrib.type;
size = attrib.size;
normalized = attrib.normalized;
pureInteger = attrib.pureInteger;
offset = stride = static_cast<GLuint>(ComputeVertexAttributeStride(attrib, binding));
offset = static_cast<size_t>(ComputeVertexAttributeOffset(attrib, binding)) %
ComputeVertexAttributeStride(attrib, binding);
}
StaticVertexBufferInterface::StaticVertexBufferInterface(BufferFactoryD3D *factory)
: VertexBufferInterface(factory, false)
{
}
StaticVertexBufferInterface::~StaticVertexBufferInterface()
{
}
bool StaticVertexBufferInterface::matchesAttribute(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding) const
{
return mSignature.matchesAttribute(attrib, binding);
}
void StaticVertexBufferInterface::setAttribute(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding)
{
return mSignature.set(attrib, binding);
}
gl::Error StaticVertexBufferInterface::storeStaticAttribute(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
GLint start,
GLsizei count,
GLsizei instances,
const uint8_t *sourceData)
{
unsigned int spaceRequired = 0;
ANGLE_TRY_RESULT(getSpaceRequired(attrib, binding, count, instances), spaceRequired);
ANGLE_TRY(setBufferSize(spaceRequired));
ASSERT(attrib.enabled);
ANGLE_TRY(mVertexBuffer->storeVertexAttributes(attrib, binding, GL_NONE, start, count,
instances, 0, sourceData));
mSignature.set(attrib, binding);
mVertexBuffer->hintUnmapResource();
return gl::NoError();
}
} // namespace rx