diff options
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer')
20 files changed, 80 insertions, 70 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp index 7769ab2b75e..3df7e4fcf86 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp @@ -160,10 +160,11 @@ void BufferD3D::invalidateStaticData(const gl::Context *context) } // Creates static buffers if sufficient used data has been left unmodified -void BufferD3D::promoteStaticUsage(const gl::Context *context, int dataSize) +void BufferD3D::promoteStaticUsage(const gl::Context *context, size_t dataSize) { if (mUsage == D3DBufferUsage::DYNAMIC) { + // Note: This is not a safe math operation. 'dataSize' can come from the app. mUnmodifiedDataUse += dataSize; if (mUnmodifiedDataUse > 3 * getSize()) diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h index 60153748e68..2f0ff48e06c 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h @@ -55,7 +55,7 @@ class BufferD3D : public BufferImpl virtual void initializeStaticData(const gl::Context *context); virtual void invalidateStaticData(const gl::Context *context); - void promoteStaticUsage(const gl::Context *context, int dataSize); + void promoteStaticUsage(const gl::Context *context, size_t dataSize); gl::Error getIndexRange(const gl::Context *context, GLenum type, @@ -80,7 +80,7 @@ class BufferD3D : public BufferImpl StaticIndexBufferInterface *mStaticIndexBuffer; unsigned int mStaticBufferCacheTotalSize; unsigned int mStaticVertexBufferOutOfDate; - unsigned int mUnmodifiedDataUse; + size_t mUnmodifiedDataUse; D3DBufferUsage mUsage; }; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h index 8428bed09cd..9cf3a8ed6db 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h @@ -92,7 +92,7 @@ class BufferFactoryD3D : angle::NonCopyable virtual gl::ErrorOrResult<unsigned int> getVertexSpaceRequired( const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const = 0; }; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp index 7c2d5aec705..ce1bbfcce78 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp @@ -92,7 +92,7 @@ gl::Error VertexBufferInterface::setBufferSize(unsigned int size) gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired( const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const { unsigned int spaceRequired = 0; @@ -155,7 +155,7 @@ gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::Vertex const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int *outStreamOffset, const uint8_t *sourceData) @@ -190,7 +190,7 @@ gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::Vertex gl::Error StreamingVertexBufferInterface::reserveVertexSpace(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) { unsigned int requiredSpace = 0; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h index df8085d3cbd..63cdc2359f3 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h @@ -45,7 +45,7 @@ class VertexBuffer : angle::NonCopyable const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int offset, const uint8_t *sourceData) = 0; @@ -93,7 +93,7 @@ class VertexBufferInterface : angle::NonCopyable gl::ErrorOrResult<unsigned int> getSpaceRequired(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const; BufferFactoryD3D *const mFactory; VertexBuffer *mVertexBuffer; @@ -110,14 +110,14 @@ class StreamingVertexBufferInterface : public VertexBufferInterface const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int *outStreamOffset, const uint8_t *sourceData); gl::Error reserveVertexSpace(const gl::VertexAttribute &attribute, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances); private: diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp index f20386bb14f..183c895b623 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp @@ -392,7 +392,7 @@ gl::Error VertexDataManager::storeDynamicAttribs( std::vector<TranslatedAttribute> *translatedAttribs, const gl::AttributesMask &dynamicAttribsMask, GLint start, - GLsizei count, + size_t count, GLsizei instances) { // Instantiating this class will ensure the streaming buffer is never left mapped. @@ -434,7 +434,7 @@ void VertexDataManager::PromoteDynamicAttribs( const gl::Context *context, const std::vector<TranslatedAttribute> &translatedAttribs, const gl::AttributesMask &dynamicAttribsMask, - GLsizei count) + size_t count) { for (auto attribIndex : dynamicAttribsMask) { @@ -445,16 +445,17 @@ void VertexDataManager::PromoteDynamicAttribs( gl::Buffer *buffer = binding.getBuffer().get(); if (buffer) { + // Note: this multiplication can overflow. It should not be a security problem. BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer); size_t typeSize = ComputeVertexAttributeTypeSize(*dynamicAttrib.attribute); - bufferD3D->promoteStaticUsage(context, count * static_cast<int>(typeSize)); + bufferD3D->promoteStaticUsage(context, count * typeSize); } } } gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &translatedAttrib, GLint start, - GLsizei count, + size_t count, GLsizei instances) const { ASSERT(translatedAttrib.attribute && translatedAttrib.binding); @@ -467,8 +468,8 @@ gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &tr BufferD3D *bufferD3D = buffer ? GetImplAs<BufferD3D>(buffer) : nullptr; ASSERT(!bufferD3D || bufferD3D->getStaticVertexBuffer(attrib, binding) == nullptr); - size_t totalCount = gl::ComputeVertexBindingElementCount( - binding.getDivisor(), static_cast<size_t>(count), static_cast<size_t>(instances)); + size_t totalCount = gl::ComputeVertexBindingElementCount(binding.getDivisor(), count, + static_cast<size_t>(instances)); // TODO(jiajia.qin@intel.com): force the index buffer to clamp any out of range indices instead // of invalid operation here. if (bufferD3D) @@ -486,15 +487,14 @@ gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &tr return gl::InvalidOperation() << "Vertex buffer is not big enough for the draw call."; } } - return mStreamingBuffer->reserveVertexSpace(attrib, binding, static_cast<GLsizei>(totalCount), - instances); + return mStreamingBuffer->reserveVertexSpace(attrib, binding, totalCount, instances); } gl::Error VertexDataManager::storeDynamicAttrib(const gl::Context *context, TranslatedAttribute *translated, GLint start, - GLsizei count, - GLsizei instances) + size_t count, + GLsizei instances) const { ASSERT(translated->attribute && translated->binding); const auto &attrib = *translated->attribute; @@ -529,8 +529,8 @@ gl::Error VertexDataManager::storeDynamicAttrib(const gl::Context *context, translated->storage = nullptr; ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, 1, 0), translated->stride); - size_t totalCount = gl::ComputeVertexBindingElementCount( - binding.getDivisor(), static_cast<size_t>(count), static_cast<size_t>(instances)); + size_t totalCount = gl::ComputeVertexBindingElementCount(binding.getDivisor(), count, + static_cast<size_t>(instances)); ANGLE_TRY(mStreamingBuffer->storeDynamicAttribute( attrib, binding, translated->currentValueType, firstVertexIndex, diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h index 694366deb70..2fb4fe6c468 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h @@ -105,14 +105,14 @@ class VertexDataManager : angle::NonCopyable std::vector<TranslatedAttribute> *translatedAttribs, const gl::AttributesMask &dynamicAttribsMask, GLint start, - GLsizei count, + size_t count, GLsizei instances); // Promote static usage of dynamic buffers. static void PromoteDynamicAttribs(const gl::Context *context, const std::vector<TranslatedAttribute> &translatedAttribs, const gl::AttributesMask &dynamicAttribsMask, - GLsizei count); + size_t count); gl::Error storeCurrentValue(const gl::VertexAttribCurrentValueData ¤tValue, TranslatedAttribute *translated, @@ -130,15 +130,15 @@ class VertexDataManager : angle::NonCopyable }; gl::Error reserveSpaceForAttrib(const TranslatedAttribute &translatedAttrib, - GLsizei count, GLint start, + size_t count, GLsizei instances) const; gl::Error storeDynamicAttrib(const gl::Context *context, TranslatedAttribute *translated, GLint start, - GLsizei count, - GLsizei instances); + size_t count, + GLsizei instances) const; BufferFactoryD3D *const mFactory; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp index 8dd5ad87ab8..f8f8865d087 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp @@ -246,11 +246,12 @@ gl::Error InputLayoutCache::createInputLayout( // As per the spec for ANGLE_instanced_arrays, not all attributes can be instanced // simultaneously, so a non-instanced element must exist. - GLsizei numIndicesPerInstance = 0; + UINT numIndicesPerInstance = 0; if (drawCallParams.instances() > 0) { // This requires that the index range is resolved. - numIndicesPerInstance = drawCallParams.vertexCount(); + // Note: Vertex indexes can be arbitrarily large. + numIndicesPerInstance = drawCallParams.getClampedVertexCount<UINT>(); } for (size_t elementIndex = 0; elementIndex < inputElementCount; ++elementIndex) diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index 0af996327c2..cd11543216a 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -1400,7 +1400,7 @@ void *Renderer11::getD3DDevice() gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallParams ¶ms) { - if (params.vertexCount() < mStateManager.getCurrentMinimumDrawCount()) + if (params.vertexCount() < static_cast<size_t>(mStateManager.getCurrentMinimumDrawCount())) { return gl::NoError(); } @@ -1416,6 +1416,9 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP GLsizei adjustedInstanceCount = GetAdjustedInstanceCount(program, params.instances()); ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program); + // Note: vertex indexes can be arbitrarily large. + UINT clampedVertexCount = params.getClampedVertexCount<UINT>(); + if (programD3D->usesGeometryShader(params.mode()) && glState.isTransformFeedbackActiveUnpaused()) { @@ -1427,11 +1430,11 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP if (adjustedInstanceCount > 0) { - mDeviceContext->DrawInstanced(params.vertexCount(), adjustedInstanceCount, 0, 0); + mDeviceContext->DrawInstanced(clampedVertexCount, adjustedInstanceCount, 0, 0); } else { - mDeviceContext->Draw(params.vertexCount(), 0); + mDeviceContext->Draw(clampedVertexCount, 0); } rx::ShaderExecutableD3D *pixelExe = nullptr; @@ -1455,24 +1458,24 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP if (adjustedInstanceCount > 0) { - mDeviceContext->DrawInstanced(params.vertexCount(), adjustedInstanceCount, 0, 0); + mDeviceContext->DrawInstanced(clampedVertexCount, adjustedInstanceCount, 0, 0); } else { - mDeviceContext->Draw(params.vertexCount(), 0); + mDeviceContext->Draw(clampedVertexCount, 0); } return gl::NoError(); } if (params.mode() == GL_LINE_LOOP) { - return drawLineLoop(context, params.vertexCount(), GL_NONE, nullptr, 0, + return drawLineLoop(context, clampedVertexCount, GL_NONE, nullptr, 0, adjustedInstanceCount); } if (params.mode() == GL_TRIANGLE_FAN) { - return drawTriangleFan(context, params.vertexCount(), GL_NONE, nullptr, 0, + return drawTriangleFan(context, clampedVertexCount, GL_NONE, nullptr, 0, adjustedInstanceCount); } @@ -1483,11 +1486,11 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP { if (adjustedInstanceCount == 0) { - mDeviceContext->Draw(params.vertexCount(), 0); + mDeviceContext->Draw(clampedVertexCount, 0); } else { - mDeviceContext->DrawInstanced(params.vertexCount(), adjustedInstanceCount, 0, 0); + mDeviceContext->DrawInstanced(clampedVertexCount, adjustedInstanceCount, 0, 0); } return gl::NoError(); } @@ -1500,7 +1503,7 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP // D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST and DrawIndexedInstanced is called instead. if (adjustedInstanceCount == 0) { - mDeviceContext->DrawIndexedInstanced(6, params.vertexCount(), 0, 0, 0); + mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0); return gl::NoError(); } @@ -1513,7 +1516,7 @@ gl::Error Renderer11::drawArrays(const gl::Context *context, const gl::DrawCallP { ANGLE_TRY( mStateManager.updateVertexOffsetsForPointSpritesEmulation(params.baseVertex(), i)); - mDeviceContext->DrawIndexedInstanced(6, params.vertexCount(), 0, 0, 0); + mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0); } // This required by updateVertexOffsets... above but is outside of the loop for speed. @@ -1592,13 +1595,13 @@ gl::Error Renderer11::drawElements(const gl::Context *context, const gl::DrawCal // efficent code path. Instanced rendering of emulated pointsprites requires a loop to draw each // batch of points. An offset into the instanced data buffer is calculated and applied on each // iteration to ensure all instances are rendered correctly. - GLsizei elementsToRender = params.vertexCount(); + UINT clampedVertexCount = params.getClampedVertexCount<UINT>(); // Each instance being rendered requires the inputlayout cache to reapply buffers and offsets. for (GLsizei i = 0; i < params.instances(); i++) { ANGLE_TRY(mStateManager.updateVertexOffsetsForPointSpritesEmulation(startVertex, i)); - mDeviceContext->DrawIndexedInstanced(6, elementsToRender, 0, 0, 0); + mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0); } mStateManager.invalidateVertexBuffer(); return gl::NoError(); @@ -1650,7 +1653,7 @@ gl::Error Renderer11::drawElementsIndirect(const gl::Context *context, } gl::Error Renderer11::drawLineLoop(const gl::Context *context, - GLsizei count, + GLuint count, GLenum type, const void *indexPointer, int baseVertex, @@ -1687,8 +1690,6 @@ gl::Error Renderer11::drawLineLoop(const gl::Context *context, } // Checked by Renderer11::applyPrimitiveType - ASSERT(count >= 0); - if (static_cast<unsigned int>(count) + 1 > (std::numeric_limits<unsigned int>::max() / sizeof(unsigned int))) { @@ -1734,7 +1735,7 @@ gl::Error Renderer11::drawLineLoop(const gl::Context *context, } gl::Error Renderer11::drawTriangleFan(const gl::Context *context, - GLsizei count, + GLuint count, GLenum type, const void *indices, int baseVertex, @@ -3598,7 +3599,7 @@ GLenum Renderer11::getVertexComponentType(gl::VertexFormatType vertexFormatType) gl::ErrorOrResult<unsigned int> Renderer11::getVertexSpaceRequired( const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const { if (!attrib.enabled) @@ -3610,7 +3611,8 @@ gl::ErrorOrResult<unsigned int> Renderer11::getVertexSpaceRequired( const unsigned int divisor = binding.getDivisor(); if (instances == 0 || divisor == 0) { - elementCount = count; + // This could be a clipped cast. + elementCount = gl::clampCast<unsigned int>(count); } else { diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h index d1b8bfd13fb..48623ce17b5 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h @@ -343,7 +343,7 @@ class Renderer11 : public RendererD3D // function. gl::ErrorOrResult<unsigned int> getVertexSpaceRequired(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const override; gl::Error readFromAttachment(const gl::Context *context, @@ -461,13 +461,13 @@ class Renderer11 : public RendererD3D angle::WorkaroundsD3D generateWorkarounds() const override; gl::Error drawLineLoop(const gl::Context *context, - GLsizei count, + GLuint count, GLenum type, const void *indices, int baseVertex, int instances); gl::Error drawTriangleFan(const gl::Context *context, - GLsizei count, + GLuint count, GLenum type, const void *indices, int baseVertex, diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp index 69e598784cb..3649cbe1f28 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp @@ -96,7 +96,7 @@ gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attri const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int offset, const uint8_t *sourceData) diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h index ab619ae5030..7778c31dcd7 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h @@ -31,7 +31,7 @@ class VertexBuffer11 : public VertexBuffer const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int offset, const uint8_t *sourceData) override; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp index 01341fec67e..c2b83d1f1d8 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp @@ -2998,7 +2998,7 @@ GLenum Renderer9::getVertexComponentType(gl::VertexFormatType vertexFormatType) gl::ErrorOrResult<unsigned int> Renderer9::getVertexSpaceRequired(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const { if (!attrib.enabled) diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h index 239bfd0800b..0d5f450da19 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h @@ -346,7 +346,7 @@ class Renderer9 : public RendererD3D // function. gl::ErrorOrResult<unsigned int> getVertexSpaceRequired(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding, - GLsizei count, + size_t count, GLsizei instances) const override; gl::Error copyToRenderTarget(IDirect3DSurface9 *dest, diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp index c0b80a847c3..51af37aae86 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp @@ -61,7 +61,7 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int offset, const uint8_t *sourceData) @@ -71,8 +71,8 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib return gl::OutOfMemory() << "Internal vertex buffer is not initialized."; } - int inputStride = static_cast<int>(gl::ComputeVertexAttributeStride(attrib, binding)); - int elementSize = static_cast<int>(gl::ComputeVertexAttributeTypeSize(attrib)); + size_t inputStride = gl::ComputeVertexAttributeStride(attrib, binding); + size_t elementSize = gl::ComputeVertexAttributeTypeSize(attrib); DWORD lockFlags = mDynamicUsage ? D3DLOCK_NOOVERWRITE : 0; @@ -105,7 +105,7 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib if (!needsConversion && inputStride == elementSize) { - size_t copySize = static_cast<size_t>(count) * static_cast<size_t>(inputStride); + size_t copySize = count * inputStride; memcpy(mapPtr, input, copySize); } else diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h index 983616f4e40..90defb31709 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h @@ -28,7 +28,7 @@ class VertexBuffer9 : public VertexBuffer const gl::VertexBinding &binding, GLenum currentValueType, GLint start, - GLsizei count, + size_t count, GLsizei instances, unsigned int offset, const uint8_t *sourceData) override; diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp index aa573fea3e3..9e6da43d370 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp @@ -343,15 +343,17 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context, ANGLE_TRY(onDraw(context, renderer, drawCallParams, drawNode, newCommandBuffer)); + // Note: Vertex indexes can be arbitrarily large. + uint32_t clampedVertexCount = drawCallParams.getClampedVertexCount<uint32_t>(); + if (drawCallParams.mode() != GL_LINE_LOOP) { - commandBuffer->draw(drawCallParams.vertexCount(), 1, drawCallParams.firstVertex(), 0); + commandBuffer->draw(clampedVertexCount, 1, drawCallParams.firstVertex(), 0); return gl::NoError(); } // Handle GL_LINE_LOOP drawArrays. - // This test may be incorrect if the draw call switches from DrawArrays/DrawElements. - int lastVertex = drawCallParams.firstVertex() + drawCallParams.vertexCount(); + size_t lastVertex = static_cast<size_t>(drawCallParams.firstVertex() + clampedVertexCount); if (!mLineLoopBufferFirstIndex.valid() || !mLineLoopBufferLastIndex.valid() || mLineLoopBufferFirstIndex != drawCallParams.firstVertex() || mLineLoopBufferLastIndex != lastVertex) @@ -367,7 +369,7 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context, commandBuffer->bindIndexBuffer(mCurrentElementArrayBufferHandle, mCurrentElementArrayBufferOffset, VK_INDEX_TYPE_UINT32); - vk::LineLoopHelper::Draw(drawCallParams.vertexCount(), commandBuffer); + vk::LineLoopHelper::Draw(clampedVertexCount, commandBuffer); return gl::NoError(); } diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h index fe26f730aa8..92a89a74013 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h @@ -120,8 +120,8 @@ class VertexArrayVk : public VertexArrayImpl vk::DynamicBuffer mDynamicIndexData; vk::LineLoopHelper mLineLoopHelper; - Optional<int> mLineLoopBufferFirstIndex; - Optional<int> mLineLoopBufferLastIndex; + Optional<GLint> mLineLoopBufferFirstIndex; + Optional<size_t> mLineLoopBufferLastIndex; bool mDirtyLineLoopTranslation; // Cache variable for determining whether or not to store new dependencies in the node. diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp index 98774fdf1f0..a7ed151dc64 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp @@ -321,8 +321,11 @@ gl::Error LineLoopHelper::getIndexBufferForDrawArrays(RendererVk *renderer, &offset, nullptr)); *offsetOut = static_cast<VkDeviceSize>(offset); + uint32_t clampedVertexCount = drawCallParams.getClampedVertexCount<uint32_t>(); + + // Note: there could be an overflow in this addition. uint32_t unsignedFirstVertex = static_cast<uint32_t>(drawCallParams.firstVertex()); - uint32_t vertexCount = (drawCallParams.vertexCount() + unsignedFirstVertex); + uint32_t vertexCount = (clampedVertexCount + unsignedFirstVertex); for (uint32_t vertexIndex = unsignedFirstVertex; vertexIndex < vertexCount; vertexIndex++) { *indices++ = vertexIndex; @@ -378,9 +381,10 @@ void LineLoopHelper::destroy(VkDevice device) } // static -void LineLoopHelper::Draw(int count, CommandBuffer *commandBuffer) +void LineLoopHelper::Draw(uint32_t count, CommandBuffer *commandBuffer) { // Our first index is always 0 because that's how we set it up in createIndexBuffer*. + // Note: this could theoretically overflow and wrap to zero. commandBuffer->drawIndexed(count + 1, 1, 0, 0, 0); } diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h index 237c85c729c..dfdfe2efed1 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h @@ -130,7 +130,7 @@ class LineLoopHelper final : public vk::CommandGraphResource VkDeviceSize *bufferOffsetOut); void destroy(VkDevice device); - static void Draw(int count, CommandBuffer *commandBuffer); + static void Draw(uint32_t count, CommandBuffer *commandBuffer); private: DynamicBuffer mDynamicIndexBuffer; |