1 files changed, 8 insertions, 6 deletions

diff --git a/src/dawn/engine_dawn.cc b/src/dawn/engine_dawn.cc
index 868e979..1666e4a 100644
--- a/src/dawn/engine_dawn.cc
+++ b/src/dawn/engine_dawn.cc
@@ -1328,6 +1328,10 @@ Result EngineDawn::DoDrawRect(const DrawRectCommand* command) {
   return result;
 }
 
+Result EngineDawn::DoDrawGrid(const DrawGridCommand* command) {
+  return Result("DRAW_GRID not implemented on Dawn");
+}
+
 Result EngineDawn::DoDrawArrays(const DrawArraysCommand* command) {
   Result result;
 
@@ -1616,7 +1620,7 @@ Result EngineDawn::AttachBuffersAndTextures(
   for (const auto& buf_info : render_pipeline->pipeline->GetBuffers()) {
     ::dawn::BufferUsage bufferUsage;
     ::dawn::BindingType bindingType;
-    switch (buf_info.buffer->GetBufferType()) {
+    switch (buf_info.type) {
       case BufferType::kStorage: {
         bufferUsage = ::dawn::BufferUsage::Storage;
         bindingType = ::dawn::BindingType::StorageBuffer;
@@ -1629,8 +1633,7 @@ Result EngineDawn::AttachBuffersAndTextures(
       }
       default: {
         return Result("AttachBuffersAndTextures: unknown buffer type: " +
-                      std::to_string(static_cast<uint32_t>(
-                          buf_info.buffer->GetBufferType())));
+                      std::to_string(static_cast<uint32_t>(buf_info.type)));
         break;
       }
     }
@@ -1716,7 +1719,7 @@ Result EngineDawn::AttachBuffers(ComputePipelineInfo* compute_pipeline) {
   for (const auto& buf_info : compute_pipeline->pipeline->GetBuffers()) {
     ::dawn::BufferUsage bufferUsage;
     ::dawn::BindingType bindingType;
-    switch (buf_info.buffer->GetBufferType()) {
+    switch (buf_info.type) {
       case BufferType::kStorage: {
         bufferUsage = ::dawn::BufferUsage::Storage;
         bindingType = ::dawn::BindingType::StorageBuffer;
@@ -1729,8 +1732,7 @@ Result EngineDawn::AttachBuffers(ComputePipelineInfo* compute_pipeline) {
       }
       default: {
         return Result("AttachBuffers: unknown buffer type: " +
-                      std::to_string(static_cast<uint32_t>(
-                          buf_info.buffer->GetBufferType())));
+                      std::to_string(static_cast<uint32_t>(buf_info.type)));
         break;
       }
     }