Branch
Hash :
25390156
Author :
Date :
2025-08-21T00:13:19
Suppress unsafe buffers on a file-by-file basis in src/ [1 of N] In this CL, we suppress many files but stop short of actually enabling the warning by not removing the line from the unsafe_buffers_paths.txt file. That will happen in a follow-on CL, along with resolving any stragglers missed here. This is mostly a manual change so as to familiarize myself with the kinds of issues faced by the Angle codebase when applying buffer safety warnings. -- Re-generate affected hashes. -- Clang-format applied to all changed files. -- Add a few missing .reserve() calls to vectors as noticed. -- Fix some mismatches between file names and header comments. -- Be more consistent with header comment format (blank lines and trailing //-only lines when a filename comment adjoins license boilerplate). Bug: b/436880895 Change-Id: I3bde5cc2059acbe8345057289214f1a26f1c34aa Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6869022 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@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
//
// Copyright 2019 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.
//
// MappedSubresourceVerifier11.cpp: Implements the
// rx::MappedSubresourceVerifier11 class, a simple wrapper to D3D11 Texture2D
// mapped memory so that ASAN and MSAN can catch memory errors done with a
// pointer to the mapped texture memory.
#ifdef UNSAFE_BUFFERS_BUILD
# pragma allow_unsafe_buffers
#endif
#include "libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
namespace rx
{
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || defined(ANGLE_ENABLE_ASSERTS)
namespace
{
# if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
constexpr bool kUseWrap = true;
# else
constexpr bool kUseWrap = false;
# endif
size_t getPitchCount(const D3D11_TEXTURE2D_DESC &desc)
{
const d3d11::DXGIFormatSize &dxgiFormatInfo = d3d11::GetDXGIFormatSizeInfo(desc.Format);
ASSERT(desc.Height % dxgiFormatInfo.blockHeight == 0);
return desc.Height / dxgiFormatInfo.blockHeight;
}
} // namespace
MappedSubresourceVerifier11::MappedSubresourceVerifier11() = default;
MappedSubresourceVerifier11::~MappedSubresourceVerifier11()
{
ASSERT(!mOrigData);
ASSERT(!mWrapData.size());
}
void MappedSubresourceVerifier11::setDesc(const D3D11_TEXTURE2D_DESC &desc)
{
ASSERT(desc.CPUAccessFlags & (D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE));
ASSERT(desc.Width);
ASSERT(desc.Height);
ASSERT(!mOrigData);
ASSERT(!mWrapData.size());
ASSERT(!mPitchType);
ASSERT(!mPitchCount);
mPitchType = &D3D11_MAPPED_SUBRESOURCE::RowPitch;
mPitchCount = getPitchCount(desc);
}
void MappedSubresourceVerifier11::setDesc(const D3D11_TEXTURE3D_DESC &desc)
{
ASSERT(desc.CPUAccessFlags & (D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE));
ASSERT(desc.Width);
ASSERT(desc.Height);
ASSERT(desc.Depth);
ASSERT(!mOrigData);
ASSERT(!mWrapData.size());
ASSERT(!mPitchType);
ASSERT(!mPitchCount);
mPitchType = &D3D11_MAPPED_SUBRESOURCE::DepthPitch;
mPitchCount = desc.Depth;
}
void MappedSubresourceVerifier11::reset()
{
ASSERT(!mOrigData);
ASSERT(!mWrapData.size());
mPitchType = nullptr;
mPitchCount = 0;
}
bool MappedSubresourceVerifier11::wrap(D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map)
{
ASSERT(map && map->pData);
ASSERT(mapType == D3D11_MAP_READ || mapType == D3D11_MAP_WRITE ||
mapType == D3D11_MAP_READ_WRITE);
ASSERT(mPitchCount);
if (kUseWrap)
{
if (!mWrapData.resize(mPitchCount * map->*mPitchType))
return false;
}
mOrigData = reinterpret_cast<uint8_t *>(map->pData);
if (kUseWrap)
{
std::copy(mOrigData, mOrigData + mWrapData.size(), mWrapData.data());
map->pData = mWrapData.data();
}
return true;
}
void MappedSubresourceVerifier11::unwrap()
{
ASSERT(mPitchCount);
ASSERT(mOrigData);
if (kUseWrap)
{
std::copy(mWrapData.data(), mWrapData.data() + mWrapData.size(), mOrigData);
mWrapData = angle::MemoryBuffer();
}
mOrigData = nullptr;
}
#endif
} // namespace rx