LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge newest 12.0 commits

Browse Source
This commit is contained in:
niki
2022-06-11 01:34:17 +02:00
parent 4c415479c0
commit 6c19e8c10a
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Buffer.cpp
+2 -1
View File
@@ -62,8 +62,9 @@ namespace love {
return mappedMemory;
}
void Buffer::fill(size_t offset, size_t size, const void *data) {
bool Buffer::fill(size_t offset, size_t size, const void *data) {
memcpy(mappedMemory, data, size);
return true;
}
void Buffer::unmap(size_t usedoffset, size_t usedsize) {
src/modules/graphics/vulkan/Buffer.h
+1 -1
View File
@@ -12,7 +12,7 @@ namespace love {
void* map(MapType map, size_t offset, size_t size) override;
void unmap(size_t usedoffset, size_t usedsize) override;
void fill(size_t offset, size_t size, const void* data) override;
bool fill(size_t offset, size_t size, const void* data) override;
void copyTo(love::graphics::Buffer* dest, size_t sourceoffset, size_t destoffset, size_t size) override;
ptrdiff_t getHandle() const override {
return (ptrdiff_t) buffer; // todo ?
src/modules/graphics/vulkan/Graphics.h
+3
View File
@@ -74,6 +74,9 @@ namespace love {
void draw(const DrawIndexedCommand& cmd) override;
void drawQuads(int start, int count, const VertexAttributes& attributes, const BufferBindings& buffers, graphics::Texture* texture) override { std::cout << "drawQuads "; }
GraphicsReadback* newReadbackInternal(ReadbackMethod method, love::graphics::Buffer* buffer, size_t offset, size_t size, data::ByteData* dest, size_t destoffset) override { return nullptr; };
GraphicsReadback* newReadbackInternal(ReadbackMethod method, love::graphics::Texture* texture, int slice, int mipmap, const Rect& rect, image::ImageData* dest, int destx, int desty) { return nullptr; }
VkCommandBuffer beginSingleTimeCommands();
void endSingleTimeCommands(VkCommandBuffer);
src/modules/graphics/vulkan/Texture.h
-1
View File
@@ -26,7 +26,6 @@ namespace love {
void uploadByteData(PixelFormat pixelformat, const void* data, size_t size, int level, int slice, const Rect& r) override;
void generateMipmapsInternal() override { std::cout << "Texture::generateMipmapsInternal "; };
void readbackImageData(love::image::ImageData* imagedata, int slice, int mipmap, const Rect& rect) override { std::cout << "Texture::readbackImageData "; };
int getMSAA() const override { std::cout << "Texture::getMSAA "; return 0; };
ptrdiff_t getHandle() const override { std::cout << "Texture::getHandle "; return (ptrdiff_t)textureImage; }