Skip to content

Commit

Permalink
fix(vma): VmaMemoryUsage enum values. Close #458
Browse files Browse the repository at this point in the history
  • Loading branch information
Spasi committed Apr 22, 2019
1 parent e722bcf commit bd33246
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
1 change: 1 addition & 0 deletions doc/notes/3.2.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ This build includes the following changes:
- nuklear: The `nk_text_edit`, `nk_text_undo_state` and `nk_text_undo_record` structs are now public.
- OpenCL: Array overloads of `EnqueueRead/Write` functions cannot be used to perform non-blocking reads/writes anymore.
- OpenGL: Added `GL_DRAW_INDIRECT_BUFFER` overloads to `NV_bindless_multi_draw_indirect` & `NV_bindless_multi_draw_indirect_count` extensions.
- vma: Fixed `VmaMemoryUsage` enumeration values. (#458)

#### Breaking Changes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1348,8 +1348,8 @@ public class Vma {
*/
public static final int
VMA_MEMORY_USAGE_UNKNOWN = 0,
VMA_MEMORY_USAGE_GPU_ONLY = 2,
VMA_MEMORY_USAGE_CPU_ONLY = 1,
VMA_MEMORY_USAGE_GPU_ONLY = 1,
VMA_MEMORY_USAGE_CPU_ONLY = 2,
VMA_MEMORY_USAGE_CPU_TO_GPU = 3,
VMA_MEMORY_USAGE_GPU_TO_CPU = 4;

Expand Down
12 changes: 4 additions & 8 deletions modules/lwjgl/vma/src/templates/kotlin/vma/templates/VMA.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1378,8 +1378,7 @@ vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequire
)}
Allocation may still end up in {@code HOST_VISIBLE} memory on some implementations. In such case, you are free to map it. You can use
#ALLOCATION_CREATE_MAPPED_BIT with this usage type.
""",
"2"
"""
),
"MEMORY_USAGE_CPU_ONLY".enum(
"""
Expand All @@ -1390,8 +1389,7 @@ vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequire
of {@code D3D12_HEAP_TYPE_UPLOAD}.
Usage: Staging copy of resources used as transfer source.
""",
"1"
"""
),
"MEMORY_USAGE_CPU_TO_GPU".enum(
"""
Expand All @@ -1401,8 +1399,7 @@ vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequire
Usage: Resources written frequently by host (dynamic), read by device. E.g. textures, vertex buffers, uniform buffers updated every frame or every
draw call.
""",
"3"
"""
),
"MEMORY_USAGE_GPU_TO_CPU".enum(
"""
Expand All @@ -1418,8 +1415,7 @@ vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequire
detection.
"""
)}
""",
"4"
"""
)
)

Expand Down

0 comments on commit bd33246

Please sign in to comment.