encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-23 06:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use whole size of buffer if binding buffer size is UINT64_MAX

Browse Source 
Following WebGPU spec change at https://github.com/gpuweb/gpuweb/issues/331,
bind groups in Dawn now use the whole size of the buffer if binding buffer
size is UINT64_MAX.

Bug: dawn:22
Change-Id: If28d905e634432755dad5c67c69eadedcee53dfe
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8863
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
This commit is contained in:
François Beaufort 2019-07-17 08:54:19 +00:00 committed by Commit Bot service account
parent 56a21a6151
commit 0326b8012b
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generator/templates/api.h
View File

@ -21,6 +21,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
const uint64_t DAWN_WHOLE_SIZE = 0xffffffffffffffffULL; // UINT64_MAX
{% for type in by_category["object"] %} {% for type in by_category["object"] %}
typedef struct {{as_cType(type.name)}}Impl* {{as_cType(type.name)}}; typedef struct {{as_cType(type.name)}}Impl* {{as_cType(type.name)}};
{% endfor %} {% endfor %}

2
generator/templates/apicpp.h
View File

@ -21,6 +21,8 @@
namespace dawn { namespace dawn {
static constexpr uint64_t kWholeSize = DAWN_WHOLE_SIZE;
{% for type in by_category["enum"] %} {% for type in by_category["enum"] %}
enum class {{as_cppType(type.name)}} : uint32_t { enum class {{as_cppType(type.name)}} : uint32_t {
{% for value in type.values %} {% for value in type.values %}

11
src/dawn_native/BindGroup.cpp
View File

@ -38,13 +38,14 @@ namespace dawn_native {
DAWN_TRY(device->ValidateObject(binding.buffer)); DAWN_TRY(device->ValidateObject(binding.buffer));
uint64_t bufferSize = binding.buffer->GetSize(); uint64_t bufferSize = binding.buffer->GetSize();
if (binding.size > bufferSize) { uint64_t bindingSize = (binding.size == dawn::kWholeSize) ? bufferSize : binding.size;
if (bindingSize > bufferSize) {
return DAWN_VALIDATION_ERROR("Buffer binding size larger than the buffer"); return DAWN_VALIDATION_ERROR("Buffer binding size larger than the buffer");
} }
// Note that no overflow can happen because we already checked that // Note that no overflow can happen because we already checked that
// bufferSize >= binding.size // bufferSize >= bindingSize
if (binding.offset > bufferSize - binding.size) { if (binding.offset > bufferSize - bindingSize) {
return DAWN_VALIDATION_ERROR("Buffer binding doesn't fit in the buffer"); return DAWN_VALIDATION_ERROR("Buffer binding doesn't fit in the buffer");
} }
@ -172,7 +173,9 @@ namespace dawn_native {
ASSERT(mBindings[bindingIndex].Get() == nullptr); ASSERT(mBindings[bindingIndex].Get() == nullptr);
mBindings[bindingIndex] = binding.buffer; mBindings[bindingIndex] = binding.buffer;
mOffsets[bindingIndex] = binding.offset; mOffsets[bindingIndex] = binding.offset;
mSizes[bindingIndex] = binding.size; uint64_t bufferSize =
(binding.size == dawn::kWholeSize) ? binding.buffer->GetSize() : binding.size;
mSizes[bindingIndex] = bufferSize;
continue; continue;
} }

2
src/tests/unittests/validation/BindGroupValidationTests.cpp
View File

@ -370,6 +370,7 @@ TEST_F(BindGroupValidationTest, BufferBindingOOB) {
// Success case, touching the full buffer works // Success case, touching the full buffer works
utils::MakeBindGroup(device, layout, {{0, buffer, 0, 1024}}); utils::MakeBindGroup(device, layout, {{0, buffer, 0, 1024}});
utils::MakeBindGroup(device, layout, {{0, buffer, 0, dawn::kWholeSize}});
// Error case, offset is OOB // Error case, offset is OOB
ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 256*5, 0}})); ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 256*5, 0}}));
@ -379,6 +380,7 @@ TEST_F(BindGroupValidationTest, BufferBindingOOB) {
// Error case, offset+size is OOB // Error case, offset+size is OOB
ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 1024, 1}})); ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 1024, 1}}));
ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 1, dawn::kWholeSize}}));
// Error case, offset+size overflows to be 0 // Error case, offset+size overflows to be 0
ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 256, uint32_t(0) - uint32_t(256)}})); ASSERT_DEVICE_ERROR(utils::MakeBindGroup(device, layout, {{0, buffer, 256, uint32_t(0) - uint32_t(256)}}));