Hash :
31c13df5
Author :
Date :
2022-05-30T15:06:26
Revert "Initialize buffer contents separately from BufferImpl::setData" This reverts commit 34cff1a14b635c76a9063b8710e948d04ef98a79. Reason for revert: Speculative revert for Mac M1 WebGL failures. Bug: chromium:1330314 Original change's description: > Initialize buffer contents separately from BufferImpl::setData > > Some backends can initialize buffer data faster than allocating a > zero-filled scratch buffer (GL can map and memset for example). > Allow those backends the opportunity to make these optimizations. > > Verified that GL, D3D and VK backends do not regress by using a > separate set data call. > > Bug: chromium:983167 > Change-Id: Ibcbe6016059434dc36ab3c754df6a24f0a6e5e72 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3039778 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Peng Huang <penghuang@chromium.org> > Commit-Queue: Geoff Lang <geofflang@chromium.org> Bug: chromium:983167 Change-Id: Id1bfa76b832c35fd0b3ade04da16735aa089fdd2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3677335 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Peng Huang <penghuang@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
//
// Copyright 2016 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.
//
// BufferNULL.cpp:
// Implements the class methods for BufferNULL.
//
#include "libANGLE/renderer/null/BufferNULL.h"
#include "common/debug.h"
#include "common/utilities.h"
#include "libANGLE/Context.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/renderer/null/ContextNULL.h"
namespace rx
{
BufferNULL::BufferNULL(const gl::BufferState &state, AllocationTrackerNULL *allocationTracker)
: BufferImpl(state), mAllocationTracker(allocationTracker)
{
ASSERT(mAllocationTracker != nullptr);
}
BufferNULL::~BufferNULL()
{
bool memoryReleaseResult = mAllocationTracker->updateMemoryAllocation(mData.size(), 0);
ASSERT(memoryReleaseResult);
}
angle::Result BufferNULL::setDataWithUsageFlags(const gl::Context *context,
gl::BufferBinding target,
GLeglClientBufferEXT clientBuffer,
const void *data,
size_t size,
gl::BufferUsage usage,
GLbitfield flags)
{
ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextNULL>(context),
mAllocationTracker->updateMemoryAllocation(mData.size(), size));
mData.resize(size, 0);
if (size > 0 && data != nullptr)
{
memcpy(mData.data(), data, size);
}
return angle::Result::Continue;
}
angle::Result BufferNULL::setData(const gl::Context *context,
gl::BufferBinding target,
const void *data,
size_t size,
gl::BufferUsage usage)
{
ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextNULL>(context),
mAllocationTracker->updateMemoryAllocation(mData.size(), size));
mData.resize(size, 0);
if (size > 0 && data != nullptr)
{
memcpy(mData.data(), data, size);
}
return angle::Result::Continue;
}
angle::Result BufferNULL::setSubData(const gl::Context *context,
gl::BufferBinding target,
const void *data,
size_t size,
size_t offset)
{
if (size > 0)
{
memcpy(mData.data() + offset, data, size);
}
return angle::Result::Continue;
}
angle::Result BufferNULL::copySubData(const gl::Context *context,
BufferImpl *source,
GLintptr sourceOffset,
GLintptr destOffset,
GLsizeiptr size)
{
BufferNULL *sourceNULL = GetAs<BufferNULL>(source);
if (size > 0)
{
memcpy(mData.data() + destOffset, sourceNULL->mData.data() + sourceOffset, size);
}
return angle::Result::Continue;
}
angle::Result BufferNULL::map(const gl::Context *context, GLenum access, void **mapPtr)
{
*mapPtr = mData.data();
return angle::Result::Continue;
}
angle::Result BufferNULL::mapRange(const gl::Context *context,
size_t offset,
size_t length,
GLbitfield access,
void **mapPtr)
{
*mapPtr = mData.data() + offset;
return angle::Result::Continue;
}
angle::Result BufferNULL::unmap(const gl::Context *context, GLboolean *result)
{
*result = GL_TRUE;
return angle::Result::Continue;
}
angle::Result BufferNULL::getIndexRange(const gl::Context *context,
gl::DrawElementsType type,
size_t offset,
size_t count,
bool primitiveRestartEnabled,
gl::IndexRange *outRange)
{
*outRange = gl::ComputeIndexRange(type, mData.data() + offset, count, primitiveRestartEnabled);
return angle::Result::Continue;
}
uint8_t *BufferNULL::getDataPtr()
{
return mData.data();
}
const uint8_t *BufferNULL::getDataPtr() const
{
return mData.data();
}
} // namespace rx