OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "GrVkBuffer.h" | 8 #include "GrVkBuffer.h" |
9 #include "GrVkGpu.h" | 9 #include "GrVkGpu.h" |
10 #include "GrVkMemory.h" | 10 #include "GrVkMemory.h" |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
146 } | 146 } |
147 | 147 |
148 void GrVkBuffer::vkUnmap(GrVkGpu* gpu) { | 148 void GrVkBuffer::vkUnmap(GrVkGpu* gpu) { |
149 VALIDATE(); | 149 VALIDATE(); |
150 SkASSERT(this->vkIsMapped()); | 150 SkASSERT(this->vkIsMapped()); |
151 | 151 |
152 if (fDesc.fDynamic) { | 152 if (fDesc.fDynamic) { |
153 VK_CALL(gpu, UnmapMemory(gpu->device(), this->alloc().fMemory)); | 153 VK_CALL(gpu, UnmapMemory(gpu->device(), this->alloc().fMemory)); |
154 } else { | 154 } else { |
155 gpu->updateBuffer(this, fMapPtr, this->size()); | 155 gpu->updateBuffer(this, fMapPtr, this->size()); |
156 delete fMapPtr; | 156 delete (unsigned char*) fMapPtr; |
egdaniel
2016/07/07 02:58:08
should this be using delete[]?
| |
157 } | 157 } |
158 | 158 |
159 fMapPtr = nullptr; | 159 fMapPtr = nullptr; |
160 } | 160 } |
161 | 161 |
162 bool GrVkBuffer::vkIsMapped() const { | 162 bool GrVkBuffer::vkIsMapped() const { |
163 VALIDATE(); | 163 VALIDATE(); |
164 return SkToBool(fMapPtr); | 164 return SkToBool(fMapPtr); |
165 } | 165 } |
166 | 166 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
199 VK_CALL(gpu, UnmapMemory(gpu->device(), alloc.fMemory)); | 199 VK_CALL(gpu, UnmapMemory(gpu->device(), alloc.fMemory)); |
200 | 200 |
201 return true; | 201 return true; |
202 } | 202 } |
203 | 203 |
204 void GrVkBuffer::validate() const { | 204 void GrVkBuffer::validate() const { |
205 SkASSERT(!fResource || kVertex_Type == fDesc.fType || kIndex_Type == fDesc.f Type | 205 SkASSERT(!fResource || kVertex_Type == fDesc.fType || kIndex_Type == fDesc.f Type |
206 || kCopyRead_Type == fDesc.fType || kCopyWrite_Type == fDesc.fType | 206 || kCopyRead_Type == fDesc.fType || kCopyWrite_Type == fDesc.fType |
207 || kUniform_Type == fDesc.fType); | 207 || kUniform_Type == fDesc.fType); |
208 } | 208 } |
OLD | NEW |