diff --git a/dom/canvas/WebGLQueueParamTraits.h b/dom/canvas/WebGLQueueParamTraits.h index 31d98bb52004..bffa9aa10635 100644 --- a/dom/canvas/WebGLQueueParamTraits.h +++ b/dom/canvas/WebGLQueueParamTraits.h @@ -113,40 +113,6 @@ USE_IS_ENUM_CASE(webgl::ProvokingVertex) // --------------------------------------------------------------------- // Custom QueueParamTraits -template -struct QueueParamTraits> { - template - static bool Write(ProducerView& view, const RawBuffer& in) { - const auto& elemCount = in.size(); - auto status = view.WriteParam(elemCount); - if (!status) return status; - - if (!elemCount) return status; - status = view.WriteFromRange(in.Data()); - - return status; - } - - template - static bool Read(ConsumerView& view, RawBuffer* const out) { - size_t elemCount = 0; - auto status = view.ReadParam(&elemCount); - if (!status) return status; - - if (!elemCount) { - *out = {}; - return true; - } - - auto data = view.template ReadRange(elemCount); - if (!data) return false; - *out = std::move(RawBuffer{*data}); - return true; - } -}; - -// - - template struct QueueParamTraits> { template diff --git a/dom/canvas/WebGLTypes.h b/dom/canvas/WebGLTypes.h index cecb1839c93a..6fc82a82ca6e 100644 --- a/dom/canvas/WebGLTypes.h +++ b/dom/canvas/WebGLTypes.h @@ -854,47 +854,6 @@ struct VertAttribPointerCalculated final { } // namespace webgl -// TODO: s/RawBuffer/Span/ -template -class RawBuffer final { - const T* mBegin = nullptr; - size_t mLen = 0; - - public: - using ElementType = T; - - explicit RawBuffer(const Range& data) - : mBegin(data.begin().get()), mLen(data.length()) { - if (mLen) { - MOZ_ASSERT(mBegin); - } - } - - ~RawBuffer() = default; - - Range Data() const { return {begin(), mLen}; } - const auto& begin() const { - if (mLen) { - MOZ_RELEASE_ASSERT(mBegin); - } - return mBegin; - } - const auto& size() const { return mLen; } - - void Shrink(const size_t newLen) { - if (mLen <= newLen) return; - mLen = newLen; - } - - RawBuffer() = default; - - RawBuffer(const RawBuffer&) = delete; - RawBuffer& operator=(const RawBuffer&) = delete; - - RawBuffer(RawBuffer&&) = default; - RawBuffer& operator=(RawBuffer&&) = default; -}; - template inline Range ShmemRange(const mozilla::ipc::Shmem& shmem) { return {shmem.get(), shmem.Size()}; @@ -1135,11 +1094,6 @@ inline Range MakeRange(const dom::Sequence& seq) { return {seq.Elements(), seq.Length()}; } -template -inline Range MakeRange(const RawBuffer& from) { - return from.Data(); -} - // - constexpr auto kUniversalAlignment = alignof(std::max_align_t); @@ -1160,13 +1114,6 @@ inline size_t ByteSize(const Range& range) { // - -template -RawBuffer RawBufferView(const Range& range) { - return RawBuffer{range}; -} - -// - - Maybe CheckBindBufferRange( const GLenum target, const GLuint index, const bool isBuffer, const uint64_t offset, const uint64_t size, const webgl::Limits& limits);