From b0232a4a6bb0bdcfc2f995f4cd62fa15b9741ce9 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 12 Jan 2020 16:41:23 -0400 Subject: [PATCH 01/54] Initial work on unified graphics buffers representing different types of data. --- src/modules/graphics/Buffer.cpp | 35 ++++++- src/modules/graphics/Buffer.h | 114 ++++++++++++++++++----- src/modules/graphics/Graphics.cpp | 2 +- src/modules/graphics/Graphics.h | 5 +- src/modules/graphics/Mesh.cpp | 8 +- src/modules/graphics/ParticleSystem.cpp | 2 +- src/modules/graphics/SpriteBatch.cpp | 4 +- src/modules/graphics/Text.cpp | 2 +- src/modules/graphics/opengl/Buffer.cpp | 101 +++++++++++--------- src/modules/graphics/opengl/Buffer.h | 9 +- src/modules/graphics/opengl/Graphics.cpp | 10 +- src/modules/graphics/opengl/Graphics.h | 3 +- src/modules/graphics/opengl/OpenGL.cpp | 4 + src/modules/graphics/vertex.h | 12 ++- 14 files changed, 219 insertions(+), 92 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index f67e46d54..11df52b0e 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -19,21 +19,48 @@ **/ #include "Buffer.h" +#include "Graphics.h" namespace love { namespace graphics { -Buffer::Buffer(size_t size, BufferType type, vertex::Usage usage, uint32 mapflags) +Buffer::Buffer(size_t size, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) : size(size) - , type(type) + , typeFlags(typeflags) , usage(usage) - , map_flags(mapflags) - , is_mapped(false) + , mapFlags(mapflags) + , mapped(false) { } +Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength) + : Buffer(0, settings.typeFlags, settings.usage, settings.mapFlags) +{ + bool uniformbuffer = settings.typeFlags & BUFFERFLAG_UNIFORM; + bool indexbuffer = settings.typeFlags & BUFFERFLAG_INDEX; + bool vertexbuffer = settings.typeFlags & BUFFERFLAG_VERTEX; + bool ssbuffer = settings.typeFlags & BUFFERFLAG_SHADER_STORAGE; + + if (indexbuffer && format.size() > 1) + throw love::Exception("test"); + + for (const auto &member : format) + { + if (indexbuffer) + { + if (member.type != DATA_UINT16 && member.type != DATA_UINT32) + throw love::Exception("test"); + } + + if (uniformbuffer) + { + + } + } +} + Buffer::~Buffer() { } diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 8d6df1932..8c26bb456 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -28,12 +28,16 @@ // C #include +#include +#include namespace love { namespace graphics { +class Graphics; + /** * A block of GPU-owned memory. Currently meant for internal use. **/ @@ -47,16 +51,90 @@ public: MAP_READ = (1 << 1), }; - Buffer(size_t size, BufferType type, vertex::Usage usage, uint32 mapflags); + enum DataType + { + DATA_FLOAT, + DATA_FLOAT_VEC2, + DATA_FLOAT_VEC3, + DATA_FLOAT_VEC4, + + DATA_FLOAT_MAT2X2, + DATA_FLOAT_MAT2X3, + DATA_FLOAT_MAT2X4, + + DATA_FLOAT_MAT3X2, + DATA_FLOAT_MAT3X3, + DATA_FLOAT_MAT3X4, + + DATA_FLOAT_MAT4X2, + DATA_FLOAT_MAT4X3, + DATA_FLOAT_MAT4X4, + + DATA_INT32, + DATA_INT32_VEC2, + DATA_INT32_VEC3, + DATA_INT32_VEC4, + + DATA_UINT32, + DATA_UINT32_VEC2, + DATA_UINT32_VEC3, + DATA_UINT32_VEC4, + + DATA_SNORM8_VEC4, + + DATA_UNORM8_VEC4, + + DATA_INT8_VEC4, + + DATA_UINT8_VEC4, + + DATA_SNORM16, + DATA_SNORM16_VEC2, + DATA_SNORM16_VEC4, + + DATA_UNORM16, + DATA_UNORM16_VEC2, + DATA_UNORM16_VEC4, + + DATA_INT16, + DATA_INT16_VEC2, + DATA_INT16_VEC4, + + DATA_UINT16, + DATA_UINT16_VEC2, + DATA_UINT16_VEC4, + + DATA_BOOL, + DATA_BOOL_VEC2, + DATA_BOOL_VEC3, + DATA_BOOL_VEC4, + + DATA_MAX_ENUM + }; + + struct DataMember + { + std::string name; + DataType type; + int arraySize; + }; + + struct Settings + { + BufferTypeFlags typeFlags; + MapFlags mapFlags; + vertex::Usage usage; + }; + + Buffer(size_t size, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags); + Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength); virtual ~Buffer(); size_t getSize() const { return size; } - - BufferType getType() const { return type; } - + BufferTypeFlags getTypeFlags() const { return typeFlags; } vertex::Usage getUsage() const { return usage; } - - bool isMapped() const { return is_mapped; } + bool isMapped() const { return mapped; } + uint32 getMapFlags() const { return mapFlags; } /** * Map the Buffer to client memory. @@ -92,36 +170,22 @@ public: **/ virtual void copyTo(size_t offset, size_t size, Buffer *other, size_t otheroffset) = 0; - uint32 getMapFlags() const { return map_flags; } - class Mapper { public: - /** - * Memory-maps a Buffer. - */ Mapper(Buffer &buffer) : buf(buffer) { elems = buf.map(); } - /** - * unmaps the buffer - */ ~Mapper() { buf.unmap(); } - /** - * Get pointer to memory mapped region - */ - void *get() - { - return elems; - } + void *get() { return elems; } private: @@ -130,20 +194,22 @@ public: }; // Mapper +// static size_t getDataTypeSize(DataType type, bool uniform) + protected: // The size of the buffer, in bytes. size_t size; // The type of the buffer object. - BufferType type; + BufferTypeFlags typeFlags; // Usage hint. GL_[DYNAMIC, STATIC, STREAM]_DRAW. vertex::Usage usage; - uint32 map_flags; + uint32 mapFlags; - bool is_mapped; + bool mapped; }; // Buffer diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 835344e29..f0e580760 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -173,7 +173,7 @@ void Graphics::createQuadIndexBuffer() return; size_t size = sizeof(uint16) * (LOVE_UINT16_MAX / 4) * 6; - quadIndexBuffer = newBuffer(size, nullptr, BUFFER_INDEX, vertex::USAGE_STATIC, 0); + quadIndexBuffer = newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertex::USAGE_STATIC, 0); Buffer::Mapper map(*quadIndexBuffer); vertex::fillIndices(vertex::TriangleIndexMode::QUADS, 0, LOVE_UINT16_MAX, (uint16 *) map.get()); diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index e8f146cf1..cc87d9431 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -445,7 +445,10 @@ public: ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source); Shader *newShader(const std::string &vertex, const std::string &pixel); - virtual Buffer *newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) = 0; + virtual Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) = 0; + virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) = 0; + +// Buffer *newIndexBuffer(IndexDataType dataType, const void *indices, size_t bytesize, vertex::Usage usage, uint32 mapflags) = 0; Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, vertex::Usage usage); Mesh *newMesh(int vertexcount, PrimitiveType drawmode, vertex::Usage usage); diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 7c3a42c95..8695f852c 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -81,7 +81,7 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma if (vertexCount == 0) throw love::Exception("Data size is too small for specified vertex attribute formats."); - vertexBuffer = gfx->newBuffer(datasize, data, BUFFER_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + vertexBuffer = gfx->newBuffer(datasize, data, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); vertexScratchBuffer = new char[vertexStride]; } @@ -107,7 +107,7 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma size_t buffersize = vertexCount * vertexStride; - vertexBuffer = gfx->newBuffer(buffersize, nullptr, BUFFER_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + vertexBuffer = gfx->newBuffer(buffersize, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); // Initialize the buffer's contents to 0. memset(vertexBuffer->map(), 0, buffersize); @@ -420,7 +420,7 @@ void Mesh::setVertexMap(const std::vector &map) if (!indexBuffer && size > 0) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer = gfx->newBuffer(size, nullptr, BUFFER_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); + indexBuffer = gfx->newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); } useIndexBuffer = true; @@ -457,7 +457,7 @@ void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasiz if (!indexBuffer && datasize > 0) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer = gfx->newBuffer(datasize, nullptr, BUFFER_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); + indexBuffer = gfx->newBuffer(datasize, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); } indexCount = datasize / vertex::getIndexDataSize(datatype); diff --git a/src/modules/graphics/ParticleSystem.cpp b/src/modules/graphics/ParticleSystem.cpp index 35cb48979..6e1d35051 100644 --- a/src/modules/graphics/ParticleSystem.cpp +++ b/src/modules/graphics/ParticleSystem.cpp @@ -191,7 +191,7 @@ void ParticleSystem::createBuffers(size_t size) auto gfx = Module::getInstance(Module::M_GRAPHICS); size_t bytes = sizeof(Vertex) * size * 4; - buffer = gfx->newBuffer(bytes, nullptr, BUFFER_VERTEX, vertex::USAGE_STREAM, 0); + buffer = gfx->newBuffer(bytes, nullptr, BUFFERFLAG_VERTEX, vertex::USAGE_STREAM, 0); } catch (std::bad_alloc &) { diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index 2b7348aed..d3155d7a5 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -64,7 +64,7 @@ SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, vertex::Usag vertex_stride = vertex::getFormatStride(vertex_format); size_t vertex_size = vertex_stride * 4 * size; - array_buf = gfx->newBuffer(vertex_size, nullptr, BUFFER_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY); + array_buf = gfx->newBuffer(vertex_size, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY); } SpriteBatch::~SpriteBatch() @@ -222,7 +222,7 @@ void SpriteBatch::setBufferSize(int newsize) try { auto gfx = Module::getInstance(Module::M_GRAPHICS); - new_array_buf = gfx->newBuffer(vertex_size, nullptr, array_buf->getType(), array_buf->getUsage(), array_buf->getMapFlags()); + new_array_buf = gfx->newBuffer(vertex_size, nullptr, array_buf->getTypeFlags(), array_buf->getUsage(), array_buf->getMapFlags()); // Copy as much of the old data into the new GLBuffer as can fit. size_t copy_size = vertex_stride * 4 * new_next; diff --git a/src/modules/graphics/Text.cpp b/src/modules/graphics/Text.cpp index 180862ed3..319262446 100644 --- a/src/modules/graphics/Text.cpp +++ b/src/modules/graphics/Text.cpp @@ -60,7 +60,7 @@ void Text::uploadVertices(const std::vector &vertices, size_t newsize = std::max(size_t(vertex_buffer->getSize() * 1.5), newsize); auto gfx = Module::getInstance(Module::M_GRAPHICS); - Buffer *new_buffer = gfx->newBuffer(newsize, nullptr, BUFFER_VERTEX, vertex::USAGE_DYNAMIC, 0); + Buffer *new_buffer = gfx->newBuffer(newsize, nullptr, BUFFERFLAG_VERTEX, vertex::USAGE_DYNAMIC, 0); if (vertex_buffer != nullptr) vertex_buffer->copyTo(0, vertex_buffer->getSize(), new_buffer, 0); diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index b50227552..79f5cc8b5 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -35,18 +35,27 @@ namespace graphics namespace opengl { -Buffer::Buffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) - : love::graphics::Buffer(size, type, usage, mapflags) +Buffer::Buffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) + : love::graphics::Buffer(size, typeflags, usage, mapflags) , vbo(0) - , memory_map(nullptr) - , modified_offset(0) - , modified_size(0) + , memoryMap(nullptr) + , modifiedOffset(0) + , modifiedSize(0) { - target = OpenGL::getGLBufferType(type); + if (typeflags & BUFFERFLAG_VERTEX) + mapType = BUFFER_VERTEX; + else if (typeflags & BUFFERFLAG_INDEX) + mapType = BUFFER_INDEX; + else if (mapflags & BUFFERFLAG_UNIFORM) + mapType = BUFFER_UNIFORM; + else if (mapflags & BUFFERFLAG_SHADER_STORAGE) + mapType = BUFFER_SHADER_STORAGE; + + target = OpenGL::getGLBufferType(mapType); try { - memory_map = new char[size]; + memoryMap = new char[size]; } catch (std::bad_alloc &) { @@ -54,11 +63,11 @@ Buffer::Buffer(size_t size, const void *data, BufferType type, vertex::Usage usa } if (data != nullptr) - memcpy(memory_map, data, size); + memcpy(memoryMap, data, size); if (!load(data != nullptr)) { - delete[] memory_map; + delete[] memoryMap; throw love::Exception("Could not load vertex buffer (out of VRAM?)"); } } @@ -68,20 +77,20 @@ Buffer::~Buffer() if (vbo != 0) unload(); - delete[] memory_map; + delete[] memoryMap; } void *Buffer::map() { - if (is_mapped) - return memory_map; + if (mapped) + return memoryMap; - is_mapped = true; + mapped = true; - modified_offset = 0; - modified_size = 0; + modifiedOffset = 0; + modifiedSize = 0; - return memory_map; + return memoryMap; } void Buffer::unmapStatic(size_t offset, size_t size) @@ -90,8 +99,8 @@ void Buffer::unmapStatic(size_t offset, size_t size) return; // Upload the mapped data to the buffer. - gl.bindBuffer(type, vbo); - glBufferSubData(target, (GLintptr) offset, (GLsizeiptr) size, memory_map + offset); + gl.bindBuffer(mapType, vbo); + glBufferSubData(target, (GLintptr) offset, (GLsizeiptr) size, memoryMap + offset); } void Buffer::unmapStream() @@ -100,40 +109,40 @@ void Buffer::unmapStream() // "orphan" current buffer to avoid implicit synchronisation on the GPU: // http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-AsynchronousBufferTransfers.pdf - gl.bindBuffer(type, vbo); + gl.bindBuffer(mapType, vbo); glBufferData(target, (GLsizeiptr) getSize(), nullptr, glusage); #if LOVE_WINDOWS // TODO: Verify that this codepath is a useful optimization. if (gl.getVendor() == OpenGL::VENDOR_INTEL) - glBufferData(target, (GLsizeiptr) getSize(), memory_map, glusage); + glBufferData(target, (GLsizeiptr) getSize(), memoryMap, glusage); else #endif - glBufferSubData(target, 0, (GLsizeiptr) getSize(), memory_map); + glBufferSubData(target, 0, (GLsizeiptr) getSize(), memoryMap); } void Buffer::unmap() { - if (!is_mapped) + if (!mapped) return; - if ((map_flags & MAP_EXPLICIT_RANGE_MODIFY) != 0) + if ((mapFlags & MAP_EXPLICIT_RANGE_MODIFY) != 0) { - modified_offset = std::min(modified_offset, getSize() - 1); - modified_size = std::min(modified_size, getSize() - modified_offset); + modifiedOffset = std::min(modifiedOffset, getSize() - 1); + modifiedSize = std::min(modifiedSize, getSize() - modifiedOffset); } else { - modified_offset = 0; - modified_size = getSize(); + modifiedOffset = 0; + modifiedSize = getSize(); } - if (modified_size > 0) + if (modifiedSize > 0) { switch (getUsage()) { case vertex::USAGE_STATIC: - unmapStatic(modified_offset, modified_size); + unmapStatic(modifiedOffset, modifiedSize); break; case vertex::USAGE_STREAM: unmapStream(); @@ -142,45 +151,45 @@ void Buffer::unmap() default: // It's probably more efficient to treat it like a streaming buffer if // at least a third of its contents have been modified during the map(). - if (modified_size >= getSize() / 3) + if (modifiedSize >= getSize() / 3) unmapStream(); else - unmapStatic(modified_offset, modified_size); + unmapStatic(modifiedOffset, modifiedSize); break; } } - modified_offset = 0; - modified_size = 0; + modifiedOffset = 0; + modifiedSize = 0; - is_mapped = false; + mapped = false; } void Buffer::setMappedRangeModified(size_t offset, size_t modifiedsize) { - if (!is_mapped || !(map_flags & MAP_EXPLICIT_RANGE_MODIFY)) + if (!mapped || !(mapFlags & MAP_EXPLICIT_RANGE_MODIFY)) return; // We're being conservative right now by internally marking the whole range // from the start of section a to the end of section b as modified if both // a and b are marked as modified. - size_t old_range_end = modified_offset + modified_size; - modified_offset = std::min(modified_offset, offset); + size_t oldrangeend = modifiedOffset + modifiedSize; + modifiedOffset = std::min(modifiedOffset, offset); - size_t new_range_end = std::max(offset + modifiedsize, old_range_end); - modified_size = new_range_end - modified_offset; + size_t newrangeend = std::max(offset + modifiedsize, oldrangeend); + modifiedSize = newrangeend - modifiedOffset; } void Buffer::fill(size_t offset, size_t size, const void *data) { - memcpy(memory_map + offset, data, size); + memcpy(memoryMap + offset, data, size); - if (is_mapped) + if (mapped) setMappedRangeModified(offset, size); else { - gl.bindBuffer(type, vbo); + gl.bindBuffer(mapType, vbo); glBufferSubData(target, (GLintptr) offset, (GLsizeiptr) size, data); } } @@ -192,7 +201,7 @@ ptrdiff_t Buffer::getHandle() const void Buffer::copyTo(size_t offset, size_t size, love::graphics::Buffer *other, size_t otheroffset) { - other->fill(otheroffset, size, memory_map + offset); + other->fill(otheroffset, size, memoryMap + offset); } bool Buffer::loadVolatile() @@ -208,13 +217,13 @@ void Buffer::unloadVolatile() bool Buffer::load(bool restore) { glGenBuffers(1, &vbo); - gl.bindBuffer(type, vbo); + gl.bindBuffer(mapType, vbo); while (glGetError() != GL_NO_ERROR) /* Clear the error buffer. */; // Copy the old buffer only if 'restore' was requested. - const GLvoid *src = restore ? memory_map : nullptr; + const GLvoid *src = restore ? memoryMap : nullptr; // Note that if 'src' is '0', no data will be copied. glBufferData(target, (GLsizeiptr) getSize(), src, OpenGL::getGLBufferUsage(getUsage())); @@ -224,7 +233,7 @@ bool Buffer::load(bool restore) void Buffer::unload() { - is_mapped = false; + mapped = false; gl.deleteBuffer(vbo); vbo = 0; } diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index 195f0dfeb..4ca4b14cf 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -39,7 +39,7 @@ class Buffer final : public love::graphics::Buffer, public Volatile { public: - Buffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags); + Buffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags); virtual ~Buffer(); void *map() override; @@ -62,16 +62,17 @@ private: void unmapStatic(size_t offset, size_t size); void unmapStream(); + BufferType mapType; GLenum target; // The VBO identifier. Assigned by OpenGL. GLuint vbo; // A pointer to mapped memory. - char *memory_map; + char *memoryMap; - size_t modified_offset; - size_t modified_size; + size_t modifiedOffset; + size_t modifiedSize; }; // Buffer diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index d636ed1eb..1b354c9c0 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -155,9 +155,15 @@ love::graphics::Shader *Graphics::newShaderInternal(love::graphics::ShaderStage return new Shader(vertex, pixel); } -love::graphics::Buffer *Graphics::newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) +love::graphics::Buffer *Graphics::newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) { - return new Buffer(size, data, type, usage, mapflags); + return new Buffer(size, data, typeflags, usage, mapflags); +} + +love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) +{ + // TODO + return nullptr; } void Graphics::setViewportSize(int width, int height, int pixelwidth, int pixelheight) diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index 4e68acd2d..64b3cf115 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -63,7 +63,8 @@ public: love::graphics::Image *newImage(const Image::Slices &data, const Image::Settings &settings) override; love::graphics::Image *newImage(TextureType textype, PixelFormat format, int width, int height, int slices, const Image::Settings &settings) override; love::graphics::Canvas *newCanvas(const Canvas::Settings &settings) override; - love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) override; + love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) override; + love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) override; void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override; bool setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 28862602e..f17c3e83b 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -588,6 +588,10 @@ GLenum OpenGL::getGLBufferType(BufferType type) return GL_ARRAY_BUFFER; case BUFFER_INDEX: return GL_ELEMENT_ARRAY_BUFFER; + case BUFFER_UNIFORM: + return GL_UNIFORM_BUFFER; + case BUFFER_SHADER_STORAGE: + return GL_SHADER_STORAGE_BUFFER; case BUFFER_MAX_ENUM: return GL_ZERO; } diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 8d4e75dcc..c9893a19d 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -46,7 +46,7 @@ enum BuiltinVertexAttribute ATTRIB_MAX_ENUM }; -enum BuiltinVertexAttributeFlag +enum BuiltinVertexAttributeFlags { ATTRIBFLAG_POS = 1 << ATTRIB_POS, ATTRIBFLAG_TEXCOORD = 1 << ATTRIB_TEXCOORD, @@ -57,9 +57,19 @@ enum BufferType { BUFFER_VERTEX = 0, BUFFER_INDEX, + BUFFER_UNIFORM, + BUFFER_SHADER_STORAGE, BUFFER_MAX_ENUM }; +enum BufferTypeFlags +{ + BUFFERFLAG_VERTEX = 1 << BUFFER_VERTEX, + BUFFERFLAG_INDEX = 1 << BUFFER_INDEX, + BUFFERFLAG_UNIFORM = 1 << BUFFER_UNIFORM, + BUFFERFLAG_SHADER_STORAGE = 1 << BUFFER_SHADER_STORAGE, +}; + enum IndexDataType { INDEX_UINT16, From ee5304ba535134c991cabf88bcda674217077172 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 13 Jan 2020 20:41:05 -0400 Subject: [PATCH 02/54] Remove vertex namespace --- src/modules/graphics/Buffer.cpp | 41 +++++++++-- src/modules/graphics/Buffer.h | 41 +++++++++-- src/modules/graphics/Font.cpp | 4 +- src/modules/graphics/Font.h | 4 +- src/modules/graphics/Graphics.cpp | 30 ++++---- src/modules/graphics/Graphics.h | 42 +++++------ src/modules/graphics/Mesh.cpp | 68 ++++++++---------- src/modules/graphics/Mesh.h | 12 ++-- src/modules/graphics/ParticleSystem.cpp | 8 +-- src/modules/graphics/ParticleSystem.h | 73 +++++++++++++++++++- src/modules/graphics/Polyline.cpp | 8 +-- src/modules/graphics/Polyline.h | 6 +- src/modules/graphics/SpriteBatch.cpp | 16 ++--- src/modules/graphics/SpriteBatch.h | 4 +- src/modules/graphics/Text.cpp | 2 +- src/modules/graphics/Text.h | 4 +- src/modules/graphics/Texture.cpp | 12 ++-- src/modules/graphics/Video.cpp | 8 +-- src/modules/graphics/opengl/Buffer.cpp | 8 +-- src/modules/graphics/opengl/Buffer.h | 2 +- src/modules/graphics/opengl/Graphics.cpp | 22 +++--- src/modules/graphics/opengl/Graphics.h | 6 +- src/modules/graphics/opengl/OpenGL.cpp | 38 +++++----- src/modules/graphics/opengl/OpenGL.h | 6 +- src/modules/graphics/opengl/Shader.cpp | 5 +- src/modules/graphics/vertex.cpp | 19 +++-- src/modules/graphics/vertex.h | 27 +++----- src/modules/graphics/wrap_Graphics.cpp | 42 +++++------ src/modules/graphics/wrap_GraphicsShader.lua | 30 ++++++++ src/modules/graphics/wrap_Mesh.cpp | 72 +++++++++---------- src/modules/graphics/wrap_Mesh.h | 4 +- 31 files changed, 398 insertions(+), 266 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 11df52b0e..c2950272e 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -26,7 +26,16 @@ namespace love namespace graphics { -Buffer::Buffer(size_t size, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) +static const Buffer::DataTypeInfo dataTypeInfo[] +{ + // baseType, isMatrix, components, rows, columns, componentSize, packedAlign, packedSize + { Buffer::DATA_BASE_FLOAT, false, 1, 0, 0, sizeof(float), 4, 4 }, // DATA_FLOAT + +}; + +love::Type Buffer::type("GraphicsBuffer", &Object::type); + +Buffer::Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) : size(size) , typeFlags(typeflags) , usage(usage) @@ -38,6 +47,11 @@ Buffer::Buffer(size_t size, BufferTypeFlags typeflags, vertex::Usage usage, uint Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength) : Buffer(0, settings.typeFlags, settings.usage, settings.mapFlags) { + if (format.size() == 0) + throw love::Exception("Data format must contain values."); + + bool supportsGLSL3 = gfx->getCapabilities().features[Graphics::FEATURE_GLSL3]; + bool uniformbuffer = settings.typeFlags & BUFFERFLAG_UNIFORM; bool indexbuffer = settings.typeFlags & BUFFERFLAG_INDEX; bool vertexbuffer = settings.typeFlags & BUFFERFLAG_VERTEX; @@ -46,17 +60,36 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 1) throw love::Exception("test"); + size_t offset = 0; + size_t stride = 0; + for (const auto &member : format) { + DataType type = member.type; + const DataTypeInfo &info = getDataTypeInfo(type); + if (indexbuffer) { - if (member.type != DATA_UINT16 && member.type != DATA_UINT32) - throw love::Exception("test"); + if (type != DATA_UINT16 && type != DATA_UINT32) + throw love::Exception("Index buffers only support uint16 and uint32 data types."); + } + + if (vertexbuffer) + { + if (info.isMatrix) + throw love::Exception("matrix types are not supported in vertex buffers."); + + if (info.baseType == DATA_BASE_BOOL) + throw love::Exception("bool types are not supported in vertex buffers."); + + if ((info.baseType == DATA_BASE_INT || info.baseType == DATA_BASE_UINT) && !supportsGLSL3) + throw love::Exception("Integer vertex attribute data types require GLSL 3 support."); } if (uniformbuffer) { - + if (info.componentSize != 4) + throw love::Exception(""); } } } diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 8c26bb456..712d6fdef 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -23,6 +23,7 @@ // LOVE #include "common/config.h" #include "common/int.h" +#include "common/Object.h" #include "vertex.h" #include "Resource.h" @@ -41,10 +42,12 @@ class Graphics; /** * A block of GPU-owned memory. Currently meant for internal use. **/ -class Buffer : public Resource +class Buffer : public love::Object, public Resource { public: + static love::Type type; + enum MapFlags { MAP_EXPLICIT_RANGE_MODIFY = (1 << 0), // see setMappedRangeModified. @@ -112,6 +115,28 @@ public: DATA_MAX_ENUM }; + enum DataTypeBase + { + DATA_BASE_FLOAT, + DATA_BASE_INT, + DATA_BASE_UINT, + DATA_BASE_SNORM, + DATA_BASE_UNORM, + DATA_BASE_BOOL, + }; + + struct DataTypeInfo + { + DataTypeBase baseType; + bool isMatrix; + int components; + int matrixRows; + int matrixColumns; + size_t componentSize; + size_t packedAlignment; + size_t packedSize; + }; + struct DataMember { std::string name; @@ -123,16 +148,16 @@ public: { BufferTypeFlags typeFlags; MapFlags mapFlags; - vertex::Usage usage; + BufferUsage usage; }; - Buffer(size_t size, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags); + Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags); Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength); virtual ~Buffer(); size_t getSize() const { return size; } BufferTypeFlags getTypeFlags() const { return typeFlags; } - vertex::Usage getUsage() const { return usage; } + BufferUsage getUsage() const { return usage; } bool isMapped() const { return mapped; } uint32 getMapFlags() const { return mapFlags; } @@ -196,8 +221,14 @@ public: // static size_t getDataTypeSize(DataType type, bool uniform) + const DataTypeInfo &getDataTypeInfo(DataType type); + protected: + std::vector format; + std::vector memberOffsets; + size_t arrayStride; + // The size of the buffer, in bytes. size_t size; @@ -205,7 +236,7 @@ protected: BufferTypeFlags typeFlags; // Usage hint. GL_[DYNAMIC, STATIC, STREAM]_DRAW. - vertex::Usage usage; + BufferUsage usage; uint32 mapFlags; diff --git a/src/modules/graphics/Font.cpp b/src/modules/graphics/Font.cpp index f94adaa05..25b32a60d 100644 --- a/src/modules/graphics/Font.cpp +++ b/src/modules/graphics/Font.cpp @@ -45,7 +45,7 @@ static inline uint16 normToUint16(double n) love::Type Font::type("Font", &Object::type); int Font::fontCount = 0; -const vertex::CommonFormat Font::vertexFormat = vertex::CommonFormat::XYf_STus_RGBAub; +const CommonFormat Font::vertexFormat = CommonFormat::XYf_STus_RGBAub; Font::Font(love::font::Rasterizer *r, const Texture::Filter &f) : rasterizers({r}) @@ -642,7 +642,7 @@ void Font::printv(graphics::Graphics *gfx, const Matrix4 &t, const std::vector Codepoints; - typedef vertex::XYf_STus_RGBAub GlyphVertex; + typedef XYf_STus_RGBAub GlyphVertex; - static const vertex::CommonFormat vertexFormat; + static const CommonFormat vertexFormat; enum AlignMode { diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index f0e580760..27bb1108a 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -173,10 +173,10 @@ void Graphics::createQuadIndexBuffer() return; size_t size = sizeof(uint16) * (LOVE_UINT16_MAX / 4) * 6; - quadIndexBuffer = newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertex::USAGE_STATIC, 0); + quadIndexBuffer = newBuffer(size, nullptr, BUFFERFLAG_INDEX, BUFFERUSAGE_STATIC, 0); Buffer::Mapper map(*quadIndexBuffer); - vertex::fillIndices(vertex::TriangleIndexMode::QUADS, 0, LOVE_UINT16_MAX, (uint16 *) map.get()); + fillIndices(TriangleIndexMode::QUADS, 0, LOVE_UINT16_MAX, (uint16 *) map.get()); } Quad *Graphics::newQuad(Quad::Viewport v, double sw, double sh) @@ -204,7 +204,7 @@ Video *Graphics::newVideo(love::video::VideoStream *stream, float dpiscale) return new Video(this, stream, dpiscale); } -love::graphics::SpriteBatch *Graphics::newSpriteBatch(Texture *texture, int size, vertex::Usage usage) +love::graphics::SpriteBatch *Graphics::newSpriteBatch(Texture *texture, int size, BufferUsage usage) { return new SpriteBatch(this, texture, size, usage); } @@ -260,22 +260,22 @@ Shader *Graphics::newShader(const std::string &vertex, const std::string &pixel) return newShaderInternal(vertexstage.get(), pixelstage.get()); } -Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, vertex::Usage usage) +Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage) { return newMesh(Mesh::getDefaultVertexFormat(), &vertices[0], vertices.size() * sizeof(Vertex), drawmode, usage); } -Mesh *Graphics::newMesh(int vertexcount, PrimitiveType drawmode, vertex::Usage usage) +Mesh *Graphics::newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage) { return newMesh(Mesh::getDefaultVertexFormat(), vertexcount, drawmode, usage); } -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, vertex::Usage usage) +love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, vertexcount, drawmode, usage); } -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, vertex::Usage usage) +love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, data, datasize, drawmode, usage); } @@ -891,7 +891,7 @@ CullMode Graphics::getMeshCullMode() const return states.back().meshCullMode; } -vertex::Winding Graphics::getFrontFaceWinding() const +Winding Graphics::getFrontFaceWinding() const { return states.back().winding; } @@ -996,8 +996,6 @@ void Graphics::captureScreenshot(const ScreenshotInfo &info) Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand &cmd) { - using namespace vertex; - StreamBufferState &state = streamBufferState; bool shouldflush = false; @@ -1130,8 +1128,6 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand & void Graphics::flushStreamDraws() { - using namespace vertex; - auto &sbstate = streamBufferState; if (sbstate.vertexCount == 0 && sbstate.indexCount == 0) @@ -1280,8 +1276,8 @@ void Graphics::points(const Vector2 *positions, const Colorf *colors, size_t num StreamDrawCommand cmd; cmd.primitiveMode = PRIMITIVE_POINTS; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); - cmd.formats[1] = vertex::CommonFormat::RGBAub; + cmd.formats[0] = getSinglePositionFormat(is2D); + cmd.formats[1] = CommonFormat::RGBAub; cmd.vertexCount = (int) numpoints; StreamVertexData data = requestStreamDraw(cmd); @@ -1575,9 +1571,9 @@ void Graphics::polygon(DrawMode mode, const Vector2 *coords, size_t count, bool bool is2D = t.isAffine2DTransform(); StreamDrawCommand cmd; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); - cmd.formats[1] = vertex::CommonFormat::RGBAub; - cmd.indexMode = vertex::TriangleIndexMode::FAN; + cmd.formats[0] = getSinglePositionFormat(is2D); + cmd.formats[1] = CommonFormat::RGBAub; + cmd.indexMode = TriangleIndexMode::FAN; cmd.vertexCount = (int)count - (skipLastFilledVertex ? 1 : 0); StreamVertexData data = requestStreamDraw(cmd); diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index cc87d9431..dd915624c 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -212,8 +212,8 @@ public: { PrimitiveType primitiveType = PRIMITIVE_TRIANGLES; - const vertex::Attributes *attributes; - const vertex::BufferBindings *buffers; + const Attributes *attributes; + const BufferBindings *buffers; int vertexStart = 0; int vertexCount = 0; @@ -224,7 +224,7 @@ public: // TODO: This should be moved out to a state transition API? CullMode cullMode = CULL_NONE; - DrawCommand(const vertex::Attributes *attribs, const vertex::BufferBindings *buffers) + DrawCommand(const Attributes *attribs, const BufferBindings *buffers) : attributes(attribs) , buffers(buffers) {} @@ -234,8 +234,8 @@ public: { PrimitiveType primitiveType = PRIMITIVE_TRIANGLES; - const vertex::Attributes *attributes; - const vertex::BufferBindings *buffers; + const Attributes *attributes; + const BufferBindings *buffers; int indexCount = 0; int instanceCount = 1; @@ -249,7 +249,7 @@ public: // TODO: This should be moved out to a state transition API? CullMode cullMode = CULL_NONE; - DrawIndexedCommand(const vertex::Attributes *attribs, const vertex::BufferBindings *buffers, Resource *indexbuffer) + DrawIndexedCommand(const Attributes *attribs, const BufferBindings *buffers, Resource *indexbuffer) : attributes(attribs) , buffers(buffers) , indexBuffer(indexbuffer) @@ -259,8 +259,8 @@ public: struct StreamDrawCommand { PrimitiveType primitiveMode = PRIMITIVE_TRIANGLES; - vertex::CommonFormat formats[2]; - vertex::TriangleIndexMode indexMode = vertex::TriangleIndexMode::NONE; + CommonFormat formats[2]; + TriangleIndexMode indexMode = TriangleIndexMode::NONE; int vertexCount = 0; Texture *texture = nullptr; Shader::StandardShader standardShaderType = Shader::STANDARD_DEFAULT; @@ -268,7 +268,7 @@ public: StreamDrawCommand() { // VS2013 can't initialize arrays in the above manner... - formats[1] = formats[0] = vertex::CommonFormat::NONE; + formats[1] = formats[0] = CommonFormat::NONE; } }; @@ -437,7 +437,7 @@ public: Font *newDefaultFont(int size, font::TrueTypeRasterizer::Hinting hinting, const Texture::Filter &filter = Texture::defaultFilter); Video *newVideo(love::video::VideoStream *stream, float dpiscale); - SpriteBatch *newSpriteBatch(Texture *texture, int size, vertex::Usage usage); + SpriteBatch *newSpriteBatch(Texture *texture, int size, BufferUsage usage); ParticleSystem *newParticleSystem(Texture *texture, int size); virtual Canvas *newCanvas(const Canvas::Settings &settings) = 0; @@ -445,15 +445,15 @@ public: ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source); Shader *newShader(const std::string &vertex, const std::string &pixel); - virtual Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) = 0; + virtual Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) = 0; virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) = 0; // Buffer *newIndexBuffer(IndexDataType dataType, const void *indices, size_t bytesize, vertex::Usage usage, uint32 mapflags) = 0; - Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, vertex::Usage usage); - Mesh *newMesh(int vertexcount, PrimitiveType drawmode, vertex::Usage usage); - Mesh *newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, vertex::Usage usage); - Mesh *newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, vertex::Usage usage); + Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); Text *newText(Font *font, const std::vector &text = {}); @@ -597,8 +597,8 @@ public: void setMeshCullMode(CullMode cull); CullMode getMeshCullMode() const; - virtual void setFrontFaceWinding(vertex::Winding winding) = 0; - vertex::Winding getFrontFaceWinding() const; + virtual void setFrontFaceWinding(Winding winding) = 0; + Winding getFrontFaceWinding() const; /** * Sets the enabled color components when rendering. @@ -833,7 +833,7 @@ public: virtual void draw(const DrawCommand &cmd) = 0; virtual void draw(const DrawIndexedCommand &cmd) = 0; - virtual void drawQuads(int start, int count, const vertex::Attributes &attributes, const vertex::BufferBindings &buffers, Texture *texture) = 0; + virtual void drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, Texture *texture) = 0; void flushStreamDraws(); StreamVertexData requestStreamDraw(const StreamDrawCommand &command); @@ -910,7 +910,7 @@ protected: bool depthWrite = false; CullMode meshCullMode = CULL_NONE; - vertex::Winding winding = vertex::WINDING_CCW; + Winding winding = WINDING_CCW; StrongRef font; StrongRef shader; @@ -933,7 +933,7 @@ protected: StreamBuffer *indexBuffer = nullptr; PrimitiveType primitiveMode = PRIMITIVE_TRIANGLES; - vertex::CommonFormat formats[2]; + CommonFormat formats[2]; StrongRef texture; Shader::StandardShader standardShaderType = Shader::STANDARD_DEFAULT; int vertexCount = 0; @@ -945,7 +945,7 @@ protected: StreamBufferState() { vb[0] = vb[1] = nullptr; - formats[0] = formats[1] = vertex::CommonFormat::NONE; + formats[0] = formats[1] = CommonFormat::NONE; vbMap[0] = vbMap[1] = StreamBuffer::MapInfo(); } }; diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 8695f852c..24f90d435 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -37,7 +37,7 @@ namespace graphics static const char *getBuiltinAttribName(BuiltinVertexAttribute attribid) { const char *name = ""; - vertex::getConstant(attribid, name); + getConstant(attribid, name); return name; } @@ -49,9 +49,9 @@ std::vector Mesh::getDefaultVertexFormat() { // Corresponds to the love::Vertex struct. std::vector vertexformat = { - { getBuiltinAttribName(ATTRIB_POS), vertex::DATA_FLOAT, 2 }, - { getBuiltinAttribName(ATTRIB_TEXCOORD), vertex::DATA_FLOAT, 2 }, - { getBuiltinAttribName(ATTRIB_COLOR), vertex::DATA_UNORM8, 4 }, + { getBuiltinAttribName(ATTRIB_POS), DATA_FLOAT, 2 }, + { getBuiltinAttribName(ATTRIB_TEXCOORD), DATA_FLOAT, 2 }, + { getBuiltinAttribName(ATTRIB_COLOR), DATA_UNORM8, 4 }, }; return vertexformat; @@ -59,7 +59,7 @@ std::vector Mesh::getDefaultVertexFormat() love::Type Mesh::type("Mesh", &Drawable::type); -Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, vertex::Usage usage) +Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) : vertexFormat(vertexformat) , vertexBuffer(nullptr) , vertexCount(0) @@ -76,17 +76,18 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma calculateAttributeSizes(gfx); vertexCount = datasize / vertexStride; - indexDataType = vertex::getIndexDataTypeFromMax(vertexCount); + indexDataType = getIndexDataTypeFromMax(vertexCount); if (vertexCount == 0) throw love::Exception("Data size is too small for specified vertex attribute formats."); - vertexBuffer = gfx->newBuffer(datasize, data, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + auto buffer = gfx->newBuffer(datasize, data, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + vertexBuffer.set(buffer, Acquire::NORETAIN); vertexScratchBuffer = new char[vertexStride]; } -Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, vertex::Usage usage) +Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) : vertexFormat(vertexformat) , vertexBuffer(nullptr) , vertexCount((size_t) vertexcount) @@ -94,7 +95,7 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma , indexBuffer(nullptr) , useIndexBuffer(false) , indexCount(0) - , indexDataType(vertex::getIndexDataTypeFromMax(vertexcount)) + , indexDataType(getIndexDataTypeFromMax(vertexcount)) , primitiveType(drawmode) , rangeStart(-1) , rangeCount(-1) @@ -107,7 +108,8 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma size_t buffersize = vertexCount * vertexStride; - vertexBuffer = gfx->newBuffer(buffersize, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + auto buffer = gfx->newBuffer(buffersize, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); + vertexBuffer.set(buffer, Acquire::NORETAIN); // Initialize the buffer's contents to 0. memset(vertexBuffer->map(), 0, buffersize); @@ -119,8 +121,6 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma Mesh::~Mesh() { - delete vertexBuffer; - delete indexBuffer; delete vertexScratchBuffer; for (const auto &attrib : attachedAttributes) @@ -151,7 +151,7 @@ void Mesh::calculateAttributeSizes(Graphics *gfx) for (const AttribFormat &format : vertexFormat) { - size_t size = vertex::getDataTypeSize(format.type) * format.components; + size_t size = getDataTypeSize(format.type) * format.components; if (format.components <= 0 || format.components > 4) throw love::Exception("Vertex attributes must have between 1 and 4 components."); @@ -160,7 +160,7 @@ void Mesh::calculateAttributeSizes(Graphics *gfx) if (size % 4 != 0) throw love::Exception("Vertex attributes must have enough components to be a multiple of 32 bits."); - if (vertex::isDataTypeInteger(format.type) && !supportsGLSL3) + if (isDataTypeInteger(format.type) && !supportsGLSL3) throw love::Exception("Integer vertex attribute data types require GLSL 3 support."); // Total size in bytes of each attribute in a single vertex. @@ -265,7 +265,7 @@ const std::vector &Mesh::getVertexFormat() const return vertexFormat; } -vertex::DataType Mesh::getAttributeInfo(int attribindex, int &components) const +DataType Mesh::getAttributeInfo(int attribindex, int &components) const { if (attribindex < 0 || attribindex >= (int) vertexFormat.size()) throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); @@ -328,8 +328,8 @@ void Mesh::attachAttribute(const std::string &name, Mesh *mesh, const std::strin auto it = attachedAttributes.find(name); if (it != attachedAttributes.end()) oldattrib = it->second; - else if (attachedAttributes.size() + 1 > vertex::Attributes::MAX) - throw love::Exception("A maximum of %d attributes can be attached at once.", vertex::Attributes::MAX); + else if (attachedAttributes.size() + 1 > Attributes::MAX) + throw love::Exception("A maximum of %d attributes can be attached at once.", Attributes::MAX); newattrib.mesh = mesh; newattrib.enabled = oldattrib.mesh ? oldattrib.enabled : true; @@ -406,21 +406,15 @@ void Mesh::setVertexMap(const std::vector &map) { size_t maxval = getVertexCount(); - IndexDataType datatype = vertex::getIndexDataTypeFromMax(maxval); + IndexDataType datatype = getIndexDataTypeFromMax(maxval); // Calculate the size in bytes of the index buffer data. - size_t size = map.size() * vertex::getIndexDataSize(datatype); + size_t size = map.size() * getIndexDataSize(datatype); - if (indexBuffer && size > indexBuffer->getSize()) - { - delete indexBuffer; - indexBuffer = nullptr; - } - - if (!indexBuffer && size > 0) + if (indexBuffer.get() == nullptr || size > indexBuffer->getSize()) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer = gfx->newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); + indexBuffer.set(gfx->newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ), Acquire::NORETAIN); } useIndexBuffer = true; @@ -448,19 +442,13 @@ void Mesh::setVertexMap(const std::vector &map) void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasize) { - if (indexBuffer && datasize > indexBuffer->getSize()) - { - delete indexBuffer; - indexBuffer = nullptr; - } - - if (!indexBuffer && datasize > 0) + if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize()) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer = gfx->newBuffer(datasize, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ); + indexBuffer.set(gfx->newBuffer(datasize, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ), Acquire::NORETAIN); } - indexCount = datasize / vertex::getIndexDataSize(datatype); + indexCount = datasize / getIndexDataSize(datatype); if (!indexBuffer || indexCount == 0) return; @@ -592,8 +580,8 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) if (Shader::current && texture.get()) Shader::current->checkMainTexture(texture); - vertex::Attributes attributes; - vertex::BufferBindings buffers; + Attributes attributes; + BufferBindings buffers; int activebuffers = 0; @@ -608,7 +596,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) // If the attribute is one of the LOVE-defined ones, use the constant // attribute index for it, otherwise query the index from the shader. BuiltinVertexAttribute builtinattrib; - if (vertex::getConstant(attrib.first.c_str(), builtinattrib)) + if (getConstant(attrib.first.c_str(), builtinattrib)) attributeindex = (int) builtinattrib; else if (Shader::current) attributeindex = Shader::current->getVertexAttributeIndex(attrib.first); @@ -653,7 +641,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) cmd.cullMode = gfx->getMeshCullMode(); int start = std::min(std::max(0, rangeStart), (int) indexCount - 1); - cmd.indexBufferOffset = start * vertex::getIndexDataSize(indexDataType); + cmd.indexBufferOffset = start * getIndexDataSize(indexDataType); cmd.indexCount = (int) indexCount; if (rangeCount > 0) diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 148fc150d..728dc0993 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -55,12 +55,12 @@ public: struct AttribFormat { std::string name; - vertex::DataType type; + DataType type; int components; // max 4 }; - Mesh(Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, vertex::Usage usage); - Mesh(Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, vertex::Usage usage); + Mesh(Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); + Mesh(Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); virtual ~Mesh(); @@ -96,7 +96,7 @@ public: * Gets the format of each vertex attribute stored in the Mesh. **/ const std::vector &getVertexFormat() const; - vertex::DataType getAttributeInfo(int attribindex, int &components) const; + DataType getAttributeInfo(int attribindex, int &components) const; int getAttributeIndex(const std::string &name) const; /** @@ -196,7 +196,7 @@ private: std::unordered_map attachedAttributes; // Vertex buffer, for the vertex data. - Buffer *vertexBuffer; + StrongRef vertexBuffer; size_t vertexCount; size_t vertexStride; @@ -205,7 +205,7 @@ private: char *vertexScratchBuffer; // Index buffer, for the vertex map. - Buffer *indexBuffer; + StrongRef indexBuffer; bool useIndexBuffer; size_t indexCount; IndexDataType indexDataType; diff --git a/src/modules/graphics/ParticleSystem.cpp b/src/modules/graphics/ParticleSystem.cpp index 6e1d35051..6e1123870 100644 --- a/src/modules/graphics/ParticleSystem.cpp +++ b/src/modules/graphics/ParticleSystem.cpp @@ -93,7 +93,7 @@ ParticleSystem::ParticleSystem(Texture *texture, uint32 size) , offset(float(texture->getWidth())*0.5f, float(texture->getHeight())*0.5f) , defaultOffset(true) , relativeRotation(false) - , vertexAttributes(vertex::CommonFormat::XYf_STf_RGBAub, 0) + , vertexAttributes(CommonFormat::XYf_STf_RGBAub, 0) , buffer(nullptr) { if (size == 0 || size > MAX_PARTICLES) @@ -191,7 +191,7 @@ void ParticleSystem::createBuffers(size_t size) auto gfx = Module::getInstance(Module::M_GRAPHICS); size_t bytes = sizeof(Vertex) * size * 4; - buffer = gfx->newBuffer(bytes, nullptr, BUFFERFLAG_VERTEX, vertex::USAGE_STREAM, 0); + buffer = gfx->newBuffer(bytes, nullptr, BUFFERFLAG_VERTEX, BUFFERUSAGE_STREAM, 0); } catch (std::bad_alloc &) { @@ -203,7 +203,7 @@ void ParticleSystem::createBuffers(size_t size) void ParticleSystem::deleteBuffers() { delete[] pMem; - delete buffer; + buffer->release(); pMem = nullptr; buffer = nullptr; @@ -1080,7 +1080,7 @@ void ParticleSystem::draw(Graphics *gfx, const Matrix4 &m) Graphics::TempTransform transform(gfx, m); - vertex::BufferBindings vertexbuffers; + BufferBindings vertexbuffers; vertexbuffers.set(0, buffer, 0); gfx->drawQuads(0, pCount, vertexAttributes, vertexbuffers, texture); diff --git a/src/modules/graphics/ParticleSystem.h b/src/modules/graphics/ParticleSystem.h index b220e6275..1a24266b3 100644 --- a/src/modules/graphics/ParticleSystem.h +++ b/src/modules/graphics/ParticleSystem.h @@ -558,6 +558,77 @@ private: int quadIndex; }; + struct Emitter + { + // Pointer to the beginning of the allocated memory. + Particle *pMem; + + // Pointer to a free particle. + Particle *pFree; + + // Pointer to the start of the linked list. + Particle *pHead; + + // Pointer to the end of the linked list. + Particle *pTail; + + // Whether the particle emitter is active. + bool active; + + // Insert mode of new particles. + InsertMode insertMode; + + // The number of active particles. + uint32 activeParticles; + + // The emission rate (particles/sec). + float emissionRate; + + // Used to determine when a particle should be emitted. + float emitCounter; + + // The relative position of the particle emitter. + love::Vector2 position; + love::Vector2 prevPosition; + + // Emission area spread. + AreaSpreadDistribution emissionAreaDistribution; + love::Vector2 emissionArea; + float emissionAreaAngle; + bool directionRelativeToEmissionCenter; + + // The lifetime of the particle emitter (-1 means infinite) and the life it has left. + float lifetime; + float life; + + // The particle life. + float particleLifeMin; + float particleLifeMax; + + // The direction (and spread) the particles will be emitted in. Measured in radians. + float direction; + float spread; + + // The speed. + float speedMin; + float speedMax; + + // Acceleration along the x and y axes. + love::Vector2 linearAccelerationMin; + love::Vector2 linearAccelerationMax; + + // Acceleration towards the emitter's center + float radialAccelerationMin; + float radialAccelerationMax; + + // Acceleration perpendicular to the particle's direction. + float tangentialAccelerationMin; + float tangentialAccelerationMax; + + float linearDampingMin; + float linearDampingMax; + }; + void resetOffset(); void createBuffers(size_t size); @@ -673,7 +744,7 @@ private: bool relativeRotation; - const vertex::Attributes vertexAttributes; + const Attributes vertexAttributes; Buffer *buffer; static StringMap::Entry distributionsEntries[]; diff --git a/src/modules/graphics/Polyline.cpp b/src/modules/graphics/Polyline.cpp index da1397b42..27035e48b 100644 --- a/src/modules/graphics/Polyline.cpp +++ b/src/modules/graphics/Polyline.cpp @@ -82,7 +82,7 @@ void Polyline::render(const Vector2 *coords, size_t count, size_t size_hint, flo // extra degenerate triangle in between the core line and the overdraw // line in order to break up the strip into two. This will let us draw // everything in one draw call. - if (triangle_mode == vertex::TriangleIndexMode::STRIP) + if (triangle_mode == TriangleIndexMode::STRIP) extra_vertices = 2; } @@ -383,7 +383,7 @@ void Polyline::draw(love::graphics::Graphics *gfx) int maxvertices = LOVE_UINT16_MAX - 3; int advance = maxvertices; - if (triangle_mode == vertex::TriangleIndexMode::STRIP) + if (triangle_mode == TriangleIndexMode::STRIP) advance -= 2; for (int vertex_start = 0; vertex_start < total_vertex_count; vertex_start += advance) @@ -391,8 +391,8 @@ void Polyline::draw(love::graphics::Graphics *gfx) const Vector2 *verts = vertices + vertex_start; Graphics::StreamDrawCommand cmd; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); - cmd.formats[1] = vertex::CommonFormat::RGBAub; + cmd.formats[0] = getSinglePositionFormat(is2D); + cmd.formats[1] = CommonFormat::RGBAub; cmd.indexMode = triangle_mode; cmd.vertexCount = std::min(maxvertices, total_vertex_count - vertex_start); diff --git a/src/modules/graphics/Polyline.h b/src/modules/graphics/Polyline.h index 659256b4e..efb42e9e8 100644 --- a/src/modules/graphics/Polyline.h +++ b/src/modules/graphics/Polyline.h @@ -44,7 +44,7 @@ class Polyline { public: - Polyline(vertex::TriangleIndexMode mode = vertex::TriangleIndexMode::STRIP) + Polyline(TriangleIndexMode mode = TriangleIndexMode::STRIP) : vertices(nullptr) , overdraw(nullptr) , vertex_count(0) @@ -94,7 +94,7 @@ protected: Vector2 *overdraw; size_t vertex_count; size_t overdraw_vertex_count; - vertex::TriangleIndexMode triangle_mode; + TriangleIndexMode triangle_mode; size_t overdraw_vertex_start; }; // Polyline @@ -109,7 +109,7 @@ class NoneJoinPolyline : public Polyline public: NoneJoinPolyline() - : Polyline(vertex::TriangleIndexMode::QUADS) + : Polyline(TriangleIndexMode::QUADS) {} void render(const Vector2 *vertices, size_t count, float halfwidth, float pixel_size, bool draw_overdraw) diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index d3155d7a5..aaaf1e7ea 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -40,7 +40,7 @@ namespace graphics love::Type SpriteBatch::type("SpriteBatch", &Drawable::type); -SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, vertex::Usage usage) +SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, BufferUsage usage) : texture(texture) , size(size) , next(0) @@ -57,11 +57,11 @@ SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, vertex::Usag throw love::Exception("A texture must be used when creating a SpriteBatch."); if (texture->getTextureType() == TEXTURE_2D_ARRAY) - vertex_format = vertex::CommonFormat::XYf_STPf_RGBAub; + vertex_format = CommonFormat::XYf_STPf_RGBAub; else - vertex_format = vertex::CommonFormat::XYf_STf_RGBAub; + vertex_format = CommonFormat::XYf_STf_RGBAub; - vertex_stride = vertex::getFormatStride(vertex_format); + vertex_stride = getFormatStride(vertex_format); size_t vertex_size = vertex_stride * 4 * size; array_buf = gfx->newBuffer(vertex_size, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY); @@ -79,8 +79,6 @@ int SpriteBatch::add(const Matrix4 &m, int index /*= -1*/) int SpriteBatch::add(Quad *quad, const Matrix4 &m, int index /*= -1*/) { - using namespace vertex; - if (vertex_format == CommonFormat::XYf_STPf_RGBAub) return addLayer(quad->getLayer(), quad, m, index); @@ -122,8 +120,6 @@ int SpriteBatch::addLayer(int layer, const Matrix4 &m, int index) int SpriteBatch::addLayer(int layer, Quad *quad, const Matrix4 &m, int index) { - using namespace vertex; - if (vertex_format != CommonFormat::XYf_STPf_RGBAub) throw love::Exception("addLayer can only be called on a SpriteBatch that uses an Array Texture!"); @@ -296,8 +292,6 @@ bool SpriteBatch::getDrawRange(int &start, int &count) const void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) { - using namespace vertex; - if (next == 0) return; @@ -345,7 +339,7 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) // If the attribute is one of the LOVE-defined ones, use the constant // attribute index for it, otherwise query the index from the shader. BuiltinVertexAttribute builtinattrib; - if (vertex::getConstant(it.first.c_str(), builtinattrib)) + if (getConstant(it.first.c_str(), builtinattrib)) attributeindex = (int) builtinattrib; else if (Shader::current) attributeindex = Shader::current->getVertexAttributeIndex(it.first); diff --git a/src/modules/graphics/SpriteBatch.h b/src/modules/graphics/SpriteBatch.h index 644a82f03..f5b9db48f 100644 --- a/src/modules/graphics/SpriteBatch.h +++ b/src/modules/graphics/SpriteBatch.h @@ -51,7 +51,7 @@ public: static love::Type type; - SpriteBatch(Graphics *gfx, Texture *texture, int size, vertex::Usage usage); + SpriteBatch(Graphics *gfx, Texture *texture, int size, BufferUsage usage); virtual ~SpriteBatch(); int add(const Matrix4 &m, int index = -1); @@ -128,7 +128,7 @@ private: Color32 color; Colorf colorf; - vertex::CommonFormat vertex_format; + CommonFormat vertex_format; size_t vertex_stride; love::graphics::Buffer *array_buf; diff --git a/src/modules/graphics/Text.cpp b/src/modules/graphics/Text.cpp index 319262446..1909a35cf 100644 --- a/src/modules/graphics/Text.cpp +++ b/src/modules/graphics/Text.cpp @@ -60,7 +60,7 @@ void Text::uploadVertices(const std::vector &vertices, size_t newsize = std::max(size_t(vertex_buffer->getSize() * 1.5), newsize); auto gfx = Module::getInstance(Module::M_GRAPHICS); - Buffer *new_buffer = gfx->newBuffer(newsize, nullptr, BUFFERFLAG_VERTEX, vertex::USAGE_DYNAMIC, 0); + Buffer *new_buffer = gfx->newBuffer(newsize, nullptr, BUFFERFLAG_VERTEX, BUFFERUSAGE_DYNAMIC, 0); if (vertex_buffer != nullptr) vertex_buffer->copyTo(0, vertex_buffer->getSize(), new_buffer, 0); diff --git a/src/modules/graphics/Text.h b/src/modules/graphics/Text.h index ab858f86b..3199b0074 100644 --- a/src/modules/graphics/Text.h +++ b/src/modules/graphics/Text.h @@ -85,8 +85,8 @@ private: StrongRef font; - vertex::Attributes vertexAttributes; - vertex::BufferBindings vertexBuffers; + Attributes vertexAttributes; + BufferBindings vertexBuffers; Buffer *vertex_buffer; diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp index cbbbf0b75..f37ef41b6 100644 --- a/src/modules/graphics/Texture.cpp +++ b/src/modules/graphics/Texture.cpp @@ -117,8 +117,6 @@ void Texture::draw(Graphics *gfx, const Matrix4 &m) void Texture::draw(Graphics *gfx, Quad *q, const Matrix4 &localTransform) { - using namespace vertex; - if (!readable) throw love::Exception("Textures with non-readable formats cannot be drawn."); @@ -132,7 +130,7 @@ void Texture::draw(Graphics *gfx, Quad *q, const Matrix4 &localTransform) bool is2D = tm.isAffine2DTransform(); Graphics::StreamDrawCommand cmd; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); + cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::STf_RGBAub; cmd.indexMode = TriangleIndexMode::QUADS; cmd.vertexCount = 4; @@ -148,7 +146,7 @@ void Texture::draw(Graphics *gfx, Quad *q, const Matrix4 &localTransform) t.transformXY0((Vector3 *) data.stream[0], q->getVertexPositions(), 4); const Vector2 *texcoords = q->getVertexTexCoords(); - vertex::STf_RGBAub *vertexdata = (vertex::STf_RGBAub *) data.stream[1]; + STf_RGBAub *vertexdata = (STf_RGBAub *) data.stream[1]; Color32 c = toColor32(gfx->getColor()); @@ -167,8 +165,6 @@ void Texture::drawLayer(Graphics *gfx, int layer, const Matrix4 &m) void Texture::drawLayer(Graphics *gfx, int layer, Quad *q, const Matrix4 &m) { - using namespace vertex; - if (!readable) throw love::Exception("Textures with non-readable formats cannot be drawn."); @@ -186,7 +182,7 @@ void Texture::drawLayer(Graphics *gfx, int layer, Quad *q, const Matrix4 &m) Matrix4 t(tm, m); Graphics::StreamDrawCommand cmd; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); + cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::STPf_RGBAub; cmd.indexMode = TriangleIndexMode::QUADS; cmd.vertexCount = 4; @@ -201,7 +197,7 @@ void Texture::drawLayer(Graphics *gfx, int layer, Quad *q, const Matrix4 &m) t.transformXY0((Vector3 *) data.stream[0], q->getVertexPositions(), 4); const Vector2 *texcoords = q->getVertexTexCoords(); - vertex::STPf_RGBAub *vertexdata = (vertex::STPf_RGBAub *) data.stream[1]; + STPf_RGBAub *vertexdata = (STPf_RGBAub *) data.stream[1]; for (int i = 0; i < 4; i++) { diff --git a/src/modules/graphics/Video.cpp b/src/modules/graphics/Video.cpp index 201670f6b..e3c71c1ef 100644 --- a/src/modules/graphics/Video.cpp +++ b/src/modules/graphics/Video.cpp @@ -115,9 +115,9 @@ void Video::draw(Graphics *gfx, const Matrix4 &m) Matrix4 t(tm, m); Graphics::StreamDrawCommand cmd; - cmd.formats[0] = vertex::getSinglePositionFormat(is2D); - cmd.formats[1] = vertex::CommonFormat::STf_RGBAub; - cmd.indexMode = vertex::TriangleIndexMode::QUADS; + cmd.formats[0] = getSinglePositionFormat(is2D); + cmd.formats[1] = CommonFormat::STf_RGBAub; + cmd.indexMode = TriangleIndexMode::QUADS; cmd.vertexCount = 4; cmd.standardShaderType = Shader::STANDARD_VIDEO; @@ -128,7 +128,7 @@ void Video::draw(Graphics *gfx, const Matrix4 &m) else t.transformXY0((Vector3 *) data.stream[0], vertices, 4); - vertex::STf_RGBAub *verts = (vertex::STf_RGBAub *) data.stream[1]; + STf_RGBAub *verts = (STf_RGBAub *) data.stream[1]; Color32 c = toColor32(gfx->getColor()); diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 79f5cc8b5..3559a2221 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -35,7 +35,7 @@ namespace graphics namespace opengl { -Buffer::Buffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) +Buffer::Buffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) : love::graphics::Buffer(size, typeflags, usage, mapflags) , vbo(0) , memoryMap(nullptr) @@ -141,13 +141,13 @@ void Buffer::unmap() { switch (getUsage()) { - case vertex::USAGE_STATIC: + case BUFFERUSAGE_STATIC: unmapStatic(modifiedOffset, modifiedSize); break; - case vertex::USAGE_STREAM: + case BUFFERUSAGE_STREAM: unmapStream(); break; - case vertex::USAGE_DYNAMIC: + case BUFFERUSAGE_DYNAMIC: default: // It's probably more efficient to treat it like a streaming buffer if // at least a third of its contents have been modified during the map(). diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index 4ca4b14cf..60946ddfb 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -39,7 +39,7 @@ class Buffer final : public love::graphics::Buffer, public Volatile { public: - Buffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags); + Buffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags); virtual ~Buffer(); void *map() override; diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 1b354c9c0..b2fcba39d 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -155,7 +155,7 @@ love::graphics::Shader *Graphics::newShaderInternal(love::graphics::ShaderStage return new Shader(vertex, pixel); } -love::graphics::Buffer *Graphics::newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) +love::graphics::Buffer *Graphics::newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) { return new Buffer(size, data, typeflags, usage, mapflags); } @@ -385,13 +385,13 @@ void Graphics::draw(const DrawIndexedCommand &cmd) ++drawCalls; } -static inline void advanceVertexOffsets(const vertex::Attributes &attributes, vertex::BufferBindings &buffers, int vertexcount) +static inline void advanceVertexOffsets(const Attributes &attributes, BufferBindings &buffers, int vertexcount) { // TODO: Figure out a better way to avoid touching the same buffer multiple // times, if multiple attributes share the buffer. uint32 touchedbuffers = 0; - for (unsigned int i = 0; i < vertex::Attributes::MAX; i++) + for (unsigned int i = 0; i < Attributes::MAX; i++) { if (!attributes.isEnabled(i)) continue; @@ -408,7 +408,7 @@ static inline void advanceVertexOffsets(const vertex::Attributes &attributes, ve } } -void Graphics::drawQuads(int start, int count, const vertex::Attributes &attributes, const vertex::BufferBindings &buffers, love::graphics::Texture *texture) +void Graphics::drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, love::graphics::Texture *texture) { const int MAX_VERTICES_PER_DRAW = LOVE_UINT16_MAX; const int MAX_QUADS_PER_DRAW = MAX_VERTICES_PER_DRAW / 4; @@ -437,7 +437,7 @@ void Graphics::drawQuads(int start, int count, const vertex::Attributes &attribu } else { - vertex::BufferBindings bufferscopy = buffers; + BufferBindings bufferscopy = buffers; if (start > 0) advanceVertexOffsets(attributes, bufferscopy, start * 4); @@ -525,7 +525,7 @@ void Graphics::setCanvasInternal(const RenderTargets &rts, int w, int h, int pix endPass(); bool iswindow = rts.getFirstTarget().canvas == nullptr; - vertex::Winding vertexwinding = state.winding; + Winding vertexwinding = state.winding; if (iswindow) { @@ -543,10 +543,10 @@ void Graphics::setCanvasInternal(const RenderTargets &rts, int w, int h, int pix // Flip front face winding when rendering to a canvas, since our // projection matrix is flipped. - vertexwinding = vertexwinding == vertex::WINDING_CW ? vertex::WINDING_CCW : vertex::WINDING_CW; + vertexwinding = vertexwinding == WINDING_CW ? WINDING_CCW : WINDING_CW; } - glFrontFace(vertexwinding == vertex::WINDING_CW ? GL_CW : GL_CCW); + glFrontFace(vertexwinding == WINDING_CW ? GL_CW : GL_CCW); gl.setViewport({0, 0, pixelw, pixelh}); @@ -1241,7 +1241,7 @@ void Graphics::setDepthMode(CompareMode compare, bool write) } } -void Graphics::setFrontFaceWinding(vertex::Winding winding) +void Graphics::setFrontFaceWinding(Winding winding) { DisplayState &state = states.back(); @@ -1251,9 +1251,9 @@ void Graphics::setFrontFaceWinding(vertex::Winding winding) state.winding = winding; if (isCanvasActive()) - winding = winding == vertex::WINDING_CW ? vertex::WINDING_CCW : vertex::WINDING_CW; + winding = winding == WINDING_CW ? WINDING_CCW : WINDING_CW; - glFrontFace(winding == vertex::WINDING_CW ? GL_CW : GL_CCW); + glFrontFace(winding == WINDING_CW ? GL_CW : GL_CCW); } void Graphics::setColor(Colorf c) diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index 64b3cf115..8f2f69a88 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -63,7 +63,7 @@ public: love::graphics::Image *newImage(const Image::Slices &data, const Image::Settings &settings) override; love::graphics::Image *newImage(TextureType textype, PixelFormat format, int width, int height, int slices, const Image::Settings &settings) override; love::graphics::Canvas *newCanvas(const Canvas::Settings &settings) override; - love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, vertex::Usage usage, uint32 mapflags) override; + love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) override; love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) override; void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override; @@ -74,7 +74,7 @@ public: void draw(const DrawCommand &cmd) override; void draw(const DrawIndexedCommand &cmd) override; - void drawQuads(int start, int count, const vertex::Attributes &attributes, const vertex::BufferBindings &buffers, Texture *texture) override; + void drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, Texture *texture) override; void clear(OptionalColorf color, OptionalInt stencil, OptionalDouble depth) override; void clear(const std::vector &colors, OptionalInt stencil, OptionalDouble depth) override; @@ -95,7 +95,7 @@ public: void setDepthMode(CompareMode compare, bool write) override; - void setFrontFaceWinding(vertex::Winding winding) override; + void setFrontFaceWinding(Winding winding) override; void setColorMask(ColorChannelMask mask) override; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index f17c3e83b..601808254 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -186,7 +186,7 @@ void OpenGL::setupContext() state.enabledAttribArrays = (uint32) ((1ull << uint32(maxvertexattribs)) - 1); state.instancedAttribArrays = 0; - setVertexAttributes(vertex::Attributes(), vertex::BufferBindings()); + setVertexAttributes(Attributes(), BufferBindings()); // Get the current viewport. glGetIntegerv(GL_VIEWPORT, (GLint *) &state.viewport.x); @@ -631,62 +631,62 @@ GLenum OpenGL::getGLIndexDataType(IndexDataType type) } } -GLenum OpenGL::getGLVertexDataType(vertex::DataType type, GLboolean &normalized, bool &intformat) +GLenum OpenGL::getGLVertexDataType(DataType type, GLboolean &normalized, bool &intformat) { normalized = GL_FALSE; intformat = false; switch (type) { - case vertex::DATA_SNORM8: + case DATA_SNORM8: normalized = GL_TRUE; return GL_BYTE; - case vertex::DATA_UNORM8: + case DATA_UNORM8: normalized = GL_TRUE; return GL_UNSIGNED_BYTE; - case vertex::DATA_INT8: + case DATA_INT8: intformat = true; return GL_BYTE; - case vertex::DATA_UINT8: + case DATA_UINT8: intformat = true; return GL_UNSIGNED_BYTE; - case vertex::DATA_SNORM16: + case DATA_SNORM16: normalized = GL_TRUE; return GL_SHORT; - case vertex::DATA_UNORM16: + case DATA_UNORM16: normalized = GL_TRUE; return GL_UNSIGNED_SHORT; - case vertex::DATA_INT16: + case DATA_INT16: intformat = true; return GL_SHORT; - case vertex::DATA_UINT16: + case DATA_UINT16: intformat = true; return GL_UNSIGNED_SHORT; - case vertex::DATA_INT32: + case DATA_INT32: intformat = true; return GL_INT; - case vertex::DATA_UINT32: + case DATA_UINT32: intformat = true; return GL_UNSIGNED_INT; - case vertex::DATA_FLOAT: + case DATA_FLOAT: normalized = GL_FALSE; return GL_FLOAT; - case vertex::DATA_MAX_ENUM: + case DATA_MAX_ENUM: return GL_ZERO; } return GL_ZERO; } -GLenum OpenGL::getGLBufferUsage(vertex::Usage usage) +GLenum OpenGL::getGLBufferUsage(BufferUsage usage) { switch (usage) { - case vertex::USAGE_STREAM: + case BUFFERUSAGE_STREAM: return GL_STREAM_DRAW; - case vertex::USAGE_DYNAMIC: + case BUFFERUSAGE_DYNAMIC: return GL_DYNAMIC_DRAW; - case vertex::USAGE_STATIC: + case BUFFERUSAGE_STATIC: return GL_STATIC_DRAW; default: return 0; @@ -713,7 +713,7 @@ void OpenGL::deleteBuffer(GLuint buffer) } } -void OpenGL::setVertexAttributes(const vertex::Attributes &attributes, const vertex::BufferBindings &buffers) +void OpenGL::setVertexAttributes(const Attributes &attributes, const BufferBindings &buffers) { uint32 enablediff = attributes.enableBits ^ state.enabledAttribArrays; uint32 instanceattribbits = 0; diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index 8dd975cec..f174a0b22 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -238,7 +238,7 @@ public: /** * Set all vertex attribute state. **/ - void setVertexAttributes(const vertex::Attributes &attributes, const vertex::BufferBindings &buffers); + void setVertexAttributes(const Attributes &attributes, const BufferBindings &buffers); /** * Wrapper for glCullFace which eliminates redundant state setting. @@ -404,8 +404,8 @@ public: static GLenum getGLPrimitiveType(PrimitiveType type); static GLenum getGLBufferType(BufferType type); static GLenum getGLIndexDataType(IndexDataType type); - static GLenum getGLVertexDataType(vertex::DataType type, GLboolean &normalized, bool &intformat); - static GLenum getGLBufferUsage(vertex::Usage usage); + static GLenum getGLVertexDataType(DataType type, GLboolean &normalized, bool &intformat); + static GLenum getGLBufferUsage(BufferUsage usage); static GLenum getGLTextureType(TextureType type); static GLint getGLWrapMode(Texture::WrapMode wmode); static GLint getGLCompareMode(CompareMode mode); diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index fca5e22c7..f704764e7 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -23,6 +23,7 @@ #include "Shader.h" #include "Graphics.h" +#include "graphics/vertex.h" // C++ #include @@ -322,7 +323,7 @@ bool Shader::loadVolatile() for (int i = 0; i < int(ATTRIB_MAX_ENUM); i++) { const char *name = nullptr; - if (vertex::getConstant((BuiltinVertexAttribute) i, name)) + if (graphics::getConstant((BuiltinVertexAttribute) i, name)) glBindAttribLocation(program, i, (const GLchar *) name); } @@ -345,7 +346,7 @@ bool Shader::loadVolatile() for (int i = 0; i < int(ATTRIB_MAX_ENUM); i++) { const char *name = nullptr; - if (vertex::getConstant(BuiltinVertexAttribute(i), name)) + if (graphics::getConstant(BuiltinVertexAttribute(i), name)) builtinAttributes[i] = glGetAttribLocation(program, name); else builtinAttributes[i] = -1; diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index e979af478..8366515ce 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -25,8 +25,6 @@ namespace love { namespace graphics { -namespace vertex -{ static_assert(sizeof(Color32) == 4, "sizeof(Color32) incorrect!"); static_assert(sizeof(STf_RGBAub) == sizeof(float)*2 + sizeof(Color32), "sizeof(STf_RGBAub) incorrect!"); @@ -306,14 +304,14 @@ static StringMap::Entry indexTypeEntries[] = static StringMap indexTypes(indexTypeEntries, sizeof(indexTypeEntries)); -static StringMap::Entry usageEntries[] = +static StringMap::Entry usageEntries[] = { - { "stream", USAGE_STREAM }, - { "dynamic", USAGE_DYNAMIC }, - { "static", USAGE_STATIC }, + { "stream", BUFFERUSAGE_STREAM }, + { "dynamic", BUFFERUSAGE_DYNAMIC }, + { "static", BUFFERUSAGE_STATIC }, }; -static StringMap usages(usageEntries, sizeof(usageEntries)); +static StringMap usages(usageEntries, sizeof(usageEntries)); static StringMap::Entry primitiveTypeEntries[] = { @@ -392,17 +390,17 @@ std::vector getConstants(IndexDataType) return indexTypes.getNames(); } -bool getConstant(const char *in, Usage &out) +bool getConstant(const char *in, BufferUsage &out) { return usages.find(in, out); } -bool getConstant(Usage in, const char *&out) +bool getConstant(BufferUsage in, const char *&out) { return usages.find(in, out); } -std::vector getConstants(Usage) +std::vector getConstants(BufferUsage) { return usages.getNames(); } @@ -482,6 +480,5 @@ std::vector getConstants(Winding) return windings.getNames(); } -} // vertex } // graphics } // love diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index c9893a19d..8c8a6aa80 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -102,16 +102,13 @@ enum CullMode CULL_MAX_ENUM }; -namespace vertex +// The expected usage pattern of buffer data. +enum BufferUsage { - -// The expected usage pattern of vertex data. -enum Usage -{ - USAGE_STREAM, - USAGE_DYNAMIC, - USAGE_STATIC, - USAGE_MAX_ENUM + BUFFERUSAGE_STREAM, + BUFFERUSAGE_DYNAMIC, + BUFFERUSAGE_STATIC, + BUFFERUSAGE_MAX_ENUM }; enum DataType @@ -195,6 +192,8 @@ struct XYf_STf_RGBAub Color32 color; }; +typedef XYf_STf_RGBAub Vertex; + struct XYf_STus_RGBAub { float x, y; @@ -334,9 +333,9 @@ bool getConstant(const char *in, IndexDataType &out); bool getConstant(IndexDataType in, const char *&out); std::vector getConstants(IndexDataType); -bool getConstant(const char *in, Usage &out); -bool getConstant(Usage in, const char *&out); -std::vector getConstants(Usage); +bool getConstant(const char *in, BufferUsage &out); +bool getConstant(BufferUsage in, const char *&out); +std::vector getConstants(BufferUsage); bool getConstant(const char *in, PrimitiveType &out); bool getConstant(PrimitiveType in, const char *&out); @@ -358,9 +357,5 @@ bool getConstant(const char *in, Winding &out); bool getConstant(Winding in, const char *&out); std::vector getConstants(Winding); -} // vertex - -typedef vertex::XYf_STf_RGBAub Vertex; - } // graphics } // love diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index f42938b1f..741954b48 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1147,12 +1147,12 @@ int w_newSpriteBatch(lua_State *L) Texture *texture = luax_checktexture(L, 1); int size = (int) luaL_optinteger(L, 2, 1000); - vertex::Usage usage = vertex::USAGE_DYNAMIC; + BufferUsage usage = BUFFERUSAGE_DYNAMIC; if (lua_gettop(L) > 2) { const char *usagestr = luaL_checkstring(L, 3); - if (!vertex::getConstant(usagestr, usage)) - return luax_enumerror(L, "usage hint", vertex::getConstants(usage), usagestr); + if (!getConstant(usagestr, usage)) + return luax_enumerror(L, "usage hint", getConstants(usage), usagestr); } SpriteBatch *t = nullptr; @@ -1421,12 +1421,12 @@ int w_validateShader(lua_State *L) return 1; } -static vertex::Usage luax_optmeshusage(lua_State *L, int idx, vertex::Usage def) +static BufferUsage luax_optmeshusage(lua_State *L, int idx, BufferUsage def) { const char *usagestr = lua_isnoneornil(L, idx) ? nullptr : luaL_checkstring(L, idx); - if (usagestr && !vertex::getConstant(usagestr, def)) - luax_enumerror(L, "usage hint", vertex::getConstants(def), usagestr); + if (usagestr && !getConstant(usagestr, def)) + luax_enumerror(L, "usage hint", getConstants(def), usagestr); return def; } @@ -1435,8 +1435,8 @@ static PrimitiveType luax_optmeshdrawmode(lua_State *L, int idx, PrimitiveType d { const char *modestr = lua_isnoneornil(L, idx) ? nullptr : luaL_checkstring(L, idx); - if (modestr && !vertex::getConstant(modestr, def)) - luax_enumerror(L, "mesh draw mode", vertex::getConstants(def), modestr); + if (modestr && !getConstant(modestr, def)) + luax_enumerror(L, "mesh draw mode", getConstants(def), modestr); return def; } @@ -1446,7 +1446,7 @@ static Mesh *newStandardMesh(lua_State *L) Mesh *t = nullptr; PrimitiveType drawmode = luax_optmeshdrawmode(L, 2, PRIMITIVE_TRIANGLE_FAN); - vertex::Usage usage = luax_optmeshusage(L, 3, vertex::USAGE_DYNAMIC); + BufferUsage usage = luax_optmeshusage(L, 3, BUFFERUSAGE_DYNAMIC); // First argument is a table of standard vertices, or the number of // standard vertices. @@ -1506,7 +1506,7 @@ static Mesh *newCustomMesh(lua_State *L) std::vector vertexformat; PrimitiveType drawmode = luax_optmeshdrawmode(L, 3, PRIMITIVE_TRIANGLE_FAN); - vertex::Usage usage = luax_optmeshusage(L, 4, vertex::USAGE_DYNAMIC); + BufferUsage usage = luax_optmeshusage(L, 4, BUFFERUSAGE_DYNAMIC); lua_rawgeti(L, 1, 1); if (!lua_istable(L, -1)) @@ -1530,10 +1530,10 @@ static Mesh *newCustomMesh(lua_State *L) const char *tname = luaL_checkstring(L, -2); if (strcmp(tname, "byte") == 0) // Legacy name. - format.type = vertex::DATA_UNORM8; - else if (!vertex::getConstant(tname, format.type)) + format.type = DATA_UNORM8; + else if (!getConstant(tname, format.type)) { - luax_enumerror(L, "Mesh vertex data type name", vertex::getConstants(format.type), tname); + luax_enumerror(L, "Mesh vertex data type name", getConstants(format.type), tname); return nullptr; } @@ -2109,8 +2109,8 @@ int w_setMeshCullMode(lua_State *L) const char *str = luaL_checkstring(L, 1); CullMode mode; - if (!vertex::getConstant(str, mode)) - return luax_enumerror(L, "cull mode", vertex::getConstants(mode), str); + if (!getConstant(str, mode)) + return luax_enumerror(L, "cull mode", getConstants(mode), str); luax_catchexcept(L, [&]() { instance()->setMeshCullMode(mode); }); return 0; @@ -2120,7 +2120,7 @@ int w_getMeshCullMode(lua_State *L) { CullMode mode = instance()->getMeshCullMode(); const char *str; - if (!vertex::getConstant(mode, str)) + if (!getConstant(mode, str)) return luaL_error(L, "Unknown cull mode"); lua_pushstring(L, str); return 1; @@ -2129,10 +2129,10 @@ int w_getMeshCullMode(lua_State *L) int w_setFrontFaceWinding(lua_State *L) { const char *str = luaL_checkstring(L, 1); - vertex::Winding winding; + Winding winding; - if (!vertex::getConstant(str, winding)) - return luax_enumerror(L, "vertex winding", vertex::getConstants(winding), str); + if (!getConstant(str, winding)) + return luax_enumerror(L, "vertex winding", getConstants(winding), str); luax_catchexcept(L, [&]() { instance()->setFrontFaceWinding(winding); }); return 0; @@ -2140,9 +2140,9 @@ int w_setFrontFaceWinding(lua_State *L) int w_getFrontFaceWinding(lua_State *L) { - vertex::Winding winding = instance()->getFrontFaceWinding(); + Winding winding = instance()->getFrontFaceWinding(); const char *str; - if (!vertex::getConstant(winding, str)) + if (!getConstant(winding, str)) return luaL_error(L, "Unknown vertex winding"); lua_pushstring(L, str); return 1; diff --git a/src/modules/graphics/wrap_GraphicsShader.lua b/src/modules/graphics/wrap_GraphicsShader.lua index 14a1ba19d..02cb9998b 100644 --- a/src/modules/graphics/wrap_GraphicsShader.lua +++ b/src/modules/graphics/wrap_GraphicsShader.lua @@ -380,6 +380,36 @@ local function isPixelCode(code) end end +local function includeShader(path, dir, global) + +end + +local function preprocessIncludes(code, dir, level) + local output = {} + + local linecount = 0 + for line in code:gmatch("[^\r\n]+") do + linecount = linecount + 1 + + if line:match("^%s*#include") then + local localpath = line:match("^%s*#include%s*\"(.*)\"") + local globalpath = line:match("^%s*#include%s*<(.*)>") + --local + if localpath then + --table_insert(output, ) + elseif globalpath then + + else + + end + else + table_insert(output, line) + end + end + + return table_concat(output, "\n") +end + function love.graphics._shaderCodeToGLSL(gles, arg1, arg2) local vertexcode, pixelcode local is_custompixel = false -- whether pixel code has "effects" function instead of "effect" diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index 9e238dec1..2902dd5ed 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -74,31 +74,31 @@ static inline size_t writeUNormData(lua_State *L, int startidx, int components, return sizeof(T) * components; } -char *luax_writeAttributeData(lua_State *L, int startidx, vertex::DataType type, int components, char *data) +char *luax_writeAttributeData(lua_State *L, int startidx, DataType type, int components, char *data) { switch (type) { - case vertex::DATA_SNORM8: + case DATA_SNORM8: return data + writeSNormData(L, startidx, components, data); - case vertex::DATA_UNORM8: + case DATA_UNORM8: return data + writeUNormData(L, startidx, components, data); - case vertex::DATA_INT8: + case DATA_INT8: return data + writeData(L, startidx, components, data); - case vertex::DATA_UINT8: + case DATA_UINT8: return data + writeData(L, startidx, components, data); - case vertex::DATA_SNORM16: + case DATA_SNORM16: return data + writeSNormData(L, startidx, components, data); - case vertex::DATA_UNORM16: + case DATA_UNORM16: return data + writeUNormData(L, startidx, components, data); - case vertex::DATA_INT16: + case DATA_INT16: return data + writeData(L, startidx, components, data); - case vertex::DATA_UINT16: + case DATA_UINT16: return data + writeData(L, startidx, components, data); - case vertex::DATA_INT32: + case DATA_INT32: return data + writeData(L, startidx, components, data); - case vertex::DATA_UINT32: + case DATA_UINT32: return data + writeData(L, startidx, components, data); - case vertex::DATA_FLOAT: + case DATA_FLOAT: return data + writeData(L, startidx, components, data); default: return data; @@ -140,31 +140,31 @@ static inline size_t readUNormData(lua_State *L, int components, const char *dat return sizeof(T) * components; } -const char *luax_readAttributeData(lua_State *L, vertex::DataType type, int components, const char *data) +const char *luax_readAttributeData(lua_State *L, DataType type, int components, const char *data) { switch (type) { - case vertex::DATA_SNORM8: + case DATA_SNORM8: return data + readSNormData(L, components, data); - case vertex::DATA_UNORM8: + case DATA_UNORM8: return data + readUNormData(L, components, data); - case vertex::DATA_INT8: + case DATA_INT8: return data + readData(L, components, data); - case vertex::DATA_UINT8: + case DATA_UINT8: return data + readData(L, components, data); - case vertex::DATA_SNORM16: + case DATA_SNORM16: return data + readSNormData(L, components, data); - case vertex::DATA_UNORM16: + case DATA_UNORM16: return data + readUNormData(L, components, data); - case vertex::DATA_INT16: + case DATA_INT16: return data + readData(L, components, data); - case vertex::DATA_UINT16: + case DATA_UINT16: return data + readData(L, components, data); - case vertex::DATA_INT32: + case DATA_INT32: return data + readData(L, components, data); - case vertex::DATA_UINT32: + case DATA_UINT32: return data + readData(L, components, data); - case vertex::DATA_FLOAT: + case DATA_FLOAT: return data + readData(L, components, data); default: return data; @@ -321,7 +321,7 @@ int w_Mesh_setVertexAttribute(lua_State *L) size_t vertindex = (size_t) luaL_checkinteger(L, 2) - 1; int attribindex = (int) luaL_checkinteger(L, 3) - 1; - vertex::DataType type; + DataType type; int components; luax_catchexcept(L, [&](){ type = t->getAttributeInfo(attribindex, components); }); @@ -341,7 +341,7 @@ int w_Mesh_getVertexAttribute(lua_State *L) size_t vertindex = (size_t) luaL_checkinteger(L, 2) - 1; int attribindex = (int) luaL_checkinteger(L, 3) - 1; - vertex::DataType type; + DataType type; int components; luax_catchexcept(L, [&](){ type = t->getAttributeInfo(attribindex, components); }); @@ -372,8 +372,8 @@ int w_Mesh_getVertexFormat(lua_State *L) for (size_t i = 0; i < vertexformat.size(); i++) { - if (!vertex::getConstant(vertexformat[i].type, tname)) - return luax_enumerror(L, "vertex attribute data type", vertex::getConstants(vertexformat[i].type), tname); + if (!getConstant(vertexformat[i].type, tname)) + return luax_enumerror(L, "vertex attribute data type", getConstants(vertexformat[i].type), tname); lua_createtable(L, 3, 0); @@ -420,8 +420,8 @@ int w_Mesh_attachAttribute(lua_State *L) AttributeStep step = STEP_PER_VERTEX; const char *stepstr = lua_isnoneornil(L, 4) ? nullptr : luaL_checkstring(L, 4); - if (stepstr != nullptr && !vertex::getConstant(stepstr, step)) - return luax_enumerror(L, "vertex attribute step", vertex::getConstants(step), stepstr); + if (stepstr != nullptr && !getConstant(stepstr, step)) + return luax_enumerror(L, "vertex attribute step", getConstants(step), stepstr); const char *attachname = luaL_optstring(L, 5, name); @@ -463,10 +463,10 @@ int w_Mesh_setVertexMap(lua_State *L) const char *indextypestr = luaL_checkstring(L, 3); IndexDataType indextype; - if (!vertex::getConstant(indextypestr, indextype)) - return luax_enumerror(L, "index data type", vertex::getConstants(indextype), indextypestr); + if (!getConstant(indextypestr, indextype)) + return luax_enumerror(L, "index data type", getConstants(indextype), indextypestr); - size_t datatypesize = vertex::getIndexDataSize(indextype); + size_t datatypesize = getIndexDataSize(indextype); int indexcount = (int) luaL_optinteger(L, 4, d->getSize() / datatypesize); @@ -569,8 +569,8 @@ int w_Mesh_setDrawMode(lua_State *L) const char *str = luaL_checkstring(L, 2); PrimitiveType mode; - if (!vertex::getConstant(str, mode)) - return luax_enumerror(L, "mesh draw mode", vertex::getConstants(mode), str); + if (!getConstant(str, mode)) + return luax_enumerror(L, "mesh draw mode", getConstants(mode), str); t->setDrawMode(mode); return 0; @@ -582,7 +582,7 @@ int w_Mesh_getDrawMode(lua_State *L) PrimitiveType mode = t->getDrawMode(); const char *str; - if (!vertex::getConstant(mode, str)) + if (!getConstant(mode, str)) return luaL_error(L, "Unknown mesh draw mode."); lua_pushstring(L, str); diff --git a/src/modules/graphics/wrap_Mesh.h b/src/modules/graphics/wrap_Mesh.h index 34a18b1b8..b9477c624 100644 --- a/src/modules/graphics/wrap_Mesh.h +++ b/src/modules/graphics/wrap_Mesh.h @@ -30,8 +30,8 @@ namespace love namespace graphics { -char *luax_writeAttributeData(lua_State *L, int startidx, vertex::DataType type, int components, char *data); -const char *luax_readAttributeData(lua_State *L, vertex::DataType type, int components, const char *data); +char *luax_writeAttributeData(lua_State *L, int startidx, DataType type, int components, char *data); +const char *luax_readAttributeData(lua_State *L, DataType type, int components, const char *data); Mesh *luax_checkmesh(lua_State *L, int idx); extern "C" int luaopen_mesh(lua_State *L); From 1bc2b947fc8521754fcdc1c2e90c9fbf1b32c160 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 13 Jan 2020 20:44:39 -0400 Subject: [PATCH 03/54] Rename Attributes struct to VertexAttributes --- src/modules/graphics/Graphics.cpp | 2 +- src/modules/graphics/Graphics.h | 10 +++++----- src/modules/graphics/Mesh.cpp | 6 +++--- src/modules/graphics/ParticleSystem.h | 2 +- src/modules/graphics/SpriteBatch.cpp | 2 +- src/modules/graphics/Text.h | 2 +- src/modules/graphics/opengl/Graphics.cpp | 6 +++--- src/modules/graphics/opengl/Graphics.h | 2 +- src/modules/graphics/opengl/OpenGL.cpp | 4 ++-- src/modules/graphics/opengl/OpenGL.h | 2 +- src/modules/graphics/vertex.cpp | 2 +- src/modules/graphics/vertex.h | 14 +++++++------- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 27bb1108a..dd5396912 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -1133,7 +1133,7 @@ void Graphics::flushStreamDraws() if (sbstate.vertexCount == 0 && sbstate.indexCount == 0) return; - Attributes attributes; + VertexAttributes attributes; BufferBindings buffers; size_t usedsizes[3] = {0, 0, 0}; diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index dd915624c..1ea9607c7 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -212,7 +212,7 @@ public: { PrimitiveType primitiveType = PRIMITIVE_TRIANGLES; - const Attributes *attributes; + const VertexAttributes *attributes; const BufferBindings *buffers; int vertexStart = 0; @@ -224,7 +224,7 @@ public: // TODO: This should be moved out to a state transition API? CullMode cullMode = CULL_NONE; - DrawCommand(const Attributes *attribs, const BufferBindings *buffers) + DrawCommand(const VertexAttributes *attribs, const BufferBindings *buffers) : attributes(attribs) , buffers(buffers) {} @@ -234,7 +234,7 @@ public: { PrimitiveType primitiveType = PRIMITIVE_TRIANGLES; - const Attributes *attributes; + const VertexAttributes *attributes; const BufferBindings *buffers; int indexCount = 0; @@ -249,7 +249,7 @@ public: // TODO: This should be moved out to a state transition API? CullMode cullMode = CULL_NONE; - DrawIndexedCommand(const Attributes *attribs, const BufferBindings *buffers, Resource *indexbuffer) + DrawIndexedCommand(const VertexAttributes *attribs, const BufferBindings *buffers, Resource *indexbuffer) : attributes(attribs) , buffers(buffers) , indexBuffer(indexbuffer) @@ -833,7 +833,7 @@ public: virtual void draw(const DrawCommand &cmd) = 0; virtual void draw(const DrawIndexedCommand &cmd) = 0; - virtual void drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, Texture *texture) = 0; + virtual void drawQuads(int start, int count, const VertexAttributes &attributes, const BufferBindings &buffers, Texture *texture) = 0; void flushStreamDraws(); StreamVertexData requestStreamDraw(const StreamDrawCommand &command); diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 24f90d435..913941461 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -328,8 +328,8 @@ void Mesh::attachAttribute(const std::string &name, Mesh *mesh, const std::strin auto it = attachedAttributes.find(name); if (it != attachedAttributes.end()) oldattrib = it->second; - else if (attachedAttributes.size() + 1 > Attributes::MAX) - throw love::Exception("A maximum of %d attributes can be attached at once.", Attributes::MAX); + else if (attachedAttributes.size() + 1 > VertexAttributes::MAX) + throw love::Exception("A maximum of %d attributes can be attached at once.", VertexAttributes::MAX); newattrib.mesh = mesh; newattrib.enabled = oldattrib.mesh ? oldattrib.enabled : true; @@ -580,7 +580,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) if (Shader::current && texture.get()) Shader::current->checkMainTexture(texture); - Attributes attributes; + VertexAttributes attributes; BufferBindings buffers; int activebuffers = 0; diff --git a/src/modules/graphics/ParticleSystem.h b/src/modules/graphics/ParticleSystem.h index 1a24266b3..07740a3bd 100644 --- a/src/modules/graphics/ParticleSystem.h +++ b/src/modules/graphics/ParticleSystem.h @@ -744,7 +744,7 @@ private: bool relativeRotation; - const Attributes vertexAttributes; + const VertexAttributes vertexAttributes; Buffer *buffer; static StringMap::Entry distributionsEntries[]; diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index aaaf1e7ea..41da30043 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -315,7 +315,7 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) // Make sure the buffer isn't mapped when we draw (sends data to GPU if needed.) array_buf->unmap(); - Attributes attributes; + VertexAttributes attributes; BufferBindings buffers; { diff --git a/src/modules/graphics/Text.h b/src/modules/graphics/Text.h index 3199b0074..0e3259919 100644 --- a/src/modules/graphics/Text.h +++ b/src/modules/graphics/Text.h @@ -85,7 +85,7 @@ private: StrongRef font; - Attributes vertexAttributes; + VertexAttributes vertexAttributes; BufferBindings vertexBuffers; Buffer *vertex_buffer; diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index b2fcba39d..e17028d46 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -385,13 +385,13 @@ void Graphics::draw(const DrawIndexedCommand &cmd) ++drawCalls; } -static inline void advanceVertexOffsets(const Attributes &attributes, BufferBindings &buffers, int vertexcount) +static inline void advanceVertexOffsets(const VertexAttributes &attributes, BufferBindings &buffers, int vertexcount) { // TODO: Figure out a better way to avoid touching the same buffer multiple // times, if multiple attributes share the buffer. uint32 touchedbuffers = 0; - for (unsigned int i = 0; i < Attributes::MAX; i++) + for (unsigned int i = 0; i < VertexAttributes::MAX; i++) { if (!attributes.isEnabled(i)) continue; @@ -408,7 +408,7 @@ static inline void advanceVertexOffsets(const Attributes &attributes, BufferBind } } -void Graphics::drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, love::graphics::Texture *texture) +void Graphics::drawQuads(int start, int count, const VertexAttributes &attributes, const BufferBindings &buffers, love::graphics::Texture *texture) { const int MAX_VERTICES_PER_DRAW = LOVE_UINT16_MAX; const int MAX_QUADS_PER_DRAW = MAX_VERTICES_PER_DRAW / 4; diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index 8f2f69a88..36c63d64c 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -74,7 +74,7 @@ public: void draw(const DrawCommand &cmd) override; void draw(const DrawIndexedCommand &cmd) override; - void drawQuads(int start, int count, const Attributes &attributes, const BufferBindings &buffers, Texture *texture) override; + void drawQuads(int start, int count, const VertexAttributes &attributes, const BufferBindings &buffers, Texture *texture) override; void clear(OptionalColorf color, OptionalInt stencil, OptionalDouble depth) override; void clear(const std::vector &colors, OptionalInt stencil, OptionalDouble depth) override; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 601808254..a2c36d192 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -186,7 +186,7 @@ void OpenGL::setupContext() state.enabledAttribArrays = (uint32) ((1ull << uint32(maxvertexattribs)) - 1); state.instancedAttribArrays = 0; - setVertexAttributes(Attributes(), BufferBindings()); + setVertexAttributes(VertexAttributes(), BufferBindings()); // Get the current viewport. glGetIntegerv(GL_VIEWPORT, (GLint *) &state.viewport.x); @@ -713,7 +713,7 @@ void OpenGL::deleteBuffer(GLuint buffer) } } -void OpenGL::setVertexAttributes(const Attributes &attributes, const BufferBindings &buffers) +void OpenGL::setVertexAttributes(const VertexAttributes &attributes, const BufferBindings &buffers) { uint32 enablediff = attributes.enableBits ^ state.enabledAttribArrays; uint32 instanceattribbits = 0; diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index f174a0b22..264a9fe3b 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -238,7 +238,7 @@ public: /** * Set all vertex attribute state. **/ - void setVertexAttributes(const Attributes &attributes, const BufferBindings &buffers); + void setVertexAttributes(const VertexAttributes &attributes, const BufferBindings &buffers); /** * Wrapper for glCullFace which eliminates redundant state setting. diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index 8366515ce..3e3549c64 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -236,7 +236,7 @@ void fillIndices(TriangleIndexMode mode, uint32 vertexStart, uint32 vertexCount, fillIndicesT(mode, vertexStart, vertexCount, indices); } -void Attributes::setCommonFormat(CommonFormat format, uint8 bufferindex) +void VertexAttributes::setCommonFormat(CommonFormat format, uint8 bufferindex) { setBufferLayout(bufferindex, (uint16) getFormatStride(format)); diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 8c8a6aa80..219193489 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -230,7 +230,7 @@ struct BufferBindings void clear() { useBits = 0; } }; -struct AttributeInfo +struct VertexAttributeInfo { uint8 bufferIndex; DataType type : 4; @@ -238,23 +238,23 @@ struct AttributeInfo uint16 offsetFromVertex; }; -struct BufferLayout +struct VertexBufferLayout { uint16 stride; }; -struct Attributes +struct VertexAttributes { static const uint32 MAX = 32; uint32 enableBits = 0; // indexed by attribute uint32 instanceBits = 0; // indexed by buffer - AttributeInfo attribs[MAX]; - BufferLayout bufferLayouts[BufferBindings::MAX]; + VertexAttributeInfo attribs[MAX]; + VertexBufferLayout bufferLayouts[BufferBindings::MAX]; - Attributes() {} - Attributes(CommonFormat format, uint8 bufferindex) + VertexAttributes() {} + VertexAttributes(CommonFormat format, uint8 bufferindex) { setCommonFormat(format, bufferindex); } From d5d50d2e0d3f3f56bab2822ba4a2532f3a4bbaaa Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 13 Jan 2020 23:20:49 -0400 Subject: [PATCH 04/54] Move DataFormat enum to vertex.h --- src/modules/graphics/Buffer.cpp | 17 ++----- src/modules/graphics/Buffer.h | 89 +-------------------------------- src/modules/graphics/vertex.cpp | 65 ++++++++++++++++++++++++ src/modules/graphics/vertex.h | 87 ++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 100 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index c2950272e..53458a6ab 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -26,13 +26,6 @@ namespace love namespace graphics { -static const Buffer::DataTypeInfo dataTypeInfo[] -{ - // baseType, isMatrix, components, rows, columns, componentSize, packedAlign, packedSize - { Buffer::DATA_BASE_FLOAT, false, 1, 0, 0, sizeof(float), 4, 4 }, // DATA_FLOAT - -}; - love::Type Buffer::type("GraphicsBuffer", &Object::type); Buffer::Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) @@ -65,12 +58,12 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector format; diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index 3e3549c64..c0c13bede 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -101,6 +101,71 @@ int getFormatPositionComponents(CommonFormat format) return 0; } +// Order here relies on order of DataFormat enum. +static const DataFormatInfo dataFormatInfo[] +{ + // baseType, isMatrix, components, rows, columns, componentSize, align, size + { DATA_BASETYPE_FLOAT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_FLOAT + { DATA_BASETYPE_FLOAT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_FLOAT_VEC2 + { DATA_BASETYPE_FLOAT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_FLOAT_VEC3 + { DATA_BASETYPE_FLOAT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_FLOAT_VEC4 + + { DATA_BASETYPE_FLOAT, true, 0, 2, 2, 4, 4, 16 }, // DATAFORMAT_FLOAT_MAT2X2 + { DATA_BASETYPE_FLOAT, true, 0, 2, 3, 4, 4, 24 }, // DATAFORMAT_FLOAT_MAT2X3 + { DATA_BASETYPE_FLOAT, true, 0, 2, 4, 4, 4, 32 }, // DATAFORMAT_FLOAT_MAT2X4 + + { DATA_BASETYPE_FLOAT, true, 0, 3, 2, 4, 4, 24 }, // DATAFORMAT_FLOAT_MAT3X2 + { DATA_BASETYPE_FLOAT, true, 0, 3, 3, 4, 4, 36 }, // DATAFORMAT_FLOAT_MAT3X3 + { DATA_BASETYPE_FLOAT, true, 0, 3, 4, 4, 4, 48 }, // DATAFORMAT_FLOAT_MAT3X4 + + { DATA_BASETYPE_FLOAT, true, 0, 4, 2, 4, 4, 32 }, // DATAFORMAT_FLOAT_MAT4X2 + { DATA_BASETYPE_FLOAT, true, 0, 4, 3, 4, 4, 48 }, // DATAFORMAT_FLOAT_MAT4X3 + { DATA_BASETYPE_FLOAT, true, 0, 4, 4, 4, 4, 64 }, // DATAFORMAT_FLOAT_MAT4X4 + + { DATA_BASETYPE_INT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_INT32 + { DATA_BASETYPE_INT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_INT32_VEC2 + { DATA_BASETYPE_INT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_INT32_VEC3 + { DATA_BASETYPE_INT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_INT32_VEC4 + + { DATA_BASETYPE_UINT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_UINT32 + { DATA_BASETYPE_UINT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_UINT32_VEC2 + { DATA_BASETYPE_UINT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_UINT32_VEC3 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_UINT32_VEC4 + + { DATA_BASETYPE_SNORM, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_SNORM8_VEC4 + { DATA_BASETYPE_UNORM, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_UNORM8_VEC4 + { DATA_BASETYPE_INT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_INT8_VEC4 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_UINT8_VEC4 + + { DATA_BASETYPE_SNORM, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 + { DATA_BASETYPE_SNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 + { DATA_BASETYPE_SNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + + { DATA_BASETYPE_UNORM, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 + { DATA_BASETYPE_UNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 + { DATA_BASETYPE_UNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + + { DATA_BASETYPE_INT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 + { DATA_BASETYPE_INT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 + { DATA_BASETYPE_INT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + + { DATA_BASETYPE_UINT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 + { DATA_BASETYPE_UINT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + + { DATA_BASETYPE_BOOL, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_BOOL + { DATA_BASETYPE_BOOL, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_BOOL_VEC2 + { DATA_BASETYPE_BOOL, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_BOOL_VEC3 + { DATA_BASETYPE_BOOL, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_BOOL_VEC4 +}; + +static_assert((sizeof(dataFormatInfo) / sizeof(DataFormatInfo)) == DATAFORMAT_MAX_ENUM, "dataFormatInfo array size must match number of DataFormat enum values."); + +const DataFormatInfo &getDataFormatInfo(DataFormat format) +{ + return dataFormatInfo[format]; +} + size_t getIndexDataSize(IndexDataType type) { switch (type) diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 219193489..bc5e72301 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -131,6 +131,79 @@ enum DataType DATA_MAX_ENUM }; +// The order of this enum affects the dataFormatInfo array. +enum DataFormat +{ + DATAFORMAT_FLOAT, + DATAFORMAT_FLOAT_VEC2, + DATAFORMAT_FLOAT_VEC3, + DATAFORMAT_FLOAT_VEC4, + + DATAFORMAT_FLOAT_MAT2X2, + DATAFORMAT_FLOAT_MAT2X3, + DATAFORMAT_FLOAT_MAT2X4, + + DATAFORMAT_FLOAT_MAT3X2, + DATAFORMAT_FLOAT_MAT3X3, + DATAFORMAT_FLOAT_MAT3X4, + + DATAFORMAT_FLOAT_MAT4X2, + DATAFORMAT_FLOAT_MAT4X3, + DATAFORMAT_FLOAT_MAT4X4, + + DATAFORMAT_INT32, + DATAFORMAT_INT32_VEC2, + DATAFORMAT_INT32_VEC3, + DATAFORMAT_INT32_VEC4, + + DATAFORMAT_UINT32, + DATAFORMAT_UINT32_VEC2, + DATAFORMAT_UINT32_VEC3, + DATAFORMAT_UINT32_VEC4, + + DATAFORMAT_SNORM8_VEC4, + + DATAFORMAT_UNORM8_VEC4, + + DATAFORMAT_INT8_VEC4, + + DATAFORMAT_UINT8_VEC4, + + DATAFORMAT_SNORM16, + DATAFORMAT_SNORM16_VEC2, + DATAFORMAT_SNORM16_VEC4, + + DATAFORMAT_UNORM16, + DATAFORMAT_UNORM16_VEC2, + DATAFORMAT_UNORM16_VEC4, + + DATAFORMAT_INT16, + DATAFORMAT_INT16_VEC2, + DATAFORMAT_INT16_VEC4, + + DATAFORMAT_UINT16, + DATAFORMAT_UINT16_VEC2, + DATAFORMAT_UINT16_VEC4, + + DATAFORMAT_BOOL, + DATAFORMAT_BOOL_VEC2, + DATAFORMAT_BOOL_VEC3, + DATAFORMAT_BOOL_VEC4, + + DATAFORMAT_MAX_ENUM +}; + +enum DataBaseType +{ + DATA_BASETYPE_FLOAT, + DATA_BASETYPE_INT, + DATA_BASETYPE_UINT, + DATA_BASETYPE_SNORM, + DATA_BASETYPE_UNORM, + DATA_BASETYPE_BOOL, + DATA_BASETYPE_MAX_ENUM +}; + enum Winding { WINDING_CW, @@ -161,6 +234,18 @@ enum class CommonFormat XYf_STPf_RGBAub, }; +struct DataFormatInfo +{ + DataBaseType baseType; + bool isMatrix; + int components; + int matrixRows; + int matrixColumns; + size_t componentSize; + size_t alignment; + size_t size; +}; + struct STf_RGBAub { float s, t; @@ -315,6 +400,8 @@ inline CommonFormat getSinglePositionFormat(bool is2D) return is2D ? CommonFormat::XYf : CommonFormat::XYZf; } +const DataFormatInfo &getDataFormatInfo(DataFormat format); + size_t getIndexDataSize(IndexDataType type); size_t getDataTypeSize(DataType datatype); bool isDataTypeInteger(DataType datatype); From d597275207d0327b4d19f66b847167485543aec2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 15 Jan 2020 23:26:24 -0400 Subject: [PATCH 05/54] Add StringMap for DataFormat --- src/common/StringMap.h | 15 ++ src/modules/graphics/vertex.cpp | 238 ++++++++++++-------------------- src/modules/graphics/vertex.h | 42 ++---- 3 files changed, 118 insertions(+), 177 deletions(-) diff --git a/src/common/StringMap.h b/src/common/StringMap.h index b53b46487..97dbe3c8b 100644 --- a/src/common/StringMap.h +++ b/src/common/StringMap.h @@ -182,6 +182,21 @@ private: }; // StringMap +#define DECLARE_STRINGMAP(type) \ +bool getConstant(const char *in, type &out); \ +bool getConstant(type in, const char *&out); \ +std::vector getConstants(type); \ + +#define DEFINE_STRINGMAP_BEGIN(type, count, name) \ +static StringMap::Entry name##Entries[] = + +#define DEFINE_STRINGMAP_END(type, count, name) \ +; \ +static StringMap name##s(name##Entries, sizeof(name##Entries)); \ +bool getConstant(const char *in, type &out) { return name##s.find(in, out); } \ +bool getConstant(type in, const char *&out) { return name##s.find(in, out); } \ +std::vector getConstants(type) { return name##s.getNames(); } + } // love #endif // LOVE_STRING_MAP_H diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index c0c13bede..cfd7acdbb 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -219,8 +219,7 @@ bool isDataTypeInteger(DataType datatype) IndexDataType getIndexDataTypeFromMax(size_t maxvalue) { - IndexDataType types[] = {INDEX_UINT16, INDEX_UINT32}; - return types[maxvalue > LOVE_UINT16_MAX ? 1 : 0]; + return maxvalue > LOVE_UINT16_MAX ? INDEX_UINT32 : INDEX_UINT16; } int getIndexCount(TriangleIndexMode mode, int vertexCount) @@ -352,51 +351,46 @@ void VertexAttributes::setCommonFormat(CommonFormat format, uint8 bufferindex) } } -static StringMap::Entry attribNameEntries[] = +DEFINE_STRINGMAP_BEGIN(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) { { "VertexPosition", ATTRIB_POS }, { "VertexTexCoord", ATTRIB_TEXCOORD }, { "VertexColor", ATTRIB_COLOR }, -}; +} +DEFINE_STRINGMAP_END(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) -static StringMap attribNames(attribNameEntries, sizeof(attribNameEntries)); - -static StringMap::Entry indexTypeEntries[] = +DEFINE_STRINGMAP_BEGIN(IndexDataType, INDEX_MAX_ENUM, indexType) { { "uint16", INDEX_UINT16 }, { "uint32", INDEX_UINT32 }, -}; +} +DEFINE_STRINGMAP_END(IndexDataType, INDEX_MAX_ENUM, indexType) -static StringMap indexTypes(indexTypeEntries, sizeof(indexTypeEntries)); - -static StringMap::Entry usageEntries[] = +DEFINE_STRINGMAP_BEGIN(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) { { "stream", BUFFERUSAGE_STREAM }, { "dynamic", BUFFERUSAGE_DYNAMIC }, { "static", BUFFERUSAGE_STATIC }, -}; +} +DEFINE_STRINGMAP_END(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) -static StringMap usages(usageEntries, sizeof(usageEntries)); - -static StringMap::Entry primitiveTypeEntries[] = +DEFINE_STRINGMAP_BEGIN(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) { { "fan", PRIMITIVE_TRIANGLE_FAN }, { "strip", PRIMITIVE_TRIANGLE_STRIP }, { "triangles", PRIMITIVE_TRIANGLES }, { "points", PRIMITIVE_POINTS }, -}; +} +DEFINE_STRINGMAP_END(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) -static StringMap primitiveTypes(primitiveTypeEntries, sizeof(primitiveTypeEntries)); - -static StringMap::Entry attributeStepEntries[] = +DEFINE_STRINGMAP_BEGIN(AttributeStep, STEP_MAX_ENUM, attributeStep) { { "pervertex", STEP_PER_VERTEX }, { "perinstance", STEP_PER_INSTANCE }, -}; +} +DEFINE_STRINGMAP_END(AttributeStep, STEP_MAX_ENUM, attributeStep) -static StringMap attributeSteps(attributeStepEntries, sizeof(attributeStepEntries)); - -static StringMap::Entry dataTypeEntries[] = +DEFINE_STRINGMAP_BEGIN(DataType, DATA_MAX_ENUM, dataType) { { "snorm8", DATA_SNORM8 }, { "unorm8", DATA_UNORM8 }, @@ -409,141 +403,91 @@ static StringMap::Entry dataTypeEntries[] = { "int32", DATA_INT32 }, { "uint32", DATA_UINT32 }, { "float", DATA_FLOAT }, -}; +} +DEFINE_STRINGMAP_END(DataType, DATA_MAX_ENUM, dataType) -static StringMap dataTypes(dataTypeEntries, sizeof(dataTypeEntries)); +DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) +{ + { "float", DATAFORMAT_FLOAT }, + { "floatvec2", DATAFORMAT_FLOAT_VEC2 }, + { "floatvec3", DATAFORMAT_FLOAT_VEC3 }, + { "floatvec4", DATAFORMAT_FLOAT_VEC4 }, -static StringMap::Entry cullModeEntries[] = + { "floatmat2x2", DATAFORMAT_FLOAT_MAT2X2 }, + { "floatmat2x3", DATAFORMAT_FLOAT_MAT2X3 }, + { "floatmat2x4", DATAFORMAT_FLOAT_MAT2X4 }, + + { "floatmat3x2", DATAFORMAT_FLOAT_MAT3X2 }, + { "floatmat3x3", DATAFORMAT_FLOAT_MAT3X3 }, + { "floatmat3x4", DATAFORMAT_FLOAT_MAT3X4 }, + + { "floatmat4x2", DATAFORMAT_FLOAT_MAT4X2 }, + { "floatmat4x3", DATAFORMAT_FLOAT_MAT4X3 }, + { "floatmat4x4", DATAFORMAT_FLOAT_MAT4X4 }, + + { "int32", DATAFORMAT_INT32 }, + { "int32vec2", DATAFORMAT_INT32_VEC2 }, + { "int32vec3", DATAFORMAT_INT32_VEC3 }, + { "int32vec4", DATAFORMAT_INT32_VEC4 }, + + { "uint32", DATAFORMAT_UINT32 }, + { "uint32vec2", DATAFORMAT_UINT32_VEC2 }, + { "uint32vec3", DATAFORMAT_UINT32_VEC3 }, + { "uint32vec4", DATAFORMAT_UINT32_VEC4 }, + + { "snorm8vec4", DATAFORMAT_SNORM8_VEC4 }, + { "unorm8vec4", DATAFORMAT_UNORM8_VEC4 }, + { "int8vec4", DATAFORMAT_INT8_VEC4 }, + { "uint8vec4", DATAFORMAT_UINT8_VEC4 }, + + { "snorm16", DATAFORMAT_SNORM16 }, + { "snorm16vec2", DATAFORMAT_SNORM16_VEC2 }, + { "snorm16vec4", DATAFORMAT_SNORM16_VEC4 }, + + { "unorm16", DATAFORMAT_UNORM16 }, + { "unorm16vec2", DATAFORMAT_UNORM16_VEC2 }, + { "unorm16vec4", DATAFORMAT_UNORM16_VEC4 }, + + { "int16", DATAFORMAT_INT16 }, + { "int16vec2", DATAFORMAT_INT16_VEC2 }, + { "int16vec4", DATAFORMAT_INT16_VEC4 }, + + { "uint16", DATAFORMAT_UINT16 }, + { "uint16vec2", DATAFORMAT_UINT16_VEC2 }, + { "uint16vec4", DATAFORMAT_UINT16_VEC4 }, + + { "bool", DATAFORMAT_BOOL }, + { "boolvec2", DATAFORMAT_BOOL_VEC2 }, + { "boolvec3", DATAFORMAT_BOOL_VEC3 }, + { "boolvec4", DATAFORMAT_BOOL_VEC4 }, +} +DEFINE_STRINGMAP_END(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) + +DEFINE_STRINGMAP_BEGIN(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) +{ + { "float", DATA_BASETYPE_FLOAT }, + { "int", DATA_BASETYPE_INT }, + { "uint", DATA_BASETYPE_UINT }, + { "snorm", DATA_BASETYPE_SNORM }, + { "unorm", DATA_BASETYPE_UNORM }, + { "bool", DATA_BASETYPE_BOOL }, +} +DEFINE_STRINGMAP_END(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) + +DEFINE_STRINGMAP_BEGIN(CullMode, CULL_MAX_ENUM, cullMode) { { "none", CULL_NONE }, { "back", CULL_BACK }, { "front", CULL_FRONT }, -}; +} +DEFINE_STRINGMAP_END(CullMode, CULL_MAX_ENUM, cullMode) -static StringMap cullModes(cullModeEntries, sizeof(cullModeEntries)); - -static StringMap::Entry windingEntries[] = +DEFINE_STRINGMAP_BEGIN(Winding, WINDING_MAX_ENUM, winding) { { "cw", WINDING_CW }, { "ccw", WINDING_CCW }, -}; - -static StringMap windings(windingEntries, sizeof(windingEntries)); - -bool getConstant(const char *in, BuiltinVertexAttribute &out) -{ - return attribNames.find(in, out); -} - -bool getConstant(BuiltinVertexAttribute in, const char *&out) -{ - return attribNames.find(in, out); -} - -bool getConstant(const char *in, IndexDataType &out) -{ - return indexTypes.find(in, out); -} - -bool getConstant(IndexDataType in, const char *&out) -{ - return indexTypes.find(in, out); -} - -std::vector getConstants(IndexDataType) -{ - return indexTypes.getNames(); -} - -bool getConstant(const char *in, BufferUsage &out) -{ - return usages.find(in, out); -} - -bool getConstant(BufferUsage in, const char *&out) -{ - return usages.find(in, out); -} - -std::vector getConstants(BufferUsage) -{ - return usages.getNames(); -} - -bool getConstant(const char *in, PrimitiveType &out) -{ - return primitiveTypes.find(in, out); -} - -bool getConstant(PrimitiveType in, const char *&out) -{ - return primitiveTypes.find(in, out); -} - -std::vector getConstants(PrimitiveType) -{ - return primitiveTypes.getNames(); -} - -bool getConstant(const char *in, AttributeStep &out) -{ - return attributeSteps.find(in, out); -} - -bool getConstant(AttributeStep in, const char *&out) -{ - return attributeSteps.find(in, out); -} - -std::vector getConstants(AttributeStep) -{ - return attributeSteps.getNames(); -} - -bool getConstant(const char *in, DataType &out) -{ - return dataTypes.find(in, out); -} - -bool getConstant(DataType in, const char *&out) -{ - return dataTypes.find(in, out); -} - -std::vector getConstants(DataType) -{ - return dataTypes.getNames(); -} - -bool getConstant(const char *in, CullMode &out) -{ - return cullModes.find(in, out); -} - -bool getConstant(CullMode in, const char *&out) -{ - return cullModes.find(in, out); -} - -std::vector getConstants(CullMode) -{ - return cullModes.getNames(); -} - -bool getConstant(const char *in, Winding &out) -{ - return windings.find(in, out); -} - -bool getConstant(Winding in, const char *&out) -{ - return windings.find(in, out); -} - -std::vector getConstants(Winding) -{ - return windings.getNames(); } +DEFINE_STRINGMAP_END(Winding, WINDING_MAX_ENUM, winding) } // graphics } // love diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index bc5e72301..ded03f536 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -23,6 +23,7 @@ // LOVE #include "common/int.h" #include "common/Color.h" +#include "common/StringMap.h" // C #include @@ -131,6 +132,7 @@ enum DataType DATA_MAX_ENUM }; +// Value types used when interfacing with the GPU (vertex and shader data). // The order of this enum affects the dataFormatInfo array. enum DataFormat { @@ -413,36 +415,16 @@ int getIndexCount(TriangleIndexMode mode, int vertexCount); void fillIndices(TriangleIndexMode mode, uint16 vertexStart, uint16 vertexCount, uint16 *indices); void fillIndices(TriangleIndexMode mode, uint32 vertexStart, uint32 vertexCount, uint32 *indices); -bool getConstant(const char *in, BuiltinVertexAttribute &out); -bool getConstant(BuiltinVertexAttribute in, const char *&out); - -bool getConstant(const char *in, IndexDataType &out); -bool getConstant(IndexDataType in, const char *&out); -std::vector getConstants(IndexDataType); - -bool getConstant(const char *in, BufferUsage &out); -bool getConstant(BufferUsage in, const char *&out); -std::vector getConstants(BufferUsage); - -bool getConstant(const char *in, PrimitiveType &out); -bool getConstant(PrimitiveType in, const char *&out); -std::vector getConstants(PrimitiveType); - -bool getConstant(const char *in, AttributeStep &out); -bool getConstant(AttributeStep in, const char *&out); -std::vector getConstants(AttributeStep); - -bool getConstant(const char *in, DataType &out); -bool getConstant(DataType in, const char *&out); -std::vector getConstants(DataType); - -bool getConstant(const char *in, CullMode &out); -bool getConstant(CullMode in, const char *&out); -std::vector getConstants(CullMode); - -bool getConstant(const char *in, Winding &out); -bool getConstant(Winding in, const char *&out); -std::vector getConstants(Winding); +DECLARE_STRINGMAP(BuiltinVertexAttribute); +DECLARE_STRINGMAP(IndexDataType); +DECLARE_STRINGMAP(BufferUsage); +DECLARE_STRINGMAP(PrimitiveType); +DECLARE_STRINGMAP(AttributeStep); +DECLARE_STRINGMAP(DataType); +DECLARE_STRINGMAP(DataFormat); +DECLARE_STRINGMAP(DataBaseType); +DECLARE_STRINGMAP(CullMode); +DECLARE_STRINGMAP(Winding); } // graphics } // love From 816f132c9def34a5417f919c2acf5d6e9c2a6d02 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 18 Jan 2020 17:37:03 -0400 Subject: [PATCH 06/54] Expose GraphicsBuffer type to Lua. It currently doesn't have any methods or any way to access it, yet. --- CMakeLists.txt | 2 + .../xcode/liblove.xcodeproj/project.pbxproj | 10 +++++ src/modules/graphics/wrap_Buffer.cpp | 45 +++++++++++++++++++ src/modules/graphics/wrap_Buffer.h | 37 +++++++++++++++ src/modules/graphics/wrap_Graphics.cpp | 1 + src/modules/graphics/wrap_Graphics.h | 1 + 6 files changed, 96 insertions(+) create mode 100644 src/modules/graphics/wrap_Buffer.cpp create mode 100644 src/modules/graphics/wrap_Buffer.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 72953c5e4..b5fb4786c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,6 +559,8 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT src/modules/graphics/Video.h src/modules/graphics/Volatile.cpp src/modules/graphics/Volatile.h + src/modules/graphics/wrap_Buffer.cpp + src/modules/graphics/wrap_Buffer.h src/modules/graphics/wrap_Canvas.cpp src/modules/graphics/wrap_Canvas.h src/modules/graphics/wrap_Font.cpp diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 79bc992f1..2fa20c99a 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -781,6 +781,9 @@ FA15DFB01F9B8D6A0042AB22 /* wrap_Data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA6A2B651F5F7B6B0074C308 /* wrap_Data.cpp */; }; FA15DFB11F9B8D820042AB22 /* OggDemuxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAA54AC91F91660400A8FA7B /* OggDemuxer.cpp */; }; FA15DFB21F9B8D840042AB22 /* TheoraVideoStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAA54AC81F91660400A8FA7B /* TheoraVideoStream.cpp */; }; + FA18CEC523D3AE6700263725 /* wrap_Buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA18CEC323D3AE6700263725 /* wrap_Buffer.cpp */; }; + FA18CEC623D3AE6800263725 /* wrap_Buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA18CEC323D3AE6700263725 /* wrap_Buffer.cpp */; }; + FA18CEC723D3AE6800263725 /* wrap_Buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = FA18CEC423D3AE6700263725 /* wrap_Buffer.h */; }; FA1BA09D1E16CFCE00AA2803 /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA09B1E16CFCE00AA2803 /* Font.cpp */; }; FA1BA09E1E16CFCE00AA2803 /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA09B1E16CFCE00AA2803 /* Font.cpp */; }; FA1BA09F1E16CFCE00AA2803 /* Font.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1BA09C1E16CFCE00AA2803 /* Font.h */; }; @@ -1801,6 +1804,8 @@ FA1557C11CE90BD200AFF582 /* EXRHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EXRHandler.cpp; sourceTree = ""; }; FA1557C21CE90BD200AFF582 /* EXRHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXRHandler.h; sourceTree = ""; }; FA15DFAB1F9B8C850042AB22 /* StringMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringMap.cpp; sourceTree = ""; }; + FA18CEC323D3AE6700263725 /* wrap_Buffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Buffer.cpp; sourceTree = ""; }; + FA18CEC423D3AE6700263725 /* wrap_Buffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrap_Buffer.h; sourceTree = ""; }; FA1BA09B1E16CFCE00AA2803 /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Font.cpp; sourceTree = ""; }; FA1BA09C1E16CFCE00AA2803 /* Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Font.h; sourceTree = ""; }; FA1BA0A01E16D97500AA2803 /* wrap_Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Font.cpp; sourceTree = ""; }; @@ -2879,6 +2884,8 @@ FADF54061E3D78F700012CC0 /* Video.h */, FA0B7BC01A95902C000E1D17 /* Volatile.cpp */, FA0B7BC11A95902C000E1D17 /* Volatile.h */, + FA18CEC323D3AE6700263725 /* wrap_Buffer.cpp */, + FA18CEC423D3AE6700263725 /* wrap_Buffer.h */, FA1BA0AA1E16F9EE00AA2803 /* wrap_Canvas.cpp */, FA1BA0AB1E16F9EE00AA2803 /* wrap_Canvas.h */, FA1BA0A01E16D97500AA2803 /* wrap_Font.cpp */, @@ -3967,6 +3974,7 @@ FA0B7A631A958EA3000E1D17 /* b2ContactManager.h in Headers */, FA0B7E771A95902C000E1D17 /* wrap_WeldJoint.h in Headers */, FA0B7A911A958EA3000E1D17 /* b2FrictionJoint.h in Headers */, + FA18CEC723D3AE6800263725 /* wrap_Buffer.h in Headers */, FA0B7E291A95902C000E1D17 /* PulleyJoint.h in Headers */, FA6BDE5C1F31725300786805 /* Color.h in Headers */, FA0B7E231A95902C000E1D17 /* PolygonShape.h in Headers */, @@ -4539,6 +4547,7 @@ FAF6C9E023C2DE2900D7B5BC /* SpvTools.cpp in Sources */, FAE64A8F2071364200BC7981 /* physfs_platform_unix.c in Sources */, FA0B7A681A958EA3000E1D17 /* b2Island.cpp in Sources */, + FA18CEC623D3AE6800263725 /* wrap_Buffer.cpp in Sources */, FA0B7E2B1A95902C000E1D17 /* RevoluteJoint.cpp in Sources */, FA0B7B291A958EA3000E1D17 /* simplexnoise1234.cpp in Sources */, FA0B7D261A95902C000E1D17 /* wrap_Font.cpp in Sources */, @@ -4794,6 +4803,7 @@ FAF140A91E20934C00F898D2 /* SymbolTable.cpp in Sources */, FA0B7E181A95902C000E1D17 /* MotorJoint.cpp in Sources */, FA0B7E4E1A95902C000E1D17 /* wrap_Fixture.cpp in Sources */, + FA18CEC523D3AE6700263725 /* wrap_Buffer.cpp in Sources */, FAF6C9F423C2DE2900D7B5BC /* Logger.cpp in Sources */, FA0B7EBE1A95902C000E1D17 /* Thread.cpp in Sources */, FAC7CD8F1FE35E95006A60C7 /* physfs_platform_posix.c in Sources */, diff --git a/src/modules/graphics/wrap_Buffer.cpp b/src/modules/graphics/wrap_Buffer.cpp new file mode 100644 index 000000000..7b69a6519 --- /dev/null +++ b/src/modules/graphics/wrap_Buffer.cpp @@ -0,0 +1,45 @@ +/** +* Copyright (c) 2006-2020 LOVE Development Team +* +* This software is provided 'as-is', without any express or implied +* warranty. In no event will the authors be held liable for any damages +* arising from the use of this software. +* +* Permission is granted to anyone to use this software for any purpose, +* including commercial applications, and to alter it and redistribute it +* freely, subject to the following restrictions: +* +* 1. The origin of this software must not be misrepresented; you must not +* claim that you wrote the original software. If you use this software +* in a product, an acknowledgment in the product documentation would be +* appreciated but is not required. +* 2. Altered source versions must be plainly marked as such, and must not be +* misrepresented as being the original software. +* 3. This notice may not be removed or altered from any source distribution. +**/ + +#include "wrap_Buffer.h" +#include "Buffer.h" + +namespace love +{ +namespace graphics +{ + +Buffer *luax_checkbuffer(lua_State *L, int idx) +{ + return luax_checktype(L, idx); +} + +static const luaL_Reg w_Buffer_functions[] = +{ + { 0, 0 } +}; + +extern "C" int luaopen_graphicsbuffer(lua_State *L) +{ + return luax_register_type(L, &Buffer::type, w_Buffer_functions, nullptr); +} + +} // graphics +} // love diff --git a/src/modules/graphics/wrap_Buffer.h b/src/modules/graphics/wrap_Buffer.h new file mode 100644 index 000000000..6a0d42412 --- /dev/null +++ b/src/modules/graphics/wrap_Buffer.h @@ -0,0 +1,37 @@ +/** +* Copyright (c) 2006-2020 LOVE Development Team +* +* This software is provided 'as-is', without any express or implied +* warranty. In no event will the authors be held liable for any damages +* arising from the use of this software. +* +* Permission is granted to anyone to use this software for any purpose, +* including commercial applications, and to alter it and redistribute it +* freely, subject to the following restrictions: +* +* 1. The origin of this software must not be misrepresented; you must not +* claim that you wrote the original software. If you use this software +* in a product, an acknowledgment in the product documentation would be +* appreciated but is not required. +* 2. Altered source versions must be plainly marked as such, and must not be +* misrepresented as being the original software. +* 3. This notice may not be removed or altered from any source distribution. +**/ + +#pragma once + +// LOVE +#include "common/runtime.h" + +namespace love +{ +namespace graphics +{ + +class Buffer; + +Buffer *luax_checkbuffer(lua_State *L, int idx); +extern "C" int luaopen_graphicsbuffer(lua_State *L); + +} // graphics +} // love diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 741954b48..0ea9e52c0 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -3134,6 +3134,7 @@ static const lua_CFunction types[] = luaopen_font, luaopen_image, luaopen_quad, + luaopen_graphicsbuffer, luaopen_spritebatch, luaopen_particlesystem, luaopen_canvas, diff --git a/src/modules/graphics/wrap_Graphics.h b/src/modules/graphics/wrap_Graphics.h index 7359ef652..7876f3040 100644 --- a/src/modules/graphics/wrap_Graphics.h +++ b/src/modules/graphics/wrap_Graphics.h @@ -32,6 +32,7 @@ #include "wrap_Mesh.h" #include "wrap_Text.h" #include "wrap_Video.h" +#include "wrap_Buffer.h" #include "Graphics.h" namespace love From 25d9ae2ba0ed28e5430c2e19cbce5a82d44e486e Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 19 Jan 2020 15:03:19 -0400 Subject: [PATCH 07/54] Meshes expose vertex buffers, part 1 (compiles, but is currently half-implemented and broken) --- src/modules/graphics/Buffer.cpp | 29 +++- src/modules/graphics/Buffer.h | 12 +- src/modules/graphics/Mesh.cpp | 63 ++++---- src/modules/graphics/Mesh.h | 10 +- src/modules/graphics/SpriteBatch.cpp | 34 +++-- src/modules/graphics/SpriteBatch.h | 4 +- src/modules/graphics/opengl/OpenGL.cpp | 175 +++++++++++++++++----- src/modules/graphics/opengl/OpenGL.h | 2 +- src/modules/graphics/vertex.cpp | 40 ++--- src/modules/graphics/vertex.h | 8 +- src/modules/graphics/wrap_Mesh.cpp | 14 +- src/modules/graphics/wrap_SpriteBatch.cpp | 14 +- 12 files changed, 277 insertions(+), 128 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 53458a6ab..d57416564 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -29,7 +29,9 @@ namespace graphics love::Type Buffer::type("GraphicsBuffer", &Object::type); Buffer::Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) - : size(size) + : arrayLength(0) + , arrayStride(0) + , size(size) , typeFlags(typeflags) , usage(usage) , mapFlags(mapflags) @@ -37,12 +39,14 @@ Buffer::Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 { } -Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength) +Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &dataMembers, size_t arraylength) : Buffer(0, settings.typeFlags, settings.usage, settings.mapFlags) { - if (format.size() == 0) + if (dataMembers.size() == 0) throw love::Exception("Data format must contain values."); + this->dataMembers = dataMembers; + bool supportsGLSL3 = gfx->getCapabilities().features[Graphics::FEATURE_GLSL3]; bool uniformbuffer = settings.typeFlags & BUFFERFLAG_UNIFORM; @@ -50,13 +54,13 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 1) + if (indexbuffer && dataMembers.size() > 1) throw love::Exception("test"); size_t offset = 0; size_t stride = 0; - for (const auto &member : format) + for (const auto &member : dataMembers) { DataFormat format = member.format; const DataFormatInfo &info = getDataFormatInfo(format); @@ -85,11 +89,26 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vectorarrayLength = arraylength; + this->arrayStride = stride; + this->size = stride * arraylength; } Buffer::~Buffer() { } +int Buffer::getDataMemberIndex(const std::string &name) const +{ + for (size_t i = 0; i < dataMembers.size(); i++) + { + if (dataMembers[i].name == name) + return (int) i; + } + + return -1; +} + } // graphics } // love diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 9d16107eb..857444fe0 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -69,7 +69,7 @@ public: }; Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags); - Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t arraylength); + Buffer(Graphics *gfx, const Settings &settings, const std::vector &members, size_t arraylength); virtual ~Buffer(); size_t getSize() const { return size; } @@ -78,6 +78,13 @@ public: bool isMapped() const { return mapped; } uint32 getMapFlags() const { return mapFlags; } + size_t getArrayLength() const { return arrayLength; } + size_t getArrayStride() const { return arrayStride; } + const std::vector &getDataMembers() const { return dataMembers; } + const DataMember &getDataMember(int index) const { return dataMembers[index]; } + size_t getMemberOffset(int index) const { return memberOffsets[index]; } + int getDataMemberIndex(const std::string &name) const; + /** * Map the Buffer to client memory. * @@ -138,8 +145,9 @@ public: protected: - std::vector format; + std::vector dataMembers; std::vector memberOffsets; + size_t arrayLength; size_t arrayStride; // The size of the buffer, in bytes. diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 913941461..13c7477a4 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -125,8 +125,8 @@ Mesh::~Mesh() for (const auto &attrib : attachedAttributes) { - if (attrib.second.mesh != this) - attrib.second.mesh->release(); + if (attrib.second.buffer != nullptr && attrib.second.buffer != vertexBuffer.get()) + attrib.second.buffer->release(); } } @@ -139,7 +139,7 @@ void Mesh::setupAttachedAttributes() if (attachedAttributes.find(name) != attachedAttributes.end()) throw love::Exception("Duplicate vertex attribute name: %s", name.c_str()); - attachedAttributes[name] = {this, (int) i, STEP_PER_VERTEX, true}; + attachedAttributes[name] = {nullptr, (int) i, STEP_PER_VERTEX, true}; } } @@ -260,6 +260,11 @@ size_t Mesh::getVertexStride() const return vertexStride; } +Buffer *Mesh::getVertexBuffer() const +{ + return vertexBuffer; +} + const std::vector &Mesh::getVertexFormat() const { return vertexFormat; @@ -305,23 +310,15 @@ bool Mesh::isAttributeEnabled(const std::string &name) const return it->second.enabled; } -void Mesh::attachAttribute(const std::string &name, Mesh *mesh, const std::string &attachname, AttributeStep step) +void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step) { + if ((buffer->getTypeFlags() & BUFFER_VERTEX) == 0) + throw love::Exception("GraphicsBuffer must be created with vertex buffer support to be used as a Mesh vertex attribute."); + auto gfx = Module::getInstance(Module::M_GRAPHICS); if (step == STEP_PER_INSTANCE && !gfx->getCapabilities().features[Graphics::FEATURE_INSTANCING]) throw love::Exception("Vertex attribute instancing is not supported on this system."); - if (mesh != this) - { - for (const auto &it : mesh->attachedAttributes) - { - // If the supplied Mesh has attached attributes of its own, then we - // prevent it from being attached to avoid reference cycles. - if (it.second.mesh != mesh) - throw love::Exception("Cannot attach a Mesh which has attached Meshes of its own."); - } - } - AttachedAttribute oldattrib = {}; AttachedAttribute newattrib = {}; @@ -331,34 +328,33 @@ void Mesh::attachAttribute(const std::string &name, Mesh *mesh, const std::strin else if (attachedAttributes.size() + 1 > VertexAttributes::MAX) throw love::Exception("A maximum of %d attributes can be attached at once.", VertexAttributes::MAX); - newattrib.mesh = mesh; - newattrib.enabled = oldattrib.mesh ? oldattrib.enabled : true; - newattrib.index = mesh->getAttributeIndex(attachname); + newattrib.buffer = buffer; + newattrib.enabled = oldattrib.buffer ? oldattrib.enabled : true; + newattrib.index = buffer->getDataMemberIndex(attachname); newattrib.step = step; if (newattrib.index < 0) - throw love::Exception("The specified mesh does not have a vertex attribute named '%s'", attachname.c_str()); + throw love::Exception("The specified vertex buffer does not have a vertex attribute named '%s'", attachname.c_str()); - if (newattrib.mesh != this) - newattrib.mesh->retain(); + newattrib.buffer->retain(); attachedAttributes[name] = newattrib; - if (oldattrib.mesh && oldattrib.mesh != this) - oldattrib.mesh->release(); + if (oldattrib.buffer) + oldattrib.buffer->release(); } bool Mesh::detachAttribute(const std::string &name) { auto it = attachedAttributes.find(name); - if (it != attachedAttributes.end() && it->second.mesh != this) + if (it != attachedAttributes.end() && it->second.buffer != vertexBuffer.get()) { - it->second.mesh->release(); + it->second.buffer->release(); attachedAttributes.erase(it); if (getAttributeIndex(name) != -1) - attachAttribute(name, this, name); + attachAttribute(name, vertexBuffer, name); return true; } @@ -590,7 +586,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) if (!attrib.second.enabled) continue; - Mesh *mesh = attrib.second.mesh; + Buffer *buffer = attrib.second.buffer; int attributeindex = -1; // If the attribute is one of the LOVE-defined ones, use the constant @@ -604,19 +600,18 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) if (attributeindex >= 0) { // Make sure the buffer isn't mapped (sends data to GPU if needed.) - mesh->vertexBuffer->unmap(); + buffer->unmap(); - const auto &formats = mesh->getVertexFormat(); - const auto &format = formats[attrib.second.index]; + const auto &member = buffer->getDataMember(attrib.second.index); - uint16 offset = (uint16) mesh->getAttributeOffset(attrib.second.index); - uint16 stride = (uint16) mesh->getVertexStride(); + uint16 offset = (uint16) buffer->getMemberOffset(attrib.second.index); + uint16 stride = (uint16) buffer->getArrayStride(); - attributes.set(attributeindex, format.type, (uint8) format.components, offset, activebuffers); + attributes.set(attributeindex, member.format, offset, activebuffers); attributes.setBufferLayout(activebuffers, stride, attrib.second.step); // TODO: Ideally we want to reuse buffers with the same stride+step. - buffers.set(activebuffers, mesh->vertexBuffer, 0); + buffers.set(activebuffers, buffer, 0); activebuffers++; } } diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 728dc0993..a0a16bb06 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -92,6 +92,8 @@ public: **/ size_t getVertexStride() const; + Buffer *getVertexBuffer() const; + /** * Gets the format of each vertex attribute stored in the Mesh. **/ @@ -106,10 +108,10 @@ public: bool isAttributeEnabled(const std::string &name) const; /** - * Attaches a vertex attribute from another Mesh to this one. The attribute - * will be used when drawing this Mesh. + * Attaches a vertex attribute from another vertex buffer to this Mesh. The + * attribute will be used when drawing this Mesh. **/ - void attachAttribute(const std::string &name, Mesh *mesh, const std::string &attachname, AttributeStep step = STEP_PER_VERTEX); + void attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step = STEP_PER_VERTEX); bool detachAttribute(const std::string &name); void *mapVertexData(); @@ -180,7 +182,7 @@ private: struct AttachedAttribute { - Mesh *mesh; + Buffer *buffer; int index; AttributeStep step; bool enabled; diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index 41da30043..50ee28123 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -244,24 +244,27 @@ int SpriteBatch::getBufferSize() const return size; } -void SpriteBatch::attachAttribute(const std::string &name, Mesh *mesh) +void SpriteBatch::attachAttribute(const std::string &name, Buffer *buffer) { + if ((buffer->getTypeFlags() & BUFFER_VERTEX) == 0) + throw love::Exception("GraphicsBuffer must be created with vertex buffer support to be used as a SpriteBatch vertex attribute."); + AttachedAttribute oldattrib = {}; AttachedAttribute newattrib = {}; - if (mesh->getVertexCount() < (size_t) next * 4) - throw love::Exception("Mesh has too few vertices to be attached to this SpriteBatch (at least %d vertices are required)", next*4); + if (buffer->getArrayLength() < (size_t) next * 4) + throw love::Exception("Buffer has too few vertices to be attached to this SpriteBatch (at least %d vertices are required)", next*4); auto it = attached_attributes.find(name); if (it != attached_attributes.end()) oldattrib = it->second; - newattrib.index = mesh->getAttributeIndex(name); + newattrib.index = buffer->getDataMemberIndex(name); if (newattrib.index < 0) - throw love::Exception("The specified mesh does not have a vertex attribute named '%s'", name.c_str()); + throw love::Exception("The specified Buffer does not have a vertex attribute named '%s'", name.c_str()); - newattrib.mesh = mesh; + newattrib.buffer = buffer; attached_attributes[name] = newattrib; } @@ -327,12 +330,12 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) for (const auto &it : attached_attributes) { - Mesh *mesh = it.second.mesh.get(); + Buffer *buffer = it.second.buffer.get(); // We have to do this check here as wll because setBufferSize can be // called after attachAttribute. - if (mesh->getVertexCount() < (size_t) next * 4) - throw love::Exception("Mesh with attribute '%s' attached to this SpriteBatch has too few vertices", it.first.c_str()); + if (buffer->getArrayLength() < (size_t) next * 4) + throw love::Exception("Buffer with attribute '%s' attached to this SpriteBatch has too few vertices", it.first.c_str()); int attributeindex = -1; @@ -347,19 +350,18 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) if (attributeindex >= 0) { // Make sure the buffer isn't mapped (sends data to GPU if needed.) - mesh->vertexBuffer->unmap(); + buffer->unmap(); - const auto &formats = mesh->getVertexFormat(); - const auto &format = formats[it.second.index]; + const auto &member = buffer->getDataMember(it.second.index); - uint16 offset = (uint16) mesh->getAttributeOffset(it.second.index); - uint16 stride = (uint16) mesh->getVertexStride(); + uint16 offset = (uint16) buffer->getMemberOffset(it.second.index); + uint16 stride = (uint16) buffer->getArrayStride(); - attributes.set(attributeindex, format.type, (uint8) format.components, offset, activebuffers); + attributes.set(attributeindex, member.format, offset, activebuffers); attributes.setBufferLayout(activebuffers, stride); // TODO: We should reuse buffer bindings with the same buffer+stride+step. - buffers.set(activebuffers, mesh->vertexBuffer, 0); + buffers.set(activebuffers, buffer, 0); activebuffers++; } } diff --git a/src/modules/graphics/SpriteBatch.h b/src/modules/graphics/SpriteBatch.h index f5b9db48f..40fbfd932 100644 --- a/src/modules/graphics/SpriteBatch.h +++ b/src/modules/graphics/SpriteBatch.h @@ -93,7 +93,7 @@ public: * Attaches a specific vertex attribute from a Mesh to this SpriteBatch. * The vertex attribute will be used when drawing the SpriteBatch. **/ - void attachAttribute(const std::string &name, Mesh *mesh); + void attachAttribute(const std::string &name, Buffer *buffer); void setDrawRange(int start, int count); void setDrawRange(); @@ -106,7 +106,7 @@ private: struct AttachedAttribute { - StrongRef mesh; + StrongRef buffer; int index; }; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index a2c36d192..620372012 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -631,47 +631,151 @@ GLenum OpenGL::getGLIndexDataType(IndexDataType type) } } -GLenum OpenGL::getGLVertexDataType(DataType type, GLboolean &normalized, bool &intformat) +GLenum OpenGL::getGLVertexDataType(DataFormat format, int &components, GLboolean &normalized, bool &intformat) { normalized = GL_FALSE; intformat = false; + components = 1; - switch (type) + switch (format) { - case DATA_SNORM8: - normalized = GL_TRUE; - return GL_BYTE; - case DATA_UNORM8: - normalized = GL_TRUE; - return GL_UNSIGNED_BYTE; - case DATA_INT8: - intformat = true; - return GL_BYTE; - case DATA_UINT8: - intformat = true; - return GL_UNSIGNED_BYTE; - case DATA_SNORM16: - normalized = GL_TRUE; - return GL_SHORT; - case DATA_UNORM16: - normalized = GL_TRUE; - return GL_UNSIGNED_SHORT; - case DATA_INT16: - intformat = true; - return GL_SHORT; - case DATA_UINT16: - intformat = true; - return GL_UNSIGNED_SHORT; - case DATA_INT32: + case DATAFORMAT_FLOAT: + components = 1; + return GL_FLOAT; + case DATAFORMAT_FLOAT_VEC2: + components = 2; + return GL_FLOAT; + case DATAFORMAT_FLOAT_VEC3: + components = 3; + return GL_FLOAT; + case DATAFORMAT_FLOAT_VEC4: + components = 4; + return GL_FLOAT; + + case DATAFORMAT_FLOAT_MAT2X2: + case DATAFORMAT_FLOAT_MAT2X3: + case DATAFORMAT_FLOAT_MAT2X4: + case DATAFORMAT_FLOAT_MAT3X2: + case DATAFORMAT_FLOAT_MAT3X3: + case DATAFORMAT_FLOAT_MAT3X4: + case DATAFORMAT_FLOAT_MAT4X2: + case DATAFORMAT_FLOAT_MAT4X3: + case DATAFORMAT_FLOAT_MAT4X4: + return GL_ZERO; + + case DATAFORMAT_INT32: + components = 1; intformat = true; return GL_INT; - case DATA_UINT32: + case DATAFORMAT_INT32_VEC2: + components = 2; + intformat = true; + return GL_INT; + case DATAFORMAT_INT32_VEC3: + components = 3; + intformat = true; + return GL_INT; + case DATAFORMAT_INT32_VEC4: + components = 4; + intformat = true; + return GL_INT; + + case DATAFORMAT_UINT32: + components = 1; intformat = true; return GL_UNSIGNED_INT; - case DATA_FLOAT: - normalized = GL_FALSE; - return GL_FLOAT; - case DATA_MAX_ENUM: + case DATAFORMAT_UINT32_VEC2: + components = 2; + intformat = true; + return GL_UNSIGNED_INT; + case DATAFORMAT_UINT32_VEC3: + components = 3; + intformat = true; + return GL_UNSIGNED_INT; + case DATAFORMAT_UINT32_VEC4: + components = 4; + intformat = true; + return GL_UNSIGNED_INT; + + case DATAFORMAT_SNORM8_VEC4: + components = 4; + normalized = GL_TRUE; + return GL_BYTE; + + case DATAFORMAT_UNORM8_VEC4: + components = 4; + normalized = GL_TRUE; + return GL_UNSIGNED_BYTE; + + case DATAFORMAT_INT8_VEC4: + components = 4; + intformat = true; + return GL_BYTE; + + case DATAFORMAT_UINT8_VEC4: + components = 4; + intformat = true; + return GL_UNSIGNED_BYTE; + + case DATAFORMAT_SNORM16: + components = 1; + normalized = GL_TRUE; + return GL_SHORT; + case DATAFORMAT_SNORM16_VEC2: + components = 2; + normalized = GL_TRUE; + return GL_BYTE; + case DATAFORMAT_SNORM16_VEC4: + components = 4; + normalized = GL_TRUE; + return GL_BYTE; + + case DATAFORMAT_UNORM16: + components = 1; + normalized = GL_TRUE; + return GL_UNSIGNED_SHORT; + case DATAFORMAT_UNORM16_VEC2: + components = 2; + normalized = GL_TRUE; + return GL_UNSIGNED_SHORT; + case DATAFORMAT_UNORM16_VEC4: + components = 4; + normalized = GL_TRUE; + return GL_UNSIGNED_SHORT; + + case DATAFORMAT_INT16: + components = 1; + intformat = true; + return GL_SHORT; + case DATAFORMAT_INT16_VEC2: + components = 2; + intformat = true; + return GL_SHORT; + case DATAFORMAT_INT16_VEC4: + components = 4; + intformat = true; + return GL_SHORT; + + case DATAFORMAT_UINT16: + components = 1; + intformat = true; + return GL_UNSIGNED_SHORT; + case DATAFORMAT_UINT16_VEC2: + components = 2; + intformat = true; + return GL_UNSIGNED_SHORT; + case DATAFORMAT_UINT16_VEC4: + components = 4; + intformat = true; + return GL_UNSIGNED_SHORT; + + case DATAFORMAT_BOOL: + case DATAFORMAT_BOOL_VEC2: + case DATAFORMAT_BOOL_VEC3: + case DATAFORMAT_BOOL_VEC4: + return GL_ZERO; + + case DATAFORMAT_MAX_ENUM: return GL_ZERO; } @@ -746,18 +850,19 @@ void OpenGL::setVertexAttributes(const VertexAttributes &attributes, const Buffe if ((state.instancedAttribArrays & bit) ^ divisorbit) glVertexAttribDivisor(i, divisor); + int components = 0; GLboolean normalized = GL_FALSE; bool intformat = false; - GLenum gltype = getGLVertexDataType(attrib.type, normalized, intformat); + GLenum gltype = getGLVertexDataType(attrib.format, components, normalized, intformat); const void *offsetpointer = reinterpret_cast(bufferinfo.offset + attrib.offsetFromVertex); bindBuffer(BUFFER_VERTEX, (GLuint) bufferinfo.buffer->getHandle()); if (intformat) - glVertexAttribIPointer(i, attrib.components, gltype, layout.stride, offsetpointer); + glVertexAttribIPointer(i, components, gltype, layout.stride, offsetpointer); else - glVertexAttribPointer(i, attrib.components, gltype, normalized, layout.stride, offsetpointer); + glVertexAttribPointer(i, components, gltype, normalized, layout.stride, offsetpointer); } i++; diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index 264a9fe3b..01faf8a37 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -404,7 +404,7 @@ public: static GLenum getGLPrimitiveType(PrimitiveType type); static GLenum getGLBufferType(BufferType type); static GLenum getGLIndexDataType(IndexDataType type); - static GLenum getGLVertexDataType(DataType type, GLboolean &normalized, bool &intformat); + static GLenum getGLVertexDataType(DataFormat format, int &components, GLboolean &normalized, bool &intformat); static GLenum getGLBufferUsage(BufferUsage usage); static GLenum getGLTextureType(TextureType type); static GLint getGLWrapMode(Texture::WrapMode wmode); diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index cfd7acdbb..42ab2f153 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -309,44 +309,44 @@ void VertexAttributes::setCommonFormat(CommonFormat format, uint8 bufferindex) case CommonFormat::NONE: break; case CommonFormat::XYf: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); break; case CommonFormat::XYZf: - set(ATTRIB_POS, DATA_FLOAT, 3, 0, bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC3, 0, bufferindex); break; case CommonFormat::RGBAub: - set(ATTRIB_COLOR, DATA_UNORM8, 4, 0, bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, 0, bufferindex); break; case CommonFormat::STf_RGBAub: - set(ATTRIB_TEXCOORD, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_COLOR, DATA_UNORM8, 4, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, uint16(sizeof(float) * 2), bufferindex); break; case CommonFormat::STPf_RGBAub: - set(ATTRIB_TEXCOORD, DATA_FLOAT, 3, 0, bufferindex); - set(ATTRIB_COLOR, DATA_UNORM8, 4, uint16(sizeof(float) * 3), bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC3, 0, bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, uint16(sizeof(float) * 3), bufferindex); break; case CommonFormat::XYf_STf: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_TEXCOORD, DATA_FLOAT, 2, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC2, uint16(sizeof(float) * 2), bufferindex); break; case CommonFormat::XYf_STPf: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_TEXCOORD, DATA_FLOAT, 3, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC3, uint16(sizeof(float) * 2), bufferindex); break; case CommonFormat::XYf_STf_RGBAub: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_TEXCOORD, DATA_FLOAT, 2, uint16(sizeof(float) * 2), bufferindex); - set(ATTRIB_COLOR, DATA_UNORM8, 4, uint16(sizeof(float) * 4), bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC2, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, uint16(sizeof(float) * 4), bufferindex); break; case CommonFormat::XYf_STus_RGBAub: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_TEXCOORD, DATA_UNORM16, 2, uint16(sizeof(float) * 2), bufferindex); - set(ATTRIB_COLOR, DATA_UNORM8, 4, uint16(sizeof(float) * 2 + sizeof(uint16) * 2), bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_UNORM16_VEC2, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, uint16(sizeof(float) * 2 + sizeof(uint16) * 2), bufferindex); break; case CommonFormat::XYf_STPf_RGBAub: - set(ATTRIB_POS, DATA_FLOAT, 2, 0, bufferindex); - set(ATTRIB_TEXCOORD, DATA_FLOAT, 3, uint16(sizeof(float) * 2), bufferindex); - set(ATTRIB_COLOR, DATA_UNORM8, 4, uint16(sizeof(float) * 5), bufferindex); + set(ATTRIB_POS, DATAFORMAT_FLOAT_VEC2, 0, bufferindex); + set(ATTRIB_TEXCOORD, DATAFORMAT_FLOAT_VEC3, uint16(sizeof(float) * 2), bufferindex); + set(ATTRIB_COLOR, DATAFORMAT_UNORM8_VEC4, uint16(sizeof(float) * 5), bufferindex); break; } } diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index ded03f536..aacd0f53f 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -320,8 +320,7 @@ struct BufferBindings struct VertexAttributeInfo { uint8 bufferIndex; - DataType type : 4; - uint8 components : 4; + DataFormat format : 8; uint16 offsetFromVertex; }; @@ -346,13 +345,12 @@ struct VertexAttributes setCommonFormat(format, bufferindex); } - void set(uint32 index, DataType type, uint8 components, uint16 offsetfromvertex, uint8 bufferindex) + void set(uint32 index, DataFormat format, uint16 offsetfromvertex, uint8 bufferindex) { enableBits |= (1u << index); attribs[index].bufferIndex = bufferindex; - attribs[index].type = type; - attribs[index].components = components; + attribs[index].format = format; attribs[index].offsetFromVertex = offsetfromvertex; } diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index 2902dd5ed..8bad4cbfa 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -416,7 +416,17 @@ int w_Mesh_attachAttribute(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); const char *name = luaL_checkstring(L, 2); - Mesh *mesh = luax_checkmesh(L, 3); + + Buffer *buffer = nullptr; + if (luax_istype(L, 3, Buffer::type)) + { + buffer = luax_checktype(L, 3); + } + else + { + Mesh *mesh = luax_checkmesh(L, 3); + buffer = mesh->getVertexBuffer(); + } AttributeStep step = STEP_PER_VERTEX; const char *stepstr = lua_isnoneornil(L, 4) ? nullptr : luaL_checkstring(L, 4); @@ -425,7 +435,7 @@ int w_Mesh_attachAttribute(lua_State *L) const char *attachname = luaL_optstring(L, 5, name); - luax_catchexcept(L, [&](){ t->attachAttribute(name, mesh, attachname, step); }); + luax_catchexcept(L, [&](){ t->attachAttribute(name, buffer, attachname, step); }); return 0; } diff --git a/src/modules/graphics/wrap_SpriteBatch.cpp b/src/modules/graphics/wrap_SpriteBatch.cpp index 7986f042e..598c45d7a 100644 --- a/src/modules/graphics/wrap_SpriteBatch.cpp +++ b/src/modules/graphics/wrap_SpriteBatch.cpp @@ -226,9 +226,19 @@ int w_SpriteBatch_attachAttribute(lua_State *L) { SpriteBatch *t = luax_checkspritebatch(L, 1); const char *name = luaL_checkstring(L, 2); - Mesh *m = luax_checktype(L, 3); - luax_catchexcept(L, [&](){ t->attachAttribute(name, m); }); + Buffer *buffer = nullptr; + if (luax_istype(L, 3, Buffer::type)) + { + buffer = luax_checktype(L, 3); + } + else + { + Mesh *mesh = luax_checktype(L, 3); + buffer = mesh->getVertexBuffer(); + } + + luax_catchexcept(L, [&](){ t->attachAttribute(name, buffer); }); return 0; } From afcb467fa75c8f2d85b9ded21a4e3a9afcf229ea Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 19 Jan 2020 19:03:46 -0400 Subject: [PATCH 08/54] Remove some unrelated code that was accidentally included in previous commits. --- src/modules/graphics/ParticleSystem.h | 71 -------------------- src/modules/graphics/wrap_GraphicsShader.lua | 30 --------- 2 files changed, 101 deletions(-) diff --git a/src/modules/graphics/ParticleSystem.h b/src/modules/graphics/ParticleSystem.h index 07740a3bd..374cd846c 100644 --- a/src/modules/graphics/ParticleSystem.h +++ b/src/modules/graphics/ParticleSystem.h @@ -558,77 +558,6 @@ private: int quadIndex; }; - struct Emitter - { - // Pointer to the beginning of the allocated memory. - Particle *pMem; - - // Pointer to a free particle. - Particle *pFree; - - // Pointer to the start of the linked list. - Particle *pHead; - - // Pointer to the end of the linked list. - Particle *pTail; - - // Whether the particle emitter is active. - bool active; - - // Insert mode of new particles. - InsertMode insertMode; - - // The number of active particles. - uint32 activeParticles; - - // The emission rate (particles/sec). - float emissionRate; - - // Used to determine when a particle should be emitted. - float emitCounter; - - // The relative position of the particle emitter. - love::Vector2 position; - love::Vector2 prevPosition; - - // Emission area spread. - AreaSpreadDistribution emissionAreaDistribution; - love::Vector2 emissionArea; - float emissionAreaAngle; - bool directionRelativeToEmissionCenter; - - // The lifetime of the particle emitter (-1 means infinite) and the life it has left. - float lifetime; - float life; - - // The particle life. - float particleLifeMin; - float particleLifeMax; - - // The direction (and spread) the particles will be emitted in. Measured in radians. - float direction; - float spread; - - // The speed. - float speedMin; - float speedMax; - - // Acceleration along the x and y axes. - love::Vector2 linearAccelerationMin; - love::Vector2 linearAccelerationMax; - - // Acceleration towards the emitter's center - float radialAccelerationMin; - float radialAccelerationMax; - - // Acceleration perpendicular to the particle's direction. - float tangentialAccelerationMin; - float tangentialAccelerationMax; - - float linearDampingMin; - float linearDampingMax; - }; - void resetOffset(); void createBuffers(size_t size); diff --git a/src/modules/graphics/wrap_GraphicsShader.lua b/src/modules/graphics/wrap_GraphicsShader.lua index 02cb9998b..14a1ba19d 100644 --- a/src/modules/graphics/wrap_GraphicsShader.lua +++ b/src/modules/graphics/wrap_GraphicsShader.lua @@ -380,36 +380,6 @@ local function isPixelCode(code) end end -local function includeShader(path, dir, global) - -end - -local function preprocessIncludes(code, dir, level) - local output = {} - - local linecount = 0 - for line in code:gmatch("[^\r\n]+") do - linecount = linecount + 1 - - if line:match("^%s*#include") then - local localpath = line:match("^%s*#include%s*\"(.*)\"") - local globalpath = line:match("^%s*#include%s*<(.*)>") - --local - if localpath then - --table_insert(output, ) - elseif globalpath then - - else - - end - else - table_insert(output, line) - end - end - - return table_concat(output, "\n") -end - function love.graphics._shaderCodeToGLSL(gles, arg1, arg2) local vertexcode, pixelcode local is_custompixel = false -- whether pixel code has "effects" function instead of "effect" From 2572f0c7a18f615e3ac3f3392781cf2ed130285f Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 1 Feb 2020 15:39:59 -0400 Subject: [PATCH 09/54] Meshes expose GraphicsBuffers, part 2 --- src/modules/graphics/Buffer.cpp | 73 ++++--- src/modules/graphics/Buffer.h | 52 ++++- src/modules/graphics/Font.cpp | 2 +- src/modules/graphics/Graphics.cpp | 33 ++-- src/modules/graphics/Graphics.h | 12 +- src/modules/graphics/Mesh.cpp | 127 ++++--------- src/modules/graphics/Mesh.h | 21 +-- src/modules/graphics/ParticleSystem.cpp | 6 +- src/modules/graphics/Polyline.cpp | 4 +- src/modules/graphics/Polyline.h | 4 +- src/modules/graphics/SpriteBatch.cpp | 10 +- src/modules/graphics/Text.cpp | 8 +- src/modules/graphics/Texture.cpp | 4 +- src/modules/graphics/Video.cpp | 2 +- src/modules/graphics/opengl/Buffer.cpp | 105 ++++++----- src/modules/graphics/opengl/Buffer.h | 29 +-- src/modules/graphics/opengl/Graphics.cpp | 19 +- src/modules/graphics/opengl/Graphics.h | 4 +- src/modules/graphics/opengl/OpenGL.cpp | 28 +-- src/modules/graphics/opengl/OpenGL.h | 2 +- src/modules/graphics/vertex.cpp | 100 +++------- src/modules/graphics/vertex.h | 62 ++---- src/modules/graphics/wrap_Graphics.cpp | 47 ++--- src/modules/graphics/wrap_Mesh.cpp | 231 ++++++++++++++--------- src/modules/graphics/wrap_Mesh.h | 4 +- 25 files changed, 491 insertions(+), 498 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index d57416564..dfe6fedf5 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -28,56 +28,62 @@ namespace graphics love::Type Buffer::type("GraphicsBuffer", &Object::type); -Buffer::Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) +Buffer::Buffer(const Settings &settings, const void */*data*/, size_t size) : arrayLength(0) , arrayStride(0) , size(size) - , typeFlags(typeflags) - , usage(usage) - , mapFlags(mapflags) + , typeFlags(settings.typeFlags) + , usage(settings.usage) + , mapFlags(settings.mapFlags) , mapped(false) { } -Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &dataMembers, size_t arraylength) - : Buffer(0, settings.typeFlags, settings.usage, settings.mapFlags) +Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &bufferformat, const void *data, size_t size, size_t arraylength) + : Buffer(settings, data, size) { - if (dataMembers.size() == 0) - throw love::Exception("Data format must contain values."); + if (size == 0 && arraylength == 0) + throw love::Exception("Size or array length must be specified."); - this->dataMembers = dataMembers; + if (bufferformat.size() == 0) + throw love::Exception("Data format must contain values."); bool supportsGLSL3 = gfx->getCapabilities().features[Graphics::FEATURE_GLSL3]; - bool uniformbuffer = settings.typeFlags & BUFFERFLAG_UNIFORM; - bool indexbuffer = settings.typeFlags & BUFFERFLAG_INDEX; - bool vertexbuffer = settings.typeFlags & BUFFERFLAG_VERTEX; - bool ssbuffer = settings.typeFlags & BUFFERFLAG_SHADER_STORAGE; - - if (indexbuffer && dataMembers.size() > 1) - throw love::Exception("test"); + bool uniformbuffer = settings.typeFlags & TYPEFLAG_UNIFORM; + bool indexbuffer = settings.typeFlags & TYPEFLAG_INDEX; + bool vertexbuffer = settings.typeFlags & TYPEFLAG_VERTEX; + bool ssbuffer = settings.typeFlags & TYPEFLAG_SHADER_STORAGE; size_t offset = 0; size_t stride = 0; - for (const auto &member : dataMembers) + for (const auto &decl : bufferformat) { - DataFormat format = member.format; - const DataFormatInfo &info = getDataFormatInfo(format); + DataMember member(decl); + + DataFormat format = member.decl.format; + const DataFormatInfo &info = member.info; if (indexbuffer) { if (format != DATAFORMAT_UINT16 && format != DATAFORMAT_UINT32) throw love::Exception("Index buffers only support uint16 and uint32 data types."); + + if (bufferformat.size() > 1) + throw love::Exception("Index buffers only support a single value per element."); } if (vertexbuffer) { + if (decl.arraySize > 0) + throw love::Exception("Arrays are not supported in vertex buffers."); + if (info.isMatrix) - throw love::Exception("matrix types are not supported in vertex buffers."); + throw love::Exception("Matrix types are not supported in vertex buffers."); if (info.baseType == DATA_BASETYPE_BOOL) - throw love::Exception("bool types are not supported in vertex buffers."); + throw love::Exception("Bool types are not supported in vertex buffers."); if ((info.baseType == DATA_BASETYPE_INT || info.baseType == DATA_BASETYPE_UINT) && !supportsGLSL3) throw love::Exception("Integer vertex attribute data types require GLSL 3 support."); @@ -88,11 +94,30 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 0) + size += stride - remainder; + arraylength = size / stride; + } + else + { + size = arraylength * stride; } - this->arrayLength = arraylength; this->arrayStride = stride; - this->size = stride * arraylength; + this->arrayLength = arraylength; + this->size = size; } Buffer::~Buffer() @@ -103,7 +128,7 @@ int Buffer::getDataMemberIndex(const std::string &name) const { for (size_t i = 0; i < dataMembers.size(); i++) { - if (dataMembers[i].name == name) + if (dataMembers[i].decl.name == name) return (int) i; } diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 857444fe0..12fc2659a 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -40,7 +40,7 @@ namespace graphics class Graphics; /** - * A block of GPU-owned memory. Currently meant for internal use. + * A block of GPU-owned memory. **/ class Buffer : public love::Object, public Resource { @@ -50,30 +50,65 @@ public: enum MapFlags { + MAP_NONE = 0, MAP_EXPLICIT_RANGE_MODIFY = (1 << 0), // see setMappedRangeModified. MAP_READ = (1 << 1), }; - struct DataMember + enum TypeFlags + { + TYPEFLAG_NONE = 0, + TYPEFLAG_VERTEX = 1 << BUFFERTYPE_VERTEX, + TYPEFLAG_INDEX = 1 << BUFFERTYPE_INDEX, + TYPEFLAG_UNIFORM = 1 << BUFFERTYPE_UNIFORM, + TYPEFLAG_SHADER_STORAGE = 1 << BUFFERTYPE_SHADER_STORAGE, + }; + + struct DataDeclaration { std::string name; DataFormat format; int arraySize; + + DataDeclaration(const std::string &name, DataFormat format, int arraySize = 0) + : name(name) + , format(format) + , arraySize(arraySize) + {} + }; + + struct DataMember + { + DataDeclaration decl; + DataFormatInfo info; + size_t offset; + + DataMember(const DataDeclaration &decl) + : decl(decl) + , info(getDataFormatInfo(decl.format)) + , offset(0) + {} }; struct Settings { - BufferTypeFlags typeFlags; + TypeFlags typeFlags; MapFlags mapFlags; BufferUsage usage; + + Settings(uint32 typeflags, uint32 mapflags, BufferUsage usage) + : typeFlags((TypeFlags)typeflags) + , mapFlags((MapFlags)mapflags) + , usage(usage) + {} }; - Buffer(size_t size, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags); - Buffer(Graphics *gfx, const Settings &settings, const std::vector &members, size_t arraylength); + Buffer(const Settings &settings, const void *data, size_t size); + Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength); virtual ~Buffer(); size_t getSize() const { return size; } - BufferTypeFlags getTypeFlags() const { return typeFlags; } + TypeFlags getTypeFlags() const { return typeFlags; } BufferUsage getUsage() const { return usage; } bool isMapped() const { return mapped; } uint32 getMapFlags() const { return mapFlags; } @@ -82,7 +117,7 @@ public: size_t getArrayStride() const { return arrayStride; } const std::vector &getDataMembers() const { return dataMembers; } const DataMember &getDataMember(int index) const { return dataMembers[index]; } - size_t getMemberOffset(int index) const { return memberOffsets[index]; } + size_t getMemberOffset(int index) const { return dataMembers[index].offset; } int getDataMemberIndex(const std::string &name) const; /** @@ -146,7 +181,6 @@ public: protected: std::vector dataMembers; - std::vector memberOffsets; size_t arrayLength; size_t arrayStride; @@ -154,7 +188,7 @@ protected: size_t size; // The type of the buffer object. - BufferTypeFlags typeFlags; + TypeFlags typeFlags; // Usage hint. GL_[DYNAMIC, STATIC, STREAM]_DRAW. BufferUsage usage; diff --git a/src/modules/graphics/Font.cpp b/src/modules/graphics/Font.cpp index 25b32a60d..7114d6853 100644 --- a/src/modules/graphics/Font.cpp +++ b/src/modules/graphics/Font.cpp @@ -642,7 +642,7 @@ void Font::printv(graphics::Graphics *gfx, const Matrix4 &t, const std::vector format = { + { "index", getIndexDataFormat(dataType), 0 } + }; + + return newBuffer(settings, format, indices, size, 0); +} + Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage) { return newMesh(Mesh::getDefaultVertexFormat(), &vertices[0], vertices.size() * sizeof(Vertex), drawmode, usage); @@ -270,12 +281,12 @@ Mesh *Graphics::newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usa return newMesh(Mesh::getDefaultVertexFormat(), vertexcount, drawmode, usage); } -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) +love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, vertexcount, drawmode, usage); } -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) +love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, data, datasize, drawmode, usage); } @@ -1003,7 +1014,7 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand & if (cmd.primitiveMode != state.primitiveMode || cmd.formats[0] != state.formats[0] || cmd.formats[1] != state.formats[1] - || ((cmd.indexMode != TriangleIndexMode::NONE) != (state.indexCount > 0)) + || ((cmd.indexMode != TRIANGLEINDEX_NONE) != (state.indexCount > 0)) || cmd.texture != state.texture || cmd.standardShaderType != state.standardShaderType) { @@ -1013,7 +1024,7 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand & int totalvertices = state.vertexCount + cmd.vertexCount; // We only support uint16 index buffers for now. - if (totalvertices > LOVE_UINT16_MAX && cmd.indexMode != TriangleIndexMode::NONE) + if (totalvertices > LOVE_UINT16_MAX && cmd.indexMode != TRIANGLEINDEX_NONE) shouldflush = true; int reqIndexCount = getIndexCount(cmd.indexMode, cmd.vertexCount); @@ -1042,7 +1053,7 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand & newdatasizes[i] = stride * cmd.vertexCount; } - if (cmd.indexMode != TriangleIndexMode::NONE) + if (cmd.indexMode != TRIANGLEINDEX_NONE) { size_t datasize = (state.indexCount + reqIndexCount) * sizeof(uint16); @@ -1080,18 +1091,18 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawCommand & if (state.vb[i]->getSize() < buffersizes[i]) { delete state.vb[i]; - state.vb[i] = newStreamBuffer(BUFFER_VERTEX, buffersizes[i]); + state.vb[i] = newStreamBuffer(BUFFERTYPE_VERTEX, buffersizes[i]); } } if (state.indexBuffer->getSize() < buffersizes[2]) { delete state.indexBuffer; - state.indexBuffer = newStreamBuffer(BUFFER_INDEX, buffersizes[2]); + state.indexBuffer = newStreamBuffer(BUFFERTYPE_INDEX, buffersizes[2]); } } - if (cmd.indexMode != TriangleIndexMode::NONE) + if (cmd.indexMode != TRIANGLEINDEX_NONE) { if (state.indexBufferMap.data == nullptr) state.indexBufferMap = state.indexBuffer->map(reqIndexSize); @@ -1573,7 +1584,7 @@ void Graphics::polygon(DrawMode mode, const Vector2 *coords, size_t count, bool StreamDrawCommand cmd; cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::RGBAub; - cmd.indexMode = TriangleIndexMode::FAN; + cmd.indexMode = TRIANGLEINDEX_FAN; cmd.vertexCount = (int)count - (skipLastFilledVertex ? 1 : 0); StreamVertexData data = requestStreamDraw(cmd); diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index 1ea9607c7..aba60539e 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -260,7 +260,7 @@ public: { PrimitiveType primitiveMode = PRIMITIVE_TRIANGLES; CommonFormat formats[2]; - TriangleIndexMode indexMode = TriangleIndexMode::NONE; + TriangleIndexMode indexMode = TRIANGLEINDEX_NONE; int vertexCount = 0; Texture *texture = nullptr; Shader::StandardShader standardShaderType = Shader::STANDARD_DEFAULT; @@ -445,15 +445,15 @@ public: ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source); Shader *newShader(const std::string &vertex, const std::string &pixel); - virtual Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) = 0; - virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) = 0; + virtual Buffer *newBuffer(const Buffer::Settings &settings, const void *data, size_t size) = 0; + virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) = 0; -// Buffer *newIndexBuffer(IndexDataType dataType, const void *indices, size_t bytesize, vertex::Usage usage, uint32 mapflags) = 0; + Buffer *newIndexBuffer(IndexDataType dataType, const void *indices, size_t size, BufferUsage usage, uint32 mapflags); Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage); Mesh *newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage); - Mesh *newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); - Mesh *newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); Text *newText(Font *font, const std::vector &text = {}); diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 13c7477a4..ef186137e 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -45,13 +45,13 @@ static_assert(offsetof(Vertex, x) == sizeof(float) * 0, "Incorrect position offs static_assert(offsetof(Vertex, s) == sizeof(float) * 2, "Incorrect texture coordinate offset in Vertex struct"); static_assert(offsetof(Vertex, color.r) == sizeof(float) * 4, "Incorrect color offset in Vertex struct"); -std::vector Mesh::getDefaultVertexFormat() +std::vector Mesh::getDefaultVertexFormat() { // Corresponds to the love::Vertex struct. - std::vector vertexformat = { - { getBuiltinAttribName(ATTRIB_POS), DATA_FLOAT, 2 }, - { getBuiltinAttribName(ATTRIB_TEXCOORD), DATA_FLOAT, 2 }, - { getBuiltinAttribName(ATTRIB_COLOR), DATA_UNORM8, 4 }, + std::vector vertexformat = { + { getBuiltinAttribName(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2, 0 }, + { getBuiltinAttribName(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2, 0 }, + { getBuiltinAttribName(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4, 0 }, }; return vertexformat; @@ -59,9 +59,8 @@ std::vector Mesh::getDefaultVertexFormat() love::Type Mesh::type("Mesh", &Drawable::type); -Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) - : vertexFormat(vertexformat) - , vertexBuffer(nullptr) +Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) + : vertexBuffer(nullptr) , vertexCount(0) , vertexStride(0) , indexBuffer(nullptr) @@ -72,24 +71,22 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma , rangeStart(-1) , rangeCount(-1) { + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ, usage); + vertexBuffer.set(gfx->newBuffer(settings, vertexformat, data, datasize, 0), Acquire::NORETAIN); + + vertexCount = vertexBuffer->getArrayLength(); + vertexStride = vertexBuffer->getArrayStride(); + vertexFormat = vertexBuffer->getDataMembers(); + setupAttachedAttributes(); - calculateAttributeSizes(gfx); - vertexCount = datasize / vertexStride; indexDataType = getIndexDataTypeFromMax(vertexCount); - if (vertexCount == 0) - throw love::Exception("Data size is too small for specified vertex attribute formats."); - - auto buffer = gfx->newBuffer(datasize, data, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); - vertexBuffer.set(buffer, Acquire::NORETAIN); - vertexScratchBuffer = new char[vertexStride]; } -Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) - : vertexFormat(vertexformat) - , vertexBuffer(nullptr) +Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) + : vertexBuffer(nullptr) , vertexCount((size_t) vertexcount) , vertexStride(0) , indexBuffer(nullptr) @@ -103,16 +100,15 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector &vertexforma if (vertexcount <= 0) throw love::Exception("Invalid number of vertices (%d).", vertexcount); + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ, usage); + vertexBuffer.set(gfx->newBuffer(settings, vertexformat, nullptr, 0, vertexcount), Acquire::NORETAIN); + + vertexStride = vertexBuffer->getArrayStride(); + vertexFormat = vertexBuffer->getDataMembers(); + setupAttachedAttributes(); - calculateAttributeSizes(gfx); - size_t buffersize = vertexCount * vertexStride; - - auto buffer = gfx->newBuffer(buffersize, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY | Buffer::MAP_READ); - vertexBuffer.set(buffer, Acquire::NORETAIN); - - // Initialize the buffer's contents to 0. - memset(vertexBuffer->map(), 0, buffersize); + memset(vertexBuffer->map(), 0, vertexBuffer->getSize()); vertexBuffer->setMappedRangeModified(0, vertexBuffer->getSize()); vertexBuffer->unmap(); @@ -134,53 +130,15 @@ void Mesh::setupAttachedAttributes() { for (size_t i = 0; i < vertexFormat.size(); i++) { - const std::string &name = vertexFormat[i].name; + const std::string &name = vertexFormat[i].decl.name; if (attachedAttributes.find(name) != attachedAttributes.end()) throw love::Exception("Duplicate vertex attribute name: %s", name.c_str()); - attachedAttributes[name] = {nullptr, (int) i, STEP_PER_VERTEX, true}; + attachedAttributes[name] = {vertexBuffer, (int) i, STEP_PER_VERTEX, true}; } } -void Mesh::calculateAttributeSizes(Graphics *gfx) -{ - bool supportsGLSL3 = gfx->getCapabilities().features[Graphics::FEATURE_GLSL3]; - - size_t stride = 0; - - for (const AttribFormat &format : vertexFormat) - { - size_t size = getDataTypeSize(format.type) * format.components; - - if (format.components <= 0 || format.components > 4) - throw love::Exception("Vertex attributes must have between 1 and 4 components."); - - // Hardware really doesn't like attributes that aren't 32 bit-aligned. - if (size % 4 != 0) - throw love::Exception("Vertex attributes must have enough components to be a multiple of 32 bits."); - - if (isDataTypeInteger(format.type) && !supportsGLSL3) - throw love::Exception("Integer vertex attribute data types require GLSL 3 support."); - - // Total size in bytes of each attribute in a single vertex. - attributeSizes.push_back(size); - stride += size; - } - - vertexStride = stride; -} - -size_t Mesh::getAttributeOffset(size_t attribindex) const -{ - size_t offset = 0; - - for (size_t i = 0; i < attribindex; i++) - offset += attributeSizes[i]; - - return offset; -} - void Mesh::setVertex(size_t vertindex, const void *data, size_t datasize) { if (vertindex >= vertexCount) @@ -223,8 +181,10 @@ void Mesh::setVertexAttribute(size_t vertindex, int attribindex, const void *dat if (attribindex >= (int) vertexFormat.size()) throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); - size_t offset = vertindex * vertexStride + getAttributeOffset(attribindex); - size_t size = std::min(datasize, attributeSizes[attribindex]); + const auto &member = vertexFormat[attribindex]; + + size_t offset = vertindex * vertexStride + member.offset; + size_t size = std::min(datasize, member.info.size); uint8 *bufferdata = (uint8 *) vertexBuffer->map(); memcpy(bufferdata + offset, data, size); @@ -240,8 +200,10 @@ size_t Mesh::getVertexAttribute(size_t vertindex, int attribindex, void *data, s if (attribindex >= (int) vertexFormat.size()) throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); - size_t offset = vertindex * vertexStride + getAttributeOffset(attribindex); - size_t size = std::min(datasize, attributeSizes[attribindex]); + const auto &member = vertexFormat[attribindex]; + + size_t offset = vertindex * vertexStride + member.offset; + size_t size = std::min(datasize, member.info.size); // We're relying on map() returning read/write data... ew. const uint8 *bufferdata = (const uint8 *) vertexBuffer->map(); @@ -265,25 +227,16 @@ Buffer *Mesh::getVertexBuffer() const return vertexBuffer; } -const std::vector &Mesh::getVertexFormat() const +const std::vector &Mesh::getVertexFormat() const { return vertexFormat; } -DataType Mesh::getAttributeInfo(int attribindex, int &components) const -{ - if (attribindex < 0 || attribindex >= (int) vertexFormat.size()) - throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); - - components = vertexFormat[attribindex].components; - return vertexFormat[attribindex].type; -} - int Mesh::getAttributeIndex(const std::string &name) const { for (int i = 0; i < (int) vertexFormat.size(); i++) { - if (vertexFormat[i].name == name) + if (vertexFormat[i].decl.name == name) return i; } @@ -312,7 +265,7 @@ bool Mesh::isAttributeEnabled(const std::string &name) const void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step) { - if ((buffer->getTypeFlags() & BUFFER_VERTEX) == 0) + if ((buffer->getTypeFlags() & Buffer::TYPEFLAG_VERTEX) == 0) throw love::Exception("GraphicsBuffer must be created with vertex buffer support to be used as a Mesh vertex attribute."); auto gfx = Module::getInstance(Module::M_GRAPHICS); @@ -410,7 +363,8 @@ void Mesh::setVertexMap(const std::vector &map) if (indexBuffer.get() == nullptr || size > indexBuffer->getSize()) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer.set(gfx->newBuffer(size, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ), Acquire::NORETAIN); + Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); + indexBuffer.set(gfx->newBuffer(settings, nullptr, size), Acquire::NORETAIN); } useIndexBuffer = true; @@ -441,7 +395,8 @@ void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasiz if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize()) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - indexBuffer.set(gfx->newBuffer(datasize, nullptr, BUFFERFLAG_INDEX, vertexBuffer->getUsage(), Buffer::MAP_READ), Acquire::NORETAIN); + Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); + indexBuffer.set(gfx->newBuffer(settings, nullptr, datasize), Acquire::NORETAIN); } indexCount = datasize / getIndexDataSize(datatype); @@ -607,7 +562,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) uint16 offset = (uint16) buffer->getMemberOffset(attrib.second.index); uint16 stride = (uint16) buffer->getArrayStride(); - attributes.set(attributeindex, member.format, offset, activebuffers); + attributes.set(attributeindex, member.decl.format, offset, activebuffers); attributes.setBufferLayout(activebuffers, stride, attrib.second.step); // TODO: Ideally we want to reuse buffers with the same stride+step. diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index a0a16bb06..160dcf66e 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -52,15 +52,8 @@ public: static love::Type type; - struct AttribFormat - { - std::string name; - DataType type; - int components; // max 4 - }; - - Mesh(Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); - Mesh(Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); + Mesh(Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); + Mesh(Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); virtual ~Mesh(); @@ -97,8 +90,7 @@ public: /** * Gets the format of each vertex attribute stored in the Mesh. **/ - const std::vector &getVertexFormat() const; - DataType getAttributeInfo(int attribindex, int &components) const; + const std::vector &getVertexFormat() const; int getAttributeIndex(const std::string &name) const; /** @@ -174,7 +166,7 @@ public: void drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount); - static std::vector getDefaultVertexFormat(); + static std::vector getDefaultVertexFormat(); private: @@ -189,11 +181,8 @@ private: }; void setupAttachedAttributes(); - void calculateAttributeSizes(Graphics *gfx); - size_t getAttributeOffset(size_t attribindex) const; - std::vector vertexFormat; - std::vector attributeSizes; + std::vector vertexFormat; std::unordered_map attachedAttributes; diff --git a/src/modules/graphics/ParticleSystem.cpp b/src/modules/graphics/ParticleSystem.cpp index 6e1123870..0f8a5aa50 100644 --- a/src/modules/graphics/ParticleSystem.cpp +++ b/src/modules/graphics/ParticleSystem.cpp @@ -191,7 +191,8 @@ void ParticleSystem::createBuffers(size_t size) auto gfx = Module::getInstance(Module::M_GRAPHICS); size_t bytes = sizeof(Vertex) * size * 4; - buffer = gfx->newBuffer(bytes, nullptr, BUFFERFLAG_VERTEX, BUFFERUSAGE_STREAM, 0); + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, 0, BUFFERUSAGE_STREAM); + buffer = gfx->newBuffer(settings, nullptr, bytes); } catch (std::bad_alloc &) { @@ -203,7 +204,8 @@ void ParticleSystem::createBuffers(size_t size) void ParticleSystem::deleteBuffers() { delete[] pMem; - buffer->release(); + if (buffer) + buffer->release(); pMem = nullptr; buffer = nullptr; diff --git a/src/modules/graphics/Polyline.cpp b/src/modules/graphics/Polyline.cpp index 27035e48b..4b9a8491b 100644 --- a/src/modules/graphics/Polyline.cpp +++ b/src/modules/graphics/Polyline.cpp @@ -82,7 +82,7 @@ void Polyline::render(const Vector2 *coords, size_t count, size_t size_hint, flo // extra degenerate triangle in between the core line and the overdraw // line in order to break up the strip into two. This will let us draw // everything in one draw call. - if (triangle_mode == TriangleIndexMode::STRIP) + if (triangle_mode == TRIANGLEINDEX_STRIP) extra_vertices = 2; } @@ -383,7 +383,7 @@ void Polyline::draw(love::graphics::Graphics *gfx) int maxvertices = LOVE_UINT16_MAX - 3; int advance = maxvertices; - if (triangle_mode == TriangleIndexMode::STRIP) + if (triangle_mode == TRIANGLEINDEX_STRIP) advance -= 2; for (int vertex_start = 0; vertex_start < total_vertex_count; vertex_start += advance) diff --git a/src/modules/graphics/Polyline.h b/src/modules/graphics/Polyline.h index efb42e9e8..32bd4c621 100644 --- a/src/modules/graphics/Polyline.h +++ b/src/modules/graphics/Polyline.h @@ -44,7 +44,7 @@ class Polyline { public: - Polyline(TriangleIndexMode mode = TriangleIndexMode::STRIP) + Polyline(TriangleIndexMode mode = TRIANGLEINDEX_STRIP) : vertices(nullptr) , overdraw(nullptr) , vertex_count(0) @@ -109,7 +109,7 @@ class NoneJoinPolyline : public Polyline public: NoneJoinPolyline() - : Polyline(TriangleIndexMode::QUADS) + : Polyline(TRIANGLEINDEX_QUADS) {} void render(const Vector2 *vertices, size_t count, float halfwidth, float pixel_size, bool draw_overdraw) diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index 50ee28123..9197b39cd 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -64,7 +64,8 @@ SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, BufferUsage vertex_stride = getFormatStride(vertex_format); size_t vertex_size = vertex_stride * 4 * size; - array_buf = gfx->newBuffer(vertex_size, nullptr, BUFFERFLAG_VERTEX, usage, Buffer::MAP_EXPLICIT_RANGE_MODIFY); + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY, usage); + array_buf = gfx->newBuffer(settings, nullptr, vertex_size); } SpriteBatch::~SpriteBatch() @@ -218,7 +219,8 @@ void SpriteBatch::setBufferSize(int newsize) try { auto gfx = Module::getInstance(Module::M_GRAPHICS); - new_array_buf = gfx->newBuffer(vertex_size, nullptr, array_buf->getTypeFlags(), array_buf->getUsage(), array_buf->getMapFlags()); + Buffer::Settings settings(array_buf->getTypeFlags(), array_buf->getMapFlags(), array_buf->getUsage()); + new_array_buf = gfx->newBuffer(settings, nullptr, vertex_size); // Copy as much of the old data into the new GLBuffer as can fit. size_t copy_size = vertex_stride * 4 * new_next; @@ -246,7 +248,7 @@ int SpriteBatch::getBufferSize() const void SpriteBatch::attachAttribute(const std::string &name, Buffer *buffer) { - if ((buffer->getTypeFlags() & BUFFER_VERTEX) == 0) + if ((buffer->getTypeFlags() & Buffer::TYPEFLAG_VERTEX) == 0) throw love::Exception("GraphicsBuffer must be created with vertex buffer support to be used as a SpriteBatch vertex attribute."); AttachedAttribute oldattrib = {}; @@ -357,7 +359,7 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m) uint16 offset = (uint16) buffer->getMemberOffset(it.second.index); uint16 stride = (uint16) buffer->getArrayStride(); - attributes.set(attributeindex, member.format, offset, activebuffers); + attributes.set(attributeindex, member.decl.format, offset, activebuffers); attributes.setBufferLayout(activebuffers, stride); // TODO: We should reuse buffer bindings with the same buffer+stride+step. diff --git a/src/modules/graphics/Text.cpp b/src/modules/graphics/Text.cpp index 1909a35cf..f9db16d5e 100644 --- a/src/modules/graphics/Text.cpp +++ b/src/modules/graphics/Text.cpp @@ -42,7 +42,8 @@ Text::Text(Font *font, const std::vector &text) Text::~Text() { - delete vertex_buffer; + if (vertex_buffer) + vertex_buffer->release(); } void Text::uploadVertices(const std::vector &vertices, size_t vertoffset) @@ -60,12 +61,13 @@ void Text::uploadVertices(const std::vector &vertices, size_t newsize = std::max(size_t(vertex_buffer->getSize() * 1.5), newsize); auto gfx = Module::getInstance(Module::M_GRAPHICS); - Buffer *new_buffer = gfx->newBuffer(newsize, nullptr, BUFFERFLAG_VERTEX, BUFFERUSAGE_DYNAMIC, 0); + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, 0, BUFFERUSAGE_DYNAMIC); + Buffer *new_buffer = gfx->newBuffer(settings, nullptr, newsize); if (vertex_buffer != nullptr) vertex_buffer->copyTo(0, vertex_buffer->getSize(), new_buffer, 0); - delete vertex_buffer; + vertex_buffer->release(); vertex_buffer = new_buffer; vertexBuffers.set(0, vertex_buffer, 0); diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp index f37ef41b6..9eebbf659 100644 --- a/src/modules/graphics/Texture.cpp +++ b/src/modules/graphics/Texture.cpp @@ -132,7 +132,7 @@ void Texture::draw(Graphics *gfx, Quad *q, const Matrix4 &localTransform) Graphics::StreamDrawCommand cmd; cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::STf_RGBAub; - cmd.indexMode = TriangleIndexMode::QUADS; + cmd.indexMode = TRIANGLEINDEX_QUADS; cmd.vertexCount = 4; cmd.texture = this; @@ -184,7 +184,7 @@ void Texture::drawLayer(Graphics *gfx, int layer, Quad *q, const Matrix4 &m) Graphics::StreamDrawCommand cmd; cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::STPf_RGBAub; - cmd.indexMode = TriangleIndexMode::QUADS; + cmd.indexMode = TRIANGLEINDEX_QUADS; cmd.vertexCount = 4; cmd.texture = this; cmd.standardShaderType = Shader::STANDARD_ARRAY; diff --git a/src/modules/graphics/Video.cpp b/src/modules/graphics/Video.cpp index e3c71c1ef..0733e6d84 100644 --- a/src/modules/graphics/Video.cpp +++ b/src/modules/graphics/Video.cpp @@ -117,7 +117,7 @@ void Video::draw(Graphics *gfx, const Matrix4 &m) Graphics::StreamDrawCommand cmd; cmd.formats[0] = getSinglePositionFormat(is2D); cmd.formats[1] = CommonFormat::STf_RGBAub; - cmd.indexMode = TriangleIndexMode::QUADS; + cmd.indexMode = TRIANGLEINDEX_QUADS; cmd.vertexCount = 4; cmd.standardShaderType = Shader::STANDARD_VIDEO; diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 3559a2221..2c94deaee 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -35,21 +35,34 @@ namespace graphics namespace opengl { -Buffer::Buffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) - : love::graphics::Buffer(size, typeflags, usage, mapflags) - , vbo(0) - , memoryMap(nullptr) - , modifiedOffset(0) - , modifiedSize(0) +Buffer::Buffer(const Settings &settings, const void *data, size_t size) + : love::graphics::Buffer(settings, data, size) { - if (typeflags & BUFFERFLAG_VERTEX) - mapType = BUFFER_VERTEX; - else if (typeflags & BUFFERFLAG_INDEX) - mapType = BUFFER_INDEX; - else if (mapflags & BUFFERFLAG_UNIFORM) - mapType = BUFFER_UNIFORM; - else if (mapflags & BUFFERFLAG_SHADER_STORAGE) - mapType = BUFFER_SHADER_STORAGE; + initialize(data); +} + +Buffer::Buffer(love::graphics::Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) + : love::graphics::Buffer(gfx, settings, format, data, size, arraylength) +{ + initialize(data); +} + +Buffer::~Buffer() +{ + unloadVolatile(); + delete[] memoryMap; +} + +void Buffer::initialize(const void *data) +{ + if (typeFlags & TYPEFLAG_VERTEX) + mapType = BUFFERTYPE_VERTEX; + else if (typeFlags & TYPEFLAG_INDEX) + mapType = BUFFERTYPE_INDEX; + else if (typeFlags & TYPEFLAG_UNIFORM) + mapType = BUFFERTYPE_UNIFORM; + else if (typeFlags & TYPEFLAG_SHADER_STORAGE) + mapType = BUFFERTYPE_SHADER_STORAGE; target = OpenGL::getGLBufferType(mapType); @@ -72,12 +85,34 @@ Buffer::Buffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferU } } -Buffer::~Buffer() +bool Buffer::loadVolatile() { - if (vbo != 0) - unload(); + return load(true); +} - delete[] memoryMap; +void Buffer::unloadVolatile() +{ + mapped = false; + if (vbo != 0) + gl.deleteBuffer(vbo); + vbo = 0; +} + +bool Buffer::load(bool restore) +{ + glGenBuffers(1, &vbo); + gl.bindBuffer(mapType, vbo); + + while (glGetError() != GL_NO_ERROR) + /* Clear the error buffer. */; + + // Copy the old buffer only if 'restore' was requested. + const GLvoid *src = restore ? memoryMap : nullptr; + + // Note that if 'src' is '0', no data will be copied. + glBufferData(target, (GLsizeiptr) getSize(), src, OpenGL::getGLBufferUsage(getUsage())); + + return (glGetError() == GL_NO_ERROR); } void *Buffer::map() @@ -204,40 +239,6 @@ void Buffer::copyTo(size_t offset, size_t size, love::graphics::Buffer *other, s other->fill(otheroffset, size, memoryMap + offset); } -bool Buffer::loadVolatile() -{ - return load(true); -} - -void Buffer::unloadVolatile() -{ - unload(); -} - -bool Buffer::load(bool restore) -{ - glGenBuffers(1, &vbo); - gl.bindBuffer(mapType, vbo); - - while (glGetError() != GL_NO_ERROR) - /* Clear the error buffer. */; - - // Copy the old buffer only if 'restore' was requested. - const GLvoid *src = restore ? memoryMap : nullptr; - - // Note that if 'src' is '0', no data will be copied. - glBufferData(target, (GLsizeiptr) getSize(), src, OpenGL::getGLBufferUsage(getUsage())); - - return (glGetError() == GL_NO_ERROR); -} - -void Buffer::unload() -{ - mapped = false; - gl.deleteBuffer(vbo); - vbo = 0; -} - } // opengl } // graphics } // love diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index 60946ddfb..df74fd982 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -32,6 +32,9 @@ namespace love { namespace graphics { + +class Graphics; + namespace opengl { @@ -39,9 +42,14 @@ class Buffer final : public love::graphics::Buffer, public Volatile { public: - Buffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags); + Buffer(const Settings &settings, const void *data, size_t size); + Buffer(love::graphics::Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength); virtual ~Buffer(); + // Implements Volatile. + bool loadVolatile() override; + void unloadVolatile() override; + void *map() override; void unmap() override; void setMappedRangeModified(size_t offset, size_t size) override; @@ -50,29 +58,26 @@ public: void copyTo(size_t offset, size_t size, love::graphics::Buffer *other, size_t otheroffset) override; - // Implements Volatile. - bool loadVolatile() override; - void unloadVolatile() override; - private: + void initialize(const void *data); + bool load(bool restore); - void unload(); void unmapStatic(size_t offset, size_t size); void unmapStream(); - BufferType mapType; - GLenum target; + BufferType mapType = BUFFERTYPE_VERTEX; + GLenum target = 0; // The VBO identifier. Assigned by OpenGL. - GLuint vbo; + GLuint vbo = 0; // A pointer to mapped memory. - char *memoryMap; + char *memoryMap = nullptr; - size_t modifiedOffset; - size_t modifiedSize; + size_t modifiedOffset = 0; + size_t modifiedSize = 0; }; // Buffer diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index e17028d46..b1f7858d5 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -155,15 +155,14 @@ love::graphics::Shader *Graphics::newShaderInternal(love::graphics::ShaderStage return new Shader(vertex, pixel); } -love::graphics::Buffer *Graphics::newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) +love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const void *data, size_t size) { - return new Buffer(size, data, typeflags, usage, mapflags); + return new Buffer(settings, data, size); } -love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) +love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) { - // TODO - return nullptr; + return new Buffer(this, settings, format, data, size, arraylength); } void Graphics::setViewportSize(int width, int height, int pixelwidth, int pixelheight) @@ -254,9 +253,9 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b { // Initial sizes that should be good enough for most cases. It will // resize to fit if needed, later. - streamBufferState.vb[0] = CreateStreamBuffer(BUFFER_VERTEX, 1024 * 1024 * 1); - streamBufferState.vb[1] = CreateStreamBuffer(BUFFER_VERTEX, 256 * 1024 * 1); - streamBufferState.indexBuffer = CreateStreamBuffer(BUFFER_INDEX, sizeof(uint16) * LOVE_UINT16_MAX); + streamBufferState.vb[0] = CreateStreamBuffer(BUFFERTYPE_VERTEX, 1024 * 1024 * 1); + streamBufferState.vb[1] = CreateStreamBuffer(BUFFERTYPE_VERTEX, 256 * 1024 * 1); + streamBufferState.indexBuffer = CreateStreamBuffer(BUFFERTYPE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX); } // Reload all volatile objects. @@ -375,7 +374,7 @@ void Graphics::draw(const DrawIndexedCommand &cmd) GLenum glprimitivetype = OpenGL::getGLPrimitiveType(cmd.primitiveType); GLenum gldatatype = OpenGL::getGLIndexDataType(cmd.indexType); - gl.bindBuffer(BUFFER_INDEX, cmd.indexBuffer->getHandle()); + gl.bindBuffer(BUFFERTYPE_INDEX, cmd.indexBuffer->getHandle()); if (cmd.instanceCount > 1) glDrawElementsInstanced(glprimitivetype, cmd.indexCount, gldatatype, gloffset, cmd.instanceCount); @@ -417,7 +416,7 @@ void Graphics::drawQuads(int start, int count, const VertexAttributes &attribute gl.bindTextureToUnit(texture, 0, false); gl.setCullMode(CULL_NONE); - gl.bindBuffer(BUFFER_INDEX, quadIndexBuffer->getHandle()); + gl.bindBuffer(BUFFERTYPE_INDEX, quadIndexBuffer->getHandle()); if (gl.isBaseVertexSupported()) { diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index 36c63d64c..c47eb0ba8 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -63,8 +63,8 @@ public: love::graphics::Image *newImage(const Image::Slices &data, const Image::Settings &settings) override; love::graphics::Image *newImage(TextureType textype, PixelFormat format, int width, int height, int slices, const Image::Settings &settings) override; love::graphics::Canvas *newCanvas(const Canvas::Settings &settings) override; - love::graphics::Buffer *newBuffer(size_t size, const void *data, BufferTypeFlags typeflags, BufferUsage usage, uint32 mapflags) override; - love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, size_t arraylength) override; + love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const void *data, size_t size) override; + love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) override; void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override; bool setMode(int width, int height, int pixelwidth, int pixelheight, bool windowhasstencil) override; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 620372012..1e821ff3d 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -223,7 +223,7 @@ void OpenGL::setupContext() glGetIntegerv(GL_CULL_FACE_MODE, &faceCull); state.faceCullMode = faceCull; - for (int i = 0; i < (int) BUFFER_MAX_ENUM; i++) + for (int i = 0; i < (int) BUFFERTYPE_MAX_ENUM; i++) { state.boundBuffers[i] = 0; glBindBuffer(getGLBufferType((BufferType) i), 0); @@ -584,15 +584,15 @@ GLenum OpenGL::getGLBufferType(BufferType type) { switch (type) { - case BUFFER_VERTEX: + case BUFFERTYPE_VERTEX: return GL_ARRAY_BUFFER; - case BUFFER_INDEX: + case BUFFERTYPE_INDEX: return GL_ELEMENT_ARRAY_BUFFER; - case BUFFER_UNIFORM: + case BUFFERTYPE_UNIFORM: return GL_UNIFORM_BUFFER; - case BUFFER_SHADER_STORAGE: + case BUFFERTYPE_SHADER_STORAGE: return GL_SHADER_STORAGE_BUFFER; - case BUFFER_MAX_ENUM: + case BUFFERTYPE_MAX_ENUM: return GL_ZERO; } @@ -717,10 +717,6 @@ GLenum OpenGL::getGLVertexDataType(DataFormat format, int &components, GLboolean intformat = true; return GL_UNSIGNED_BYTE; - case DATAFORMAT_SNORM16: - components = 1; - normalized = GL_TRUE; - return GL_SHORT; case DATAFORMAT_SNORM16_VEC2: components = 2; normalized = GL_TRUE; @@ -730,10 +726,6 @@ GLenum OpenGL::getGLVertexDataType(DataFormat format, int &components, GLboolean normalized = GL_TRUE; return GL_BYTE; - case DATAFORMAT_UNORM16: - components = 1; - normalized = GL_TRUE; - return GL_UNSIGNED_SHORT; case DATAFORMAT_UNORM16_VEC2: components = 2; normalized = GL_TRUE; @@ -743,10 +735,6 @@ GLenum OpenGL::getGLVertexDataType(DataFormat format, int &components, GLboolean normalized = GL_TRUE; return GL_UNSIGNED_SHORT; - case DATAFORMAT_INT16: - components = 1; - intformat = true; - return GL_SHORT; case DATAFORMAT_INT16_VEC2: components = 2; intformat = true; @@ -810,7 +798,7 @@ void OpenGL::deleteBuffer(GLuint buffer) { glDeleteBuffers(1, &buffer); - for (int i = 0; i < (int) BUFFER_MAX_ENUM; i++) + for (int i = 0; i < (int) BUFFERTYPE_MAX_ENUM; i++) { if (state.boundBuffers[i] == buffer) state.boundBuffers[i] = 0; @@ -857,7 +845,7 @@ void OpenGL::setVertexAttributes(const VertexAttributes &attributes, const Buffe const void *offsetpointer = reinterpret_cast(bufferinfo.offset + attrib.offsetFromVertex); - bindBuffer(BUFFER_VERTEX, (GLuint) bufferinfo.buffer->getHandle()); + bindBuffer(BUFFERTYPE_VERTEX, (GLuint) bufferinfo.buffer->getHandle()); if (intformat) glVertexAttribIPointer(i, components, gltype, layout.stride, offsetpointer); diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index 01faf8a37..c61fc0ac6 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -453,7 +453,7 @@ private: // Tracked OpenGL state. struct { - GLuint boundBuffers[BUFFER_MAX_ENUM]; + GLuint boundBuffers[BUFFERTYPE_MAX_ENUM]; // Texture unit state (currently bound texture for each texture unit.) std::vector boundTextures[TEXTURE_MAX_ENUM]; diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index 42ab2f153..0b6c92e46 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -137,21 +137,18 @@ static const DataFormatInfo dataFormatInfo[] { DATA_BASETYPE_INT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_INT8_VEC4 { DATA_BASETYPE_UINT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_UINT8_VEC4 - { DATA_BASETYPE_SNORM, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 { DATA_BASETYPE_SNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 { DATA_BASETYPE_SNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 - { DATA_BASETYPE_UNORM, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 - { DATA_BASETYPE_UNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 - { DATA_BASETYPE_UNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + { DATA_BASETYPE_UNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_UNORM16_VEC2 + { DATA_BASETYPE_UNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_UNORM16_VEC4 - { DATA_BASETYPE_INT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 - { DATA_BASETYPE_INT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 - { DATA_BASETYPE_INT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + { DATA_BASETYPE_INT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_INT16_VEC2 + { DATA_BASETYPE_INT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_INT16_VEC4 - { DATA_BASETYPE_UINT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_SNORM16 - { DATA_BASETYPE_UINT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 - { DATA_BASETYPE_UINT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + { DATA_BASETYPE_UINT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_UINT16 + { DATA_BASETYPE_UINT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_UINT16_VEC2 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_UINT16_VEC4 { DATA_BASETYPE_BOOL, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_BOOL { DATA_BASETYPE_BOOL, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_BOOL_VEC2 @@ -176,62 +173,26 @@ size_t getIndexDataSize(IndexDataType type) } } -size_t getDataTypeSize(DataType datatype) -{ - switch (datatype) - { - case DATA_SNORM8: - case DATA_UNORM8: - case DATA_INT8: - case DATA_UINT8: - return sizeof(uint8); - case DATA_SNORM16: - case DATA_UNORM16: - case DATA_INT16: - case DATA_UINT16: - return sizeof(uint16); - case DATA_INT32: - case DATA_UINT32: - return sizeof(uint32); - case DATA_FLOAT: - return sizeof(float); - case DATA_MAX_ENUM: - return 0; - } - return 0; -} - -bool isDataTypeInteger(DataType datatype) -{ - switch (datatype) - { - case DATA_INT8: - case DATA_UINT8: - case DATA_INT16: - case DATA_UINT16: - case DATA_INT32: - case DATA_UINT32: - return true; - default: - return false; - } -} - IndexDataType getIndexDataTypeFromMax(size_t maxvalue) { return maxvalue > LOVE_UINT16_MAX ? INDEX_UINT32 : INDEX_UINT16; } +DataFormat getIndexDataFormat(IndexDataType type) +{ + return type == INDEX_UINT32 ? DATAFORMAT_UINT32 : DATAFORMAT_UINT16; +} + int getIndexCount(TriangleIndexMode mode, int vertexCount) { switch (mode) { - case TriangleIndexMode::NONE: + case TRIANGLEINDEX_NONE: return 0; - case TriangleIndexMode::STRIP: - case TriangleIndexMode::FAN: + case TRIANGLEINDEX_STRIP: + case TRIANGLEINDEX_FAN: return 3 * (vertexCount - 2); - case TriangleIndexMode::QUADS: + case TRIANGLEINDEX_QUADS: return vertexCount * 6 / 4; } return 0; @@ -242,9 +203,9 @@ static void fillIndicesT(TriangleIndexMode mode, T vertexStart, T vertexCount, T { switch (mode) { - case TriangleIndexMode::NONE: + case TRIANGLEINDEX_NONE: break; - case TriangleIndexMode::STRIP: + case TRIANGLEINDEX_STRIP: { int i = 0; for (T index = 0; index < vertexCount - 2; index++) @@ -255,7 +216,7 @@ static void fillIndicesT(TriangleIndexMode mode, T vertexStart, T vertexCount, T } } break; - case TriangleIndexMode::FAN: + case TRIANGLEINDEX_FAN: { int i = 0; for (T index = 2; index < vertexCount; index++) @@ -266,7 +227,7 @@ static void fillIndicesT(TriangleIndexMode mode, T vertexStart, T vertexCount, T } } break; - case TriangleIndexMode::QUADS: + case TRIANGLEINDEX_QUADS: { // 0---2 // | / | @@ -390,21 +351,13 @@ DEFINE_STRINGMAP_BEGIN(AttributeStep, STEP_MAX_ENUM, attributeStep) } DEFINE_STRINGMAP_END(AttributeStep, STEP_MAX_ENUM, attributeStep) -DEFINE_STRINGMAP_BEGIN(DataType, DATA_MAX_ENUM, dataType) +DEFINE_STRINGMAP_BEGIN(DataTypeDeprecated, DATADEPRECATED_MAX_ENUM, dataType) { - { "snorm8", DATA_SNORM8 }, - { "unorm8", DATA_UNORM8 }, - { "int8", DATA_INT8 }, - { "uint8", DATA_UINT8 }, - { "snorm16", DATA_SNORM16 }, - { "unorm16", DATA_UNORM16 }, - { "int16", DATA_INT16 }, - { "uint16", DATA_UINT16 }, - { "int32", DATA_INT32 }, - { "uint32", DATA_UINT32 }, - { "float", DATA_FLOAT }, + { "unorm8", DATADEPRECATED_UNORM8 }, + { "unorm16", DATADEPRECATED_UNORM16 }, + { "float", DATADEPRECATED_FLOAT }, } -DEFINE_STRINGMAP_END(DataType, DATA_MAX_ENUM, dataType) +DEFINE_STRINGMAP_END(DataTypeDeprecated, DATADEPRECATED_MAX_ENUM, dataType) DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) { @@ -440,15 +393,12 @@ DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) { "int8vec4", DATAFORMAT_INT8_VEC4 }, { "uint8vec4", DATAFORMAT_UINT8_VEC4 }, - { "snorm16", DATAFORMAT_SNORM16 }, { "snorm16vec2", DATAFORMAT_SNORM16_VEC2 }, { "snorm16vec4", DATAFORMAT_SNORM16_VEC4 }, - { "unorm16", DATAFORMAT_UNORM16 }, { "unorm16vec2", DATAFORMAT_UNORM16_VEC2 }, { "unorm16vec4", DATAFORMAT_UNORM16_VEC4 }, - { "int16", DATAFORMAT_INT16 }, { "int16vec2", DATAFORMAT_INT16_VEC2 }, { "int16vec4", DATAFORMAT_INT16_VEC4 }, diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index aacd0f53f..cac61989f 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -56,19 +56,11 @@ enum BuiltinVertexAttributeFlags enum BufferType { - BUFFER_VERTEX = 0, - BUFFER_INDEX, - BUFFER_UNIFORM, - BUFFER_SHADER_STORAGE, - BUFFER_MAX_ENUM -}; - -enum BufferTypeFlags -{ - BUFFERFLAG_VERTEX = 1 << BUFFER_VERTEX, - BUFFERFLAG_INDEX = 1 << BUFFER_INDEX, - BUFFERFLAG_UNIFORM = 1 << BUFFER_UNIFORM, - BUFFERFLAG_SHADER_STORAGE = 1 << BUFFER_SHADER_STORAGE, + BUFFERTYPE_VERTEX = 0, + BUFFERTYPE_INDEX, + BUFFERTYPE_UNIFORM, + BUFFERTYPE_SHADER_STORAGE, + BUFFERTYPE_MAX_ENUM }; enum IndexDataType @@ -112,24 +104,12 @@ enum BufferUsage BUFFERUSAGE_MAX_ENUM }; -enum DataType +enum DataTypeDeprecated { - DATA_SNORM8, - DATA_UNORM8, - DATA_INT8, - DATA_UINT8, - - DATA_SNORM16, - DATA_UNORM16, - DATA_INT16, - DATA_UINT16, - - DATA_INT32, - DATA_UINT32, - - DATA_FLOAT, - - DATA_MAX_ENUM + DATADEPRECATED_UNORM8, + DATADEPRECATED_UNORM16, + DATADEPRECATED_FLOAT, + DATADEPRECATED_MAX_ENUM }; // Value types used when interfacing with the GPU (vertex and shader data). @@ -164,22 +144,16 @@ enum DataFormat DATAFORMAT_UINT32_VEC4, DATAFORMAT_SNORM8_VEC4, - DATAFORMAT_UNORM8_VEC4, - DATAFORMAT_INT8_VEC4, - DATAFORMAT_UINT8_VEC4, - DATAFORMAT_SNORM16, DATAFORMAT_SNORM16_VEC2, DATAFORMAT_SNORM16_VEC4, - DATAFORMAT_UNORM16, DATAFORMAT_UNORM16_VEC2, DATAFORMAT_UNORM16_VEC4, - DATAFORMAT_INT16, DATAFORMAT_INT16_VEC2, DATAFORMAT_INT16_VEC4, @@ -213,12 +187,12 @@ enum Winding WINDING_MAX_ENUM }; -enum class TriangleIndexMode +enum TriangleIndexMode { - NONE, - STRIP, - FAN, - QUADS, + TRIANGLEINDEX_NONE, + TRIANGLEINDEX_STRIP, + TRIANGLEINDEX_FAN, + TRIANGLEINDEX_QUADS, }; enum class CommonFormat @@ -403,10 +377,8 @@ inline CommonFormat getSinglePositionFormat(bool is2D) const DataFormatInfo &getDataFormatInfo(DataFormat format); size_t getIndexDataSize(IndexDataType type); -size_t getDataTypeSize(DataType datatype); -bool isDataTypeInteger(DataType datatype); - IndexDataType getIndexDataTypeFromMax(size_t maxvalue); +DataFormat getIndexDataFormat(IndexDataType type); int getIndexCount(TriangleIndexMode mode, int vertexCount); @@ -418,7 +390,7 @@ DECLARE_STRINGMAP(IndexDataType); DECLARE_STRINGMAP(BufferUsage); DECLARE_STRINGMAP(PrimitiveType); DECLARE_STRINGMAP(AttributeStep); -DECLARE_STRINGMAP(DataType); +DECLARE_STRINGMAP(DataTypeDeprecated); DECLARE_STRINGMAP(DataFormat); DECLARE_STRINGMAP(DataBaseType); DECLARE_STRINGMAP(CullMode); diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 0ea9e52c0..ef45b95be 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1503,7 +1503,7 @@ static Mesh *newCustomMesh(lua_State *L) // First argument is the vertex format, second is a table of vertices or // the number of vertices. - std::vector vertexformat; + std::vector vertexformat; PrimitiveType drawmode = luax_optmeshdrawmode(L, 3, PRIMITIVE_TRIANGLE_FAN); BufferUsage usage = luax_optmeshusage(L, 4, BUFFERUSAGE_DYNAMIC); @@ -1525,27 +1525,35 @@ static Mesh *newCustomMesh(lua_State *L) for (int j = 1; j <= 3; j++) lua_rawgeti(L, -j, j); - Mesh::AttribFormat format; - format.name = luaL_checkstring(L, -3); + const char *name = luaL_checkstring(L, -3); + DataFormat format = DATAFORMAT_FLOAT; const char *tname = luaL_checkstring(L, -2); - if (strcmp(tname, "byte") == 0) // Legacy name. - format.type = DATA_UNORM8; - else if (!getConstant(tname, format.type)) - { - luax_enumerror(L, "Mesh vertex data type name", getConstants(format.type), tname); - return nullptr; - } - format.components = (int) luaL_checkinteger(L, -1); - if (format.components <= 0 || format.components > 4) + if (!getConstant(tname, format)) { - luaL_error(L, "Number of vertex attribute components must be between 1 and 4 (got %d)", format.components); - return nullptr; + DataTypeDeprecated legacyType = DATADEPRECATED_FLOAT; + + if (strcmp(tname, "byte") == 0) // Legacy name. + legacyType = DATADEPRECATED_UNORM8; + else if (!getConstant(tname, legacyType)) + { + luax_enumerror(L, "Mesh vertex data format name", getConstants(format), tname); + return nullptr; + } + + int components = (int) luaL_checkinteger(L, -1); + if (components <= 0 || components > 4) + { + luaL_error(L, "Number of vertex attribute components must be between 1 and 4 (got %d)", components); + return nullptr; + } + + // TODO: convert legacy type+components to new format enum. } lua_pop(L, 4); - vertexformat.push_back(format); + vertexformat.emplace_back(name, format); } if (lua_isnumber(L, 2)) @@ -1570,10 +1578,6 @@ static Mesh *newCustomMesh(lua_State *L) } lua_pop(L, 1); - int vertexcomponents = 0; - for (const Mesh::AttribFormat &format : vertexformat) - vertexcomponents += format.components; - size_t numvertices = luax_objlen(L, 2); luax_catchexcept(L, [&](){ t = instance()->newMesh(vertexformat, numvertices, drawmode, usage); }); @@ -1590,7 +1594,8 @@ static Mesh *newCustomMesh(lua_State *L) int n = 0; for (size_t i = 0; i < vertexformat.size(); i++) { - int components = vertexformat[i].components; + const auto &info = getDataFormatInfo(vertexformat[i].format); + int components = info.components; // get vertices[vertindex][n] for (int c = 0; c < components; c++) @@ -1600,7 +1605,7 @@ static Mesh *newCustomMesh(lua_State *L) } // Fetch the values from Lua and store them in data buffer. - luax_writeAttributeData(L, -components, vertexformat[i].type, components, data); + luax_writeAttributeData(L, -components, vertexformat[i].format, components, data); lua_pop(L, components); diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index 8bad4cbfa..4f6d5c617 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -54,7 +54,7 @@ template static inline size_t writeSNormData(lua_State *L, int startidx, int components, char *data) { auto componentdata = (T *) data; - auto maxval = std::numeric_limits::max(); + const auto maxval = std::numeric_limits::max(); for (int i = 0; i < components; i++) componentdata[i] = (T) (luax_optnumberclamped(L, startidx + i, -1.0, 1.0, defaultComponents[i]) * maxval); @@ -66,7 +66,7 @@ template static inline size_t writeUNormData(lua_State *L, int startidx, int components, char *data) { auto componentdata = (T *) data; - auto maxval = std::numeric_limits::max(); + const auto maxval = std::numeric_limits::max(); for (int i = 0; i < components; i++) componentdata[i] = (T) (luax_optnumberclamped01(L, startidx + i, 1.0) * maxval); @@ -74,32 +74,54 @@ static inline size_t writeUNormData(lua_State *L, int startidx, int components, return sizeof(T) * components; } -char *luax_writeAttributeData(lua_State *L, int startidx, DataType type, int components, char *data) +char *luax_writeAttributeData(lua_State *L, int startidx, DataFormat format, int components, char *data) { - switch (type) + switch (format) { - case DATA_SNORM8: - return data + writeSNormData(L, startidx, components, data); - case DATA_UNORM8: - return data + writeUNormData(L, startidx, components, data); - case DATA_INT8: - return data + writeData(L, startidx, components, data); - case DATA_UINT8: - return data + writeData(L, startidx, components, data); - case DATA_SNORM16: - return data + writeSNormData(L, startidx, components, data); - case DATA_UNORM16: - return data + writeUNormData(L, startidx, components, data); - case DATA_INT16: - return data + writeData(L, startidx, components, data); - case DATA_UINT16: - return data + writeData(L, startidx, components, data); - case DATA_INT32: - return data + writeData(L, startidx, components, data); - case DATA_UINT32: - return data + writeData(L, startidx, components, data); - case DATA_FLOAT: + case DATAFORMAT_FLOAT: + case DATAFORMAT_FLOAT_VEC2: + case DATAFORMAT_FLOAT_VEC3: + case DATAFORMAT_FLOAT_VEC4: return data + writeData(L, startidx, components, data); + + case DATAFORMAT_INT32: + case DATAFORMAT_INT32_VEC2: + case DATAFORMAT_INT32_VEC3: + case DATAFORMAT_INT32_VEC4: + return data + writeData(L, startidx, components, data); + + case DATAFORMAT_UINT32: + case DATAFORMAT_UINT32_VEC2: + case DATAFORMAT_UINT32_VEC3: + case DATAFORMAT_UINT32_VEC4: + return data + writeData(L, startidx, components, data); + + case DATAFORMAT_SNORM8_VEC4: + return data + writeSNormData(L, startidx, 4, data); + case DATAFORMAT_UNORM8_VEC4: + return data + writeUNormData(L, startidx, 4, data); + case DATAFORMAT_INT8_VEC4: + return data + writeData(L, startidx, 4, data); + case DATAFORMAT_UINT8_VEC4: + return data + writeData(L, startidx, 4, data); + + case DATAFORMAT_SNORM16_VEC2: + case DATAFORMAT_SNORM16_VEC4: + return data + writeSNormData(L, startidx, components, data); + + case DATAFORMAT_UNORM16_VEC2: + case DATAFORMAT_UNORM16_VEC4: + return data + writeUNormData(L, startidx, components, data); + + case DATAFORMAT_INT16_VEC2: + case DATAFORMAT_INT16_VEC4: + return data + writeData(L, startidx, components, data); + + case DATAFORMAT_UINT16: + case DATAFORMAT_UINT16_VEC2: + case DATAFORMAT_UINT16_VEC4: + return data + writeData(L, startidx, components, data); + default: return data; } @@ -108,7 +130,7 @@ char *luax_writeAttributeData(lua_State *L, int startidx, DataType type, int com template static inline size_t readData(lua_State *L, int components, const char *data) { - auto componentdata = (const T *) data; + const auto componentdata = (const T *) data; for (int i = 0; i < components; i++) lua_pushnumber(L, (lua_Number) componentdata[i]); @@ -119,8 +141,8 @@ static inline size_t readData(lua_State *L, int components, const char *data) template static inline size_t readSNormData(lua_State *L, int components, const char *data) { - auto componentdata = (const T *) data; - auto maxval = std::numeric_limits::max(); + const auto componentdata = (const T *) data; + const auto maxval = std::numeric_limits::max(); for (int i = 0; i < components; i++) lua_pushnumber(L, std::max(-1.0, (lua_Number) componentdata[i] / (lua_Number)maxval)); @@ -131,8 +153,8 @@ static inline size_t readSNormData(lua_State *L, int components, const char *dat template static inline size_t readUNormData(lua_State *L, int components, const char *data) { - auto componentdata = (const T *) data; - auto maxval = std::numeric_limits::max(); + const auto componentdata = (const T *) data; + const auto maxval = std::numeric_limits::max(); for (int i = 0; i < components; i++) lua_pushnumber(L, (lua_Number) componentdata[i] / (lua_Number)maxval); @@ -140,32 +162,54 @@ static inline size_t readUNormData(lua_State *L, int components, const char *dat return sizeof(T) * components; } -const char *luax_readAttributeData(lua_State *L, DataType type, int components, const char *data) +const char *luax_readAttributeData(lua_State *L, DataFormat format, int components, const char *data) { - switch (type) + switch (format) { - case DATA_SNORM8: - return data + readSNormData(L, components, data); - case DATA_UNORM8: - return data + readUNormData(L, components, data); - case DATA_INT8: - return data + readData(L, components, data); - case DATA_UINT8: - return data + readData(L, components, data); - case DATA_SNORM16: - return data + readSNormData(L, components, data); - case DATA_UNORM16: - return data + readUNormData(L, components, data); - case DATA_INT16: - return data + readData(L, components, data); - case DATA_UINT16: - return data + readData(L, components, data); - case DATA_INT32: - return data + readData(L, components, data); - case DATA_UINT32: - return data + readData(L, components, data); - case DATA_FLOAT: + case DATAFORMAT_FLOAT: + case DATAFORMAT_FLOAT_VEC2: + case DATAFORMAT_FLOAT_VEC3: + case DATAFORMAT_FLOAT_VEC4: return data + readData(L, components, data); + + case DATAFORMAT_INT32: + case DATAFORMAT_INT32_VEC2: + case DATAFORMAT_INT32_VEC3: + case DATAFORMAT_INT32_VEC4: + return data + readData(L, components, data); + + case DATAFORMAT_UINT32: + case DATAFORMAT_UINT32_VEC2: + case DATAFORMAT_UINT32_VEC3: + case DATAFORMAT_UINT32_VEC4: + return data + readData(L, components, data); + + case DATAFORMAT_SNORM8_VEC4: + return data + readSNormData(L, 4, data); + case DATAFORMAT_UNORM8_VEC4: + return data + readUNormData(L, 4, data); + case DATAFORMAT_INT8_VEC4: + return data + readData(L, 4, data); + case DATAFORMAT_UINT8_VEC4: + return data + readData(L, 4, data); + + case DATAFORMAT_SNORM16_VEC2: + case DATAFORMAT_SNORM16_VEC4: + return data + readSNormData(L, components, data); + + case DATAFORMAT_UNORM16_VEC2: + case DATAFORMAT_UNORM16_VEC4: + return data + readUNormData(L, components, data); + + case DATAFORMAT_INT16_VEC2: + case DATAFORMAT_INT16_VEC4: + return data + readData(L, components, data); + + case DATAFORMAT_UINT16: + case DATAFORMAT_UINT16_VEC2: + case DATAFORMAT_UINT16_VEC4: + return data + readData(L, components, data); + default: return data; } @@ -216,11 +260,11 @@ int w_Mesh_setVertices(lua_State *L) if (vertstart + vertcount > totalverts) return luaL_error(L, "Too many vertices (expected at most %d, got %d)", totalverts - vertstart, vertcount); - const std::vector &vertexformat = t->getVertexFormat(); + const std::vector &vertexformat = t->getVertexFormat(); int ncomponents = 0; - for (const Mesh::AttribFormat &format : vertexformat) - ncomponents += format.components; + for (const Buffer::DataMember &member : vertexformat) + ncomponents += member.info.components; char *data = (char *) t->mapVertexData() + byteoffset; @@ -236,11 +280,11 @@ int w_Mesh_setVertices(lua_State *L) int idx = -ncomponents; - for (const Mesh::AttribFormat &format : vertexformat) + for (const Buffer::DataMember &member : vertexformat) { // Fetch the values from Lua and store them in data buffer. - data = luax_writeAttributeData(L, idx, format.type, format.components, data); - idx += format.components; + data = luax_writeAttributeData(L, idx, member.decl.format, member.info.components, data); + idx += member.info.components; } lua_pop(L, ncomponents + 1); @@ -257,7 +301,7 @@ int w_Mesh_setVertex(lua_State *L) bool istable = lua_istable(L, 3); - const std::vector &vertexformat = t->getVertexFormat(); + const std::vector &vertexformat = t->getVertexFormat(); char *data = (char *) t->getVertexScratchBuffer(); char *writtendata = data; @@ -266,25 +310,28 @@ int w_Mesh_setVertex(lua_State *L) if (istable) { - for (const Mesh::AttribFormat &format : vertexformat) + for (const Buffer::DataMember &member : vertexformat) { - for (int i = idx; i < idx + format.components; i++) + int components = member.info.components; + + for (int i = idx; i < idx + components; i++) lua_rawgeti(L, 3, i); // Fetch the values from Lua and store them in data buffer. - writtendata = luax_writeAttributeData(L, -format.components, format.type, format.components, writtendata); + writtendata = luax_writeAttributeData(L, -components, member.decl.format, components, writtendata); - idx += format.components; - lua_pop(L, format.components); + idx += components; + lua_pop(L, components); } } else { - for (const Mesh::AttribFormat &format : vertexformat) + for (const Buffer::DataMember &member : vertexformat) { // Fetch the values from Lua and store them in data buffer. - writtendata = luax_writeAttributeData(L, idx, format.type, format.components, writtendata); - idx += format.components; + int components = member.info.components; + writtendata = luax_writeAttributeData(L, idx, member.decl.format, components, writtendata); + idx += components; } } @@ -297,7 +344,7 @@ int w_Mesh_getVertex(lua_State *L) Mesh *t = luax_checkmesh(L, 1); size_t index = (size_t) luaL_checkinteger(L, 2) - 1; - const std::vector &vertexformat = t->getVertexFormat(); + const std::vector &vertexformat = t->getVertexFormat(); char *data = (char *) t->getVertexScratchBuffer(); const char *readdata = data; @@ -306,10 +353,11 @@ int w_Mesh_getVertex(lua_State *L) int n = 0; - for (const Mesh::AttribFormat &format : vertexformat) + for (const Buffer::DataMember &member : vertexformat) { - readdata = luax_readAttributeData(L, format.type, format.components, readdata); - n += format.components; + int components = member.info.components; + readdata = luax_readAttributeData(L, member.decl.format, components, readdata); + n += components; } return n; @@ -321,15 +369,18 @@ int w_Mesh_setVertexAttribute(lua_State *L) size_t vertindex = (size_t) luaL_checkinteger(L, 2) - 1; int attribindex = (int) luaL_checkinteger(L, 3) - 1; - DataType type; - int components; - luax_catchexcept(L, [&](){ type = t->getAttributeInfo(attribindex, components); }); + const auto &vertexformat = t->getVertexFormat(); + + if (attribindex < 0 || attribindex >= (int) vertexformat.size()) + return luaL_error(L, "Invalid vertex attribute index: %d", attribindex + 1); + + const Buffer::DataMember &member = vertexformat[attribindex]; // Maximum possible size for a single vertex attribute. char data[sizeof(float) * 4]; // Fetch the values from Lua and store them in the data buffer. - luax_writeAttributeData(L, 4, type, components, data); + luax_writeAttributeData(L, 4, member.decl.format, member.info.components, data); luax_catchexcept(L, [&](){ t->setVertexAttribute(vertindex, attribindex, data, sizeof(float) * 4); }); return 0; @@ -341,17 +392,20 @@ int w_Mesh_getVertexAttribute(lua_State *L) size_t vertindex = (size_t) luaL_checkinteger(L, 2) - 1; int attribindex = (int) luaL_checkinteger(L, 3) - 1; - DataType type; - int components; - luax_catchexcept(L, [&](){ type = t->getAttributeInfo(attribindex, components); }); + const auto &vertexformat = t->getVertexFormat(); + + if (attribindex < 0 || attribindex >= (int) vertexformat.size()) + return luaL_error(L, "Invalid vertex attribute index: %d", attribindex + 1); + + const Buffer::DataMember &member = vertexformat[attribindex]; // Maximum possible size for a single vertex attribute. char data[sizeof(float) * 4]; luax_catchexcept(L, [&](){ t->getVertexAttribute(vertindex, attribindex, data, sizeof(float) * 4); }); - luax_readAttributeData(L, type, components, data); - return components; + luax_readAttributeData(L, member.decl.format, member.info.components, data); + return member.info.components; } int w_Mesh_getVertexCount(lua_State *L) @@ -365,28 +419,27 @@ int w_Mesh_getVertexFormat(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); - const std::vector &vertexformat = t->getVertexFormat(); + const std::vector &vertexformat = t->getVertexFormat(); lua_createtable(L, (int) vertexformat.size(), 0); const char *tname = nullptr; for (size_t i = 0; i < vertexformat.size(); i++) { - if (!getConstant(vertexformat[i].type, tname)) - return luax_enumerror(L, "vertex attribute data type", getConstants(vertexformat[i].type), tname); + const auto &decl = vertexformat[i].decl; + + if (!getConstant(decl.format, tname)) + return luax_enumerror(L, "vertex attribute data type", getConstants(decl.format), tname); lua_createtable(L, 3, 0); - lua_pushstring(L, vertexformat[i].name.c_str()); + lua_pushstring(L, decl.name.c_str()); lua_rawseti(L, -2, 1); lua_pushstring(L, tname); lua_rawseti(L, -2, 2); - lua_pushinteger(L, vertexformat[i].components); - lua_rawseti(L, -2, 3); - - // format[i] = {name, type, components} + // format[i] = {name, type} lua_rawseti(L, -2, (int) i + 1); } diff --git a/src/modules/graphics/wrap_Mesh.h b/src/modules/graphics/wrap_Mesh.h index b9477c624..29bc319bf 100644 --- a/src/modules/graphics/wrap_Mesh.h +++ b/src/modules/graphics/wrap_Mesh.h @@ -30,8 +30,8 @@ namespace love namespace graphics { -char *luax_writeAttributeData(lua_State *L, int startidx, DataType type, int components, char *data); -const char *luax_readAttributeData(lua_State *L, DataType type, int components, const char *data); +char *luax_writeAttributeData(lua_State *L, int startidx, DataFormat format, int components, char *data); +const char *luax_readAttributeData(lua_State *L, DataFormat format, int components, const char *data); Mesh *luax_checkmesh(lua_State *L, int idx); extern "C" int luaopen_mesh(lua_State *L); From c9809d8d827c68ff956adfb9d9aaee4396ebc217 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 1 Feb 2020 15:59:38 -0400 Subject: [PATCH 10/54] Clean up some Mesh code --- src/modules/graphics/Buffer.h | 20 ++++---------------- src/modules/graphics/Graphics.cpp | 2 +- src/modules/graphics/Mesh.cpp | 22 +++++----------------- src/modules/graphics/Mesh.h | 2 +- 4 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 12fc2659a..75e999dda 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -158,23 +158,11 @@ public: { public: - Mapper(Buffer &buffer) - : buf(buffer) - { - elems = buf.map(); - } + Mapper(Buffer &buffer) : buffer(buffer) { data = buffer.map(); } + ~Mapper() { buffer.unmap(); } - ~Mapper() - { - buf.unmap(); - } - - void *get() { return elems; } - - private: - - Buffer &buf; - void *elems; + Buffer &buffer; + void *data; }; // Mapper diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index d7e754aee..4369b2bdf 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -176,7 +176,7 @@ void Graphics::createQuadIndexBuffer() quadIndexBuffer = newIndexBuffer(INDEX_UINT16, nullptr, size, BUFFERUSAGE_STATIC, 0); Buffer::Mapper map(*quadIndexBuffer); - fillIndices(TRIANGLEINDEX_QUADS, 0, LOVE_UINT16_MAX, (uint16 *) map.get()); + fillIndices(TRIANGLEINDEX_QUADS, 0, LOVE_UINT16_MAX, (uint16 *) map.data); } Quad *Graphics::newQuad(Quad::Viewport v, double sw, double sh) diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index ef186137e..4396842d1 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -118,12 +118,6 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector & Mesh::~Mesh() { delete vertexScratchBuffer; - - for (const auto &attrib : attachedAttributes) - { - if (attrib.second.buffer != nullptr && attrib.second.buffer != vertexBuffer.get()) - attrib.second.buffer->release(); - } } void Mesh::setupAttachedAttributes() @@ -282,28 +276,22 @@ void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::s throw love::Exception("A maximum of %d attributes can be attached at once.", VertexAttributes::MAX); newattrib.buffer = buffer; - newattrib.enabled = oldattrib.buffer ? oldattrib.enabled : true; + newattrib.enabled = oldattrib.buffer.get() ? oldattrib.enabled : true; newattrib.index = buffer->getDataMemberIndex(attachname); newattrib.step = step; if (newattrib.index < 0) throw love::Exception("The specified vertex buffer does not have a vertex attribute named '%s'", attachname.c_str()); - newattrib.buffer->retain(); - attachedAttributes[name] = newattrib; - - if (oldattrib.buffer) - oldattrib.buffer->release(); } bool Mesh::detachAttribute(const std::string &name) { auto it = attachedAttributes.find(name); - if (it != attachedAttributes.end() && it->second.buffer != vertexBuffer.get()) + if (it != attachedAttributes.end()) { - it->second.buffer->release(); attachedAttributes.erase(it); if (getAttributeIndex(name) != -1) @@ -340,7 +328,7 @@ void Mesh::flush() template static void copyToIndexBuffer(const std::vector &indices, Buffer::Mapper &buffermap, size_t maxval) { - T *elems = (T *) buffermap.get(); + T *elems = (T *) buffermap.data; for (size_t i = 0; i < indices.size(); i++) { @@ -405,7 +393,7 @@ void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasiz return; Buffer::Mapper ibomap(*indexBuffer); - memcpy(ibomap.get(), data, datasize); + memcpy(ibomap.data, data, datasize); useIndexBuffer = true; indexDataType = datatype; @@ -541,7 +529,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) if (!attrib.second.enabled) continue; - Buffer *buffer = attrib.second.buffer; + Buffer *buffer = attrib.second.buffer.get(); int attributeindex = -1; // If the attribute is one of the LOVE-defined ones, use the constant diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 160dcf66e..7e099f3dc 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -174,7 +174,7 @@ private: struct AttachedAttribute { - Buffer *buffer; + StrongRef buffer; int index; AttributeStep step; bool enabled; From 2828761060a77b23fce5e26151f036462cd9a876 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 22 Feb 2020 18:58:41 -0400 Subject: [PATCH 11/54] Move some code from Mesh wrapper to Buffer wrapper --- src/modules/graphics/Buffer.cpp | 13 +- src/modules/graphics/Buffer.h | 4 +- src/modules/graphics/Graphics.cpp | 15 +- src/modules/graphics/Graphics.h | 3 +- src/modules/graphics/Shader.h | 5 - src/modules/graphics/opengl/Buffer.cpp | 4 - src/modules/graphics/opengl/OpenGL.cpp | 91 ++++------- src/modules/graphics/vertex.cpp | 78 +++++----- src/modules/graphics/vertex.h | 3 - src/modules/graphics/wrap_Buffer.cpp | 154 +++++++++++++++++++ src/modules/graphics/wrap_Buffer.h | 4 +- src/modules/graphics/wrap_Graphics.cpp | 7 +- src/modules/graphics/wrap_Mesh.cpp | 202 ++----------------------- src/modules/graphics/wrap_Mesh.h | 3 - 14 files changed, 251 insertions(+), 335 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index dfe6fedf5..f85205307 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -50,10 +50,8 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vectorgetCapabilities().features[Graphics::FEATURE_GLSL3]; - bool uniformbuffer = settings.typeFlags & TYPEFLAG_UNIFORM; bool indexbuffer = settings.typeFlags & TYPEFLAG_INDEX; bool vertexbuffer = settings.typeFlags & TYPEFLAG_VERTEX; - bool ssbuffer = settings.typeFlags & TYPEFLAG_SHADER_STORAGE; size_t offset = 0; size_t stride = 0; @@ -89,16 +87,11 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector format = { - { "index", getIndexDataFormat(dataType), 0 } - }; - - return newBuffer(settings, format, indices, size, 0); + std::vector dataformat = {{"", format, 0}}; + return newBuffer(settings, format, data, size, arraylength); } Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage) diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index e9784ad09..e47bc8b65 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -441,8 +441,7 @@ public: virtual Buffer *newBuffer(const Buffer::Settings &settings, const void *data, size_t size) = 0; virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) = 0; - - Buffer *newIndexBuffer(IndexDataType dataType, const void *indices, size_t size, BufferUsage usage, uint32 mapflags); + virtual Buffer *newBuffer(const Buffer::Settings &settings, DataFormat format, const void *data, size_t size, size_t arraylength); Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage); Mesh *newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage); diff --git a/src/modules/graphics/Shader.h b/src/modules/graphics/Shader.h index 600cffce6..b31e56546 100644 --- a/src/modules/graphics/Shader.h +++ b/src/modules/graphics/Shader.h @@ -33,11 +33,6 @@ #include #include -namespace glslang -{ -class TShader; -} - namespace love { namespace graphics diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 2c94deaee..698aa5352 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -59,10 +59,6 @@ void Buffer::initialize(const void *data) mapType = BUFFERTYPE_VERTEX; else if (typeFlags & TYPEFLAG_INDEX) mapType = BUFFERTYPE_INDEX; - else if (typeFlags & TYPEFLAG_UNIFORM) - mapType = BUFFERTYPE_UNIFORM; - else if (typeFlags & TYPEFLAG_SHADER_STORAGE) - mapType = BUFFERTYPE_SHADER_STORAGE; target = OpenGL::getGLBufferType(mapType); diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 4682ca174..215e33f35 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -562,16 +562,11 @@ GLenum OpenGL::getGLPrimitiveType(PrimitiveType type) { switch (type) { - case PRIMITIVE_TRIANGLES: - return GL_TRIANGLES; - case PRIMITIVE_TRIANGLE_STRIP: - return GL_TRIANGLE_STRIP; - case PRIMITIVE_TRIANGLE_FAN: - return GL_TRIANGLE_FAN; - case PRIMITIVE_POINTS: - return GL_POINTS; - case PRIMITIVE_MAX_ENUM: - return GL_ZERO; + case PRIMITIVE_TRIANGLES: return GL_TRIANGLES; + case PRIMITIVE_TRIANGLE_STRIP: return GL_TRIANGLE_STRIP; + case PRIMITIVE_TRIANGLE_FAN: return GL_TRIANGLE_FAN; + case PRIMITIVE_POINTS: return GL_POINTS; + case PRIMITIVE_MAX_ENUM: return GL_ZERO; } return GL_ZERO; @@ -581,16 +576,9 @@ GLenum OpenGL::getGLBufferType(BufferType type) { switch (type) { - case BUFFERTYPE_VERTEX: - return GL_ARRAY_BUFFER; - case BUFFERTYPE_INDEX: - return GL_ELEMENT_ARRAY_BUFFER; - case BUFFERTYPE_UNIFORM: - return GL_UNIFORM_BUFFER; - case BUFFERTYPE_SHADER_STORAGE: - return GL_SHADER_STORAGE_BUFFER; - case BUFFERTYPE_MAX_ENUM: - return GL_ZERO; + case BUFFERTYPE_VERTEX: return GL_ARRAY_BUFFER; + case BUFFERTYPE_INDEX: return GL_ELEMENT_ARRAY_BUFFER; + case BUFFERTYPE_MAX_ENUM: return GL_ZERO; } return GL_ZERO; @@ -600,16 +588,11 @@ GLenum OpenGL::getGLTextureType(TextureType type) { switch (type) { - case TEXTURE_2D: - return GL_TEXTURE_2D; - case TEXTURE_VOLUME: - return GL_TEXTURE_3D; - case TEXTURE_2D_ARRAY: - return GL_TEXTURE_2D_ARRAY; - case TEXTURE_CUBE: - return GL_TEXTURE_CUBE_MAP; - case TEXTURE_MAX_ENUM: - return GL_ZERO; + case TEXTURE_2D: return GL_TEXTURE_2D; + case TEXTURE_VOLUME: return GL_TEXTURE_3D; + case TEXTURE_2D_ARRAY: return GL_TEXTURE_2D_ARRAY; + case TEXTURE_CUBE: return GL_TEXTURE_CUBE_MAP; + case TEXTURE_MAX_ENUM: return GL_ZERO; } return GL_ZERO; @@ -619,12 +602,9 @@ GLenum OpenGL::getGLIndexDataType(IndexDataType type) { switch (type) { - case INDEX_UINT16: - return GL_UNSIGNED_SHORT; - case INDEX_UINT32: - return GL_UNSIGNED_INT; - default: - return GL_ZERO; + case INDEX_UINT16: return GL_UNSIGNED_SHORT; + case INDEX_UINT32: return GL_UNSIGNED_INT; + default: return GL_ZERO; } } @@ -771,14 +751,10 @@ GLenum OpenGL::getGLBufferUsage(BufferUsage usage) { switch (usage) { - case BUFFERUSAGE_STREAM: - return GL_STREAM_DRAW; - case BUFFERUSAGE_DYNAMIC: - return GL_DYNAMIC_DRAW; - case BUFFERUSAGE_STATIC: - return GL_STATIC_DRAW; - default: - return 0; + case BUFFERUSAGE_STREAM: return GL_STREAM_DRAW; + case BUFFERUSAGE_DYNAMIC: return GL_DYNAMIC_DRAW; + case BUFFERUSAGE_STATIC: return GL_STATIC_DRAW; + default: return 0; } } @@ -1165,24 +1141,15 @@ GLint OpenGL::getGLCompareMode(CompareMode mode) { switch (mode) { - case COMPARE_LESS: - return GL_LESS; - case COMPARE_LEQUAL: - return GL_LEQUAL; - case COMPARE_EQUAL: - return GL_EQUAL; - case COMPARE_GEQUAL: - return GL_GEQUAL; - case COMPARE_GREATER: - return GL_GREATER; - case COMPARE_NOTEQUAL: - return GL_NOTEQUAL; - case COMPARE_ALWAYS: - return GL_ALWAYS; - case COMPARE_NEVER: - return GL_NEVER; - default: - return GL_NEVER; + case COMPARE_LESS: return GL_LESS; + case COMPARE_LEQUAL: return GL_LEQUAL; + case COMPARE_EQUAL: return GL_EQUAL; + case COMPARE_GEQUAL: return GL_GEQUAL; + case COMPARE_GREATER: return GL_GREATER; + case COMPARE_NOTEQUAL: return GL_NOTEQUAL; + case COMPARE_ALWAYS: return GL_ALWAYS; + case COMPARE_NEVER: return GL_NEVER; + default: return GL_NEVER; } } diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index 0b6c92e46..c5e3e32dd 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -104,56 +104,56 @@ int getFormatPositionComponents(CommonFormat format) // Order here relies on order of DataFormat enum. static const DataFormatInfo dataFormatInfo[] { - // baseType, isMatrix, components, rows, columns, componentSize, align, size - { DATA_BASETYPE_FLOAT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_FLOAT - { DATA_BASETYPE_FLOAT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_FLOAT_VEC2 - { DATA_BASETYPE_FLOAT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_FLOAT_VEC3 - { DATA_BASETYPE_FLOAT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_FLOAT_VEC4 + // baseType, isMatrix, components, rows, columns, componentSize, size + { DATA_BASETYPE_FLOAT, false, 1, 0, 0, 4, 4 }, // DATAFORMAT_FLOAT + { DATA_BASETYPE_FLOAT, false, 2, 0, 0, 4, 8 }, // DATAFORMAT_FLOAT_VEC2 + { DATA_BASETYPE_FLOAT, false, 3, 0, 0, 4, 12 }, // DATAFORMAT_FLOAT_VEC3 + { DATA_BASETYPE_FLOAT, false, 4, 0, 0, 4, 16 }, // DATAFORMAT_FLOAT_VEC4 - { DATA_BASETYPE_FLOAT, true, 0, 2, 2, 4, 4, 16 }, // DATAFORMAT_FLOAT_MAT2X2 - { DATA_BASETYPE_FLOAT, true, 0, 2, 3, 4, 4, 24 }, // DATAFORMAT_FLOAT_MAT2X3 - { DATA_BASETYPE_FLOAT, true, 0, 2, 4, 4, 4, 32 }, // DATAFORMAT_FLOAT_MAT2X4 + { DATA_BASETYPE_FLOAT, true, 0, 2, 2, 4, 16 }, // DATAFORMAT_FLOAT_MAT2X2 + { DATA_BASETYPE_FLOAT, true, 0, 2, 3, 4, 24 }, // DATAFORMAT_FLOAT_MAT2X3 + { DATA_BASETYPE_FLOAT, true, 0, 2, 4, 4, 32 }, // DATAFORMAT_FLOAT_MAT2X4 - { DATA_BASETYPE_FLOAT, true, 0, 3, 2, 4, 4, 24 }, // DATAFORMAT_FLOAT_MAT3X2 - { DATA_BASETYPE_FLOAT, true, 0, 3, 3, 4, 4, 36 }, // DATAFORMAT_FLOAT_MAT3X3 - { DATA_BASETYPE_FLOAT, true, 0, 3, 4, 4, 4, 48 }, // DATAFORMAT_FLOAT_MAT3X4 + { DATA_BASETYPE_FLOAT, true, 0, 3, 2, 4, 24 }, // DATAFORMAT_FLOAT_MAT3X2 + { DATA_BASETYPE_FLOAT, true, 0, 3, 3, 4, 36 }, // DATAFORMAT_FLOAT_MAT3X3 + { DATA_BASETYPE_FLOAT, true, 0, 3, 4, 4, 48 }, // DATAFORMAT_FLOAT_MAT3X4 - { DATA_BASETYPE_FLOAT, true, 0, 4, 2, 4, 4, 32 }, // DATAFORMAT_FLOAT_MAT4X2 - { DATA_BASETYPE_FLOAT, true, 0, 4, 3, 4, 4, 48 }, // DATAFORMAT_FLOAT_MAT4X3 - { DATA_BASETYPE_FLOAT, true, 0, 4, 4, 4, 4, 64 }, // DATAFORMAT_FLOAT_MAT4X4 + { DATA_BASETYPE_FLOAT, true, 0, 4, 2, 4, 32 }, // DATAFORMAT_FLOAT_MAT4X2 + { DATA_BASETYPE_FLOAT, true, 0, 4, 3, 4, 48 }, // DATAFORMAT_FLOAT_MAT4X3 + { DATA_BASETYPE_FLOAT, true, 0, 4, 4, 4, 64 }, // DATAFORMAT_FLOAT_MAT4X4 - { DATA_BASETYPE_INT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_INT32 - { DATA_BASETYPE_INT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_INT32_VEC2 - { DATA_BASETYPE_INT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_INT32_VEC3 - { DATA_BASETYPE_INT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_INT32_VEC4 + { DATA_BASETYPE_INT, false, 1, 0, 0, 4, 4 }, // DATAFORMAT_INT32 + { DATA_BASETYPE_INT, false, 2, 0, 0, 4, 8 }, // DATAFORMAT_INT32_VEC2 + { DATA_BASETYPE_INT, false, 3, 0, 0, 4, 12 }, // DATAFORMAT_INT32_VEC3 + { DATA_BASETYPE_INT, false, 4, 0, 0, 4, 16 }, // DATAFORMAT_INT32_VEC4 - { DATA_BASETYPE_UINT, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_UINT32 - { DATA_BASETYPE_UINT, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_UINT32_VEC2 - { DATA_BASETYPE_UINT, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_UINT32_VEC3 - { DATA_BASETYPE_UINT, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_UINT32_VEC4 + { DATA_BASETYPE_UINT, false, 1, 0, 0, 4, 4 }, // DATAFORMAT_UINT32 + { DATA_BASETYPE_UINT, false, 2, 0, 0, 4, 8 }, // DATAFORMAT_UINT32_VEC2 + { DATA_BASETYPE_UINT, false, 3, 0, 0, 4, 12 }, // DATAFORMAT_UINT32_VEC3 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 4, 16 }, // DATAFORMAT_UINT32_VEC4 - { DATA_BASETYPE_SNORM, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_SNORM8_VEC4 - { DATA_BASETYPE_UNORM, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_UNORM8_VEC4 - { DATA_BASETYPE_INT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_INT8_VEC4 - { DATA_BASETYPE_UINT, false, 4, 0, 0, 1, 1, 4 }, // DATAFORMAT_UINT8_VEC4 + { DATA_BASETYPE_SNORM, false, 4, 0, 0, 1, 4 }, // DATAFORMAT_SNORM8_VEC4 + { DATA_BASETYPE_UNORM, false, 4, 0, 0, 1, 4 }, // DATAFORMAT_UNORM8_VEC4 + { DATA_BASETYPE_INT, false, 4, 0, 0, 1, 4 }, // DATAFORMAT_INT8_VEC4 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 1, 4 }, // DATAFORMAT_UINT8_VEC4 - { DATA_BASETYPE_SNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 - { DATA_BASETYPE_SNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 + { DATA_BASETYPE_SNORM, false, 2, 0, 0, 2, 4 }, // DATAFORMAT_SNORM16_VEC2 + { DATA_BASETYPE_SNORM, false, 4, 0, 0, 2, 8 }, // DATAFORMAT_SNORM16_VEC4 - { DATA_BASETYPE_UNORM, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_UNORM16_VEC2 - { DATA_BASETYPE_UNORM, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_UNORM16_VEC4 + { DATA_BASETYPE_UNORM, false, 2, 0, 0, 2, 4 }, // DATAFORMAT_UNORM16_VEC2 + { DATA_BASETYPE_UNORM, false, 4, 0, 0, 2, 8 }, // DATAFORMAT_UNORM16_VEC4 - { DATA_BASETYPE_INT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_INT16_VEC2 - { DATA_BASETYPE_INT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_INT16_VEC4 + { DATA_BASETYPE_INT, false, 2, 0, 0, 2, 4 }, // DATAFORMAT_INT16_VEC2 + { DATA_BASETYPE_INT, false, 4, 0, 0, 2, 8 }, // DATAFORMAT_INT16_VEC4 - { DATA_BASETYPE_UINT, false, 1, 0, 0, 2, 2, 2 }, // DATAFORMAT_UINT16 - { DATA_BASETYPE_UINT, false, 2, 0, 0, 2, 2, 4 }, // DATAFORMAT_UINT16_VEC2 - { DATA_BASETYPE_UINT, false, 4, 0, 0, 2, 2, 8 }, // DATAFORMAT_UINT16_VEC4 + { DATA_BASETYPE_UINT, false, 1, 0, 0, 2, 2 }, // DATAFORMAT_UINT16 + { DATA_BASETYPE_UINT, false, 2, 0, 0, 2, 4 }, // DATAFORMAT_UINT16_VEC2 + { DATA_BASETYPE_UINT, false, 4, 0, 0, 2, 8 }, // DATAFORMAT_UINT16_VEC4 - { DATA_BASETYPE_BOOL, false, 1, 0, 0, 4, 4, 4 }, // DATAFORMAT_BOOL - { DATA_BASETYPE_BOOL, false, 2, 0, 0, 4, 4, 8 }, // DATAFORMAT_BOOL_VEC2 - { DATA_BASETYPE_BOOL, false, 3, 0, 0, 4, 4, 12 }, // DATAFORMAT_BOOL_VEC3 - { DATA_BASETYPE_BOOL, false, 4, 0, 0, 4, 4, 16 }, // DATAFORMAT_BOOL_VEC4 + { DATA_BASETYPE_BOOL, false, 1, 0, 0, 4, 4 }, // DATAFORMAT_BOOL + { DATA_BASETYPE_BOOL, false, 2, 0, 0, 4, 8 }, // DATAFORMAT_BOOL_VEC2 + { DATA_BASETYPE_BOOL, false, 3, 0, 0, 4, 12 }, // DATAFORMAT_BOOL_VEC3 + { DATA_BASETYPE_BOOL, false, 4, 0, 0, 4, 16 }, // DATAFORMAT_BOOL_VEC4 }; static_assert((sizeof(dataFormatInfo) / sizeof(DataFormatInfo)) == DATAFORMAT_MAX_ENUM, "dataFormatInfo array size must match number of DataFormat enum values."); diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index cac61989f..a24e92604 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -58,8 +58,6 @@ enum BufferType { BUFFERTYPE_VERTEX = 0, BUFFERTYPE_INDEX, - BUFFERTYPE_UNIFORM, - BUFFERTYPE_SHADER_STORAGE, BUFFERTYPE_MAX_ENUM }; @@ -218,7 +216,6 @@ struct DataFormatInfo int matrixRows; int matrixColumns; size_t componentSize; - size_t alignment; size_t size; }; diff --git a/src/modules/graphics/wrap_Buffer.cpp b/src/modules/graphics/wrap_Buffer.cpp index 7b69a6519..d352c40f8 100644 --- a/src/modules/graphics/wrap_Buffer.cpp +++ b/src/modules/graphics/wrap_Buffer.cpp @@ -26,6 +26,160 @@ namespace love namespace graphics { +static const double defaultComponents[] = {0.0, 0.0, 0.0, 1.0}; + +template +static inline size_t writeData(lua_State *L, int startidx, int components, char *data) +{ + auto componentdata = (T *) data; + + for (int i = 0; i < components; i++) + componentdata[i] = (T) (luaL_optnumber(L, startidx + i, defaultComponents[i])); + + return sizeof(T) * components; +} + +template +static inline size_t writeSNormData(lua_State *L, int startidx, int components, char *data) +{ + auto componentdata = (T *) data; + const auto maxval = std::numeric_limits::max(); + + for (int i = 0; i < components; i++) + componentdata[i] = (T) (luax_optnumberclamped(L, startidx + i, -1.0, 1.0, defaultComponents[i]) * maxval); + + return sizeof(T) * components; +} + +template +static inline size_t writeUNormData(lua_State *L, int startidx, int components, char *data) +{ + auto componentdata = (T *) data; + const auto maxval = std::numeric_limits::max(); + + for (int i = 0; i < components; i++) + componentdata[i] = (T) (luax_optnumberclamped01(L, startidx + i, 1.0) * maxval); + + return sizeof(T) * components; +} + +void luax_writebufferdata(lua_State *L, int startidx, DataFormat format, char *data) +{ + switch (format) + { + case DATAFORMAT_FLOAT: writeData(L, startidx, 1, data); break; + case DATAFORMAT_FLOAT_VEC2: writeData(L, startidx, 2, data); break; + case DATAFORMAT_FLOAT_VEC3: writeData(L, startidx, 3, data); break; + case DATAFORMAT_FLOAT_VEC4: writeData(L, startidx, 4, data); break; + + case DATAFORMAT_INT32: writeData(L, startidx, 1, data); break; + case DATAFORMAT_INT32_VEC2: writeData(L, startidx, 2, data); break; + case DATAFORMAT_INT32_VEC3: writeData(L, startidx, 3, data); break; + case DATAFORMAT_INT32_VEC4: writeData(L, startidx, 4, data); break; + + case DATAFORMAT_UINT32: writeData(L, startidx, 1, data); break; + case DATAFORMAT_UINT32_VEC2: writeData(L, startidx, 2, data); break; + case DATAFORMAT_UINT32_VEC3: writeData(L, startidx, 3, data); break; + case DATAFORMAT_UINT32_VEC4: writeData(L, startidx, 4, data); break; + + case DATAFORMAT_SNORM8_VEC4: writeSNormData(L, startidx, 4, data); break; + case DATAFORMAT_UNORM8_VEC4: writeUNormData(L, startidx, 4, data); break; + case DATAFORMAT_INT8_VEC4: writeData(L, startidx, 4, data); break; + case DATAFORMAT_UINT8_VEC4: writeData(L, startidx, 4, data); break; + + case DATAFORMAT_SNORM16_VEC2: writeSNormData(L, startidx, 2, data); break; + case DATAFORMAT_SNORM16_VEC4: writeSNormData(L, startidx, 4, data); break; + + case DATAFORMAT_UNORM16_VEC2: writeUNormData(L, startidx, 2, data); break; + case DATAFORMAT_UNORM16_VEC4: writeUNormData(L, startidx, 4, data); break; + + case DATAFORMAT_INT16_VEC2: writeData(L, startidx, 2, data); break; + case DATAFORMAT_INT16_VEC4: writeData(L, startidx, 4, data); break; + + case DATAFORMAT_UINT16: writeData(L, startidx, 1, data); break; + case DATAFORMAT_UINT16_VEC2: writeData(L, startidx, 2, data); break; + case DATAFORMAT_UINT16_VEC4: writeData(L, startidx, 4, data); break; + + default: break; + } +} + +template +static inline size_t readData(lua_State *L, int components, const char *data) +{ + const auto componentdata = (const T *) data; + + for (int i = 0; i < components; i++) + lua_pushnumber(L, (lua_Number) componentdata[i]); + + return sizeof(T) * components; +} + +template +static inline size_t readSNormData(lua_State *L, int components, const char *data) +{ + const auto componentdata = (const T *) data; + const auto maxval = std::numeric_limits::max(); + + for (int i = 0; i < components; i++) + lua_pushnumber(L, std::max(-1.0, (lua_Number) componentdata[i] / (lua_Number)maxval)); + + return sizeof(T) * components; +} + +template +static inline size_t readUNormData(lua_State *L, int components, const char *data) +{ + const auto componentdata = (const T *) data; + const auto maxval = std::numeric_limits::max(); + + for (int i = 0; i < components; i++) + lua_pushnumber(L, (lua_Number) componentdata[i] / (lua_Number)maxval); + + return sizeof(T) * components; +} + +void luax_readbufferdata(lua_State *L, DataFormat format, const char *data) +{ + switch (format) + { + case DATAFORMAT_FLOAT: readData(L, 1, data); break; + case DATAFORMAT_FLOAT_VEC2: readData(L, 2, data); break; + case DATAFORMAT_FLOAT_VEC3: readData(L, 3, data); break; + case DATAFORMAT_FLOAT_VEC4: readData(L, 4, data); break; + + case DATAFORMAT_INT32: readData(L, 1, data); break; + case DATAFORMAT_INT32_VEC2: readData(L, 2, data); break; + case DATAFORMAT_INT32_VEC3: readData(L, 3, data); break; + case DATAFORMAT_INT32_VEC4: readData(L, 4, data); break; + + case DATAFORMAT_UINT32: readData(L, 1, data); break; + case DATAFORMAT_UINT32_VEC2: readData(L, 2, data); break; + case DATAFORMAT_UINT32_VEC3: readData(L, 3, data); break; + case DATAFORMAT_UINT32_VEC4: readData(L, 4, data); break; + + case DATAFORMAT_SNORM8_VEC4: readSNormData(L, 4, data); break; + case DATAFORMAT_UNORM8_VEC4: readUNormData(L, 4, data); break; + case DATAFORMAT_INT8_VEC4: readData(L, 4, data); break; + case DATAFORMAT_UINT8_VEC4: readData(L, 4, data); break; + + case DATAFORMAT_SNORM16_VEC2: readSNormData(L, 2, data); break; + case DATAFORMAT_SNORM16_VEC4: readSNormData(L, 4, data); break; + + case DATAFORMAT_UNORM16_VEC2: readUNormData(L, 2, data); break; + case DATAFORMAT_UNORM16_VEC4: readUNormData(L, 4, data); break; + + case DATAFORMAT_INT16_VEC2: readData(L, 2, data); break; + case DATAFORMAT_INT16_VEC4: readData(L, 4, data); break; + + case DATAFORMAT_UINT16: readData(L, 1, data); break; + case DATAFORMAT_UINT16_VEC2: readData(L, 2, data); break; + case DATAFORMAT_UINT16_VEC4: readData(L, 4, data); break; + + default: break; + } +} + Buffer *luax_checkbuffer(lua_State *L, int idx) { return luax_checktype(L, idx); diff --git a/src/modules/graphics/wrap_Buffer.h b/src/modules/graphics/wrap_Buffer.h index 6a0d42412..3fdfeb6ca 100644 --- a/src/modules/graphics/wrap_Buffer.h +++ b/src/modules/graphics/wrap_Buffer.h @@ -22,13 +22,15 @@ // LOVE #include "common/runtime.h" +#include "Buffer.h" namespace love { namespace graphics { -class Buffer; +void luax_writebufferdata(lua_State *L, int startidx, DataFormat format, char *data); +void luax_readbufferdata(lua_State *L, DataFormat format, const char *data); Buffer *luax_checkbuffer(lua_State *L, int idx); extern "C" int luaopen_graphicsbuffer(lua_State *L); diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index b2925de82..dc24f7eaf 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1704,19 +1704,18 @@ static Mesh *newCustomMesh(lua_State *L) for (size_t i = 0; i < vertexformat.size(); i++) { const auto &info = getDataFormatInfo(vertexformat[i].format); - int components = info.components; // get vertices[vertindex][n] - for (int c = 0; c < components; c++) + for (int c = 0; c < info.components; c++) { n++; lua_rawgeti(L, -(c + 1), n); } // Fetch the values from Lua and store them in data buffer. - luax_writeAttributeData(L, -components, vertexformat[i].format, components, data); + luax_writebufferdata(L, -info.components, vertexformat[i].format, data); - lua_pop(L, components); + lua_pop(L, info.components); luax_catchexcept(L, [&](){ t->setVertexAttribute(vertindex, i, data, sizeof(float) * 4); }, diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index f6eefe504..f3b132594 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -20,6 +20,7 @@ // LOVE #include "wrap_Mesh.h" +#include "wrap_Buffer.h" #include "Texture.h" #include "wrap_Texture.h" @@ -36,184 +37,6 @@ Mesh *luax_checkmesh(lua_State *L, int idx) return luax_checktype(L, idx); } -static const double defaultComponents[] = {0.0, 0.0, 0.0, 1.0}; - -template -static inline size_t writeData(lua_State *L, int startidx, int components, char *data) -{ - auto componentdata = (T *) data; - - for (int i = 0; i < components; i++) - componentdata[i] = (T) (luaL_optnumber(L, startidx + i, defaultComponents[i])); - - return sizeof(T) * components; -} - -template -static inline size_t writeSNormData(lua_State *L, int startidx, int components, char *data) -{ - auto componentdata = (T *) data; - const auto maxval = std::numeric_limits::max(); - - for (int i = 0; i < components; i++) - componentdata[i] = (T) (luax_optnumberclamped(L, startidx + i, -1.0, 1.0, defaultComponents[i]) * maxval); - - return sizeof(T) * components; -} - -template -static inline size_t writeUNormData(lua_State *L, int startidx, int components, char *data) -{ - auto componentdata = (T *) data; - const auto maxval = std::numeric_limits::max(); - - for (int i = 0; i < components; i++) - componentdata[i] = (T) (luax_optnumberclamped01(L, startidx + i, 1.0) * maxval); - - return sizeof(T) * components; -} - -char *luax_writeAttributeData(lua_State *L, int startidx, DataFormat format, int components, char *data) -{ - switch (format) - { - case DATAFORMAT_FLOAT: - case DATAFORMAT_FLOAT_VEC2: - case DATAFORMAT_FLOAT_VEC3: - case DATAFORMAT_FLOAT_VEC4: - return data + writeData(L, startidx, components, data); - - case DATAFORMAT_INT32: - case DATAFORMAT_INT32_VEC2: - case DATAFORMAT_INT32_VEC3: - case DATAFORMAT_INT32_VEC4: - return data + writeData(L, startidx, components, data); - - case DATAFORMAT_UINT32: - case DATAFORMAT_UINT32_VEC2: - case DATAFORMAT_UINT32_VEC3: - case DATAFORMAT_UINT32_VEC4: - return data + writeData(L, startidx, components, data); - - case DATAFORMAT_SNORM8_VEC4: - return data + writeSNormData(L, startidx, 4, data); - case DATAFORMAT_UNORM8_VEC4: - return data + writeUNormData(L, startidx, 4, data); - case DATAFORMAT_INT8_VEC4: - return data + writeData(L, startidx, 4, data); - case DATAFORMAT_UINT8_VEC4: - return data + writeData(L, startidx, 4, data); - - case DATAFORMAT_SNORM16_VEC2: - case DATAFORMAT_SNORM16_VEC4: - return data + writeSNormData(L, startidx, components, data); - - case DATAFORMAT_UNORM16_VEC2: - case DATAFORMAT_UNORM16_VEC4: - return data + writeUNormData(L, startidx, components, data); - - case DATAFORMAT_INT16_VEC2: - case DATAFORMAT_INT16_VEC4: - return data + writeData(L, startidx, components, data); - - case DATAFORMAT_UINT16: - case DATAFORMAT_UINT16_VEC2: - case DATAFORMAT_UINT16_VEC4: - return data + writeData(L, startidx, components, data); - - default: - return data; - } -} - -template -static inline size_t readData(lua_State *L, int components, const char *data) -{ - const auto componentdata = (const T *) data; - - for (int i = 0; i < components; i++) - lua_pushnumber(L, (lua_Number) componentdata[i]); - - return sizeof(T) * components; -} - -template -static inline size_t readSNormData(lua_State *L, int components, const char *data) -{ - const auto componentdata = (const T *) data; - const auto maxval = std::numeric_limits::max(); - - for (int i = 0; i < components; i++) - lua_pushnumber(L, std::max(-1.0, (lua_Number) componentdata[i] / (lua_Number)maxval)); - - return sizeof(T) * components; -} - -template -static inline size_t readUNormData(lua_State *L, int components, const char *data) -{ - const auto componentdata = (const T *) data; - const auto maxval = std::numeric_limits::max(); - - for (int i = 0; i < components; i++) - lua_pushnumber(L, (lua_Number) componentdata[i] / (lua_Number)maxval); - - return sizeof(T) * components; -} - -const char *luax_readAttributeData(lua_State *L, DataFormat format, int components, const char *data) -{ - switch (format) - { - case DATAFORMAT_FLOAT: - case DATAFORMAT_FLOAT_VEC2: - case DATAFORMAT_FLOAT_VEC3: - case DATAFORMAT_FLOAT_VEC4: - return data + readData(L, components, data); - - case DATAFORMAT_INT32: - case DATAFORMAT_INT32_VEC2: - case DATAFORMAT_INT32_VEC3: - case DATAFORMAT_INT32_VEC4: - return data + readData(L, components, data); - - case DATAFORMAT_UINT32: - case DATAFORMAT_UINT32_VEC2: - case DATAFORMAT_UINT32_VEC3: - case DATAFORMAT_UINT32_VEC4: - return data + readData(L, components, data); - - case DATAFORMAT_SNORM8_VEC4: - return data + readSNormData(L, 4, data); - case DATAFORMAT_UNORM8_VEC4: - return data + readUNormData(L, 4, data); - case DATAFORMAT_INT8_VEC4: - return data + readData(L, 4, data); - case DATAFORMAT_UINT8_VEC4: - return data + readData(L, 4, data); - - case DATAFORMAT_SNORM16_VEC2: - case DATAFORMAT_SNORM16_VEC4: - return data + readSNormData(L, components, data); - - case DATAFORMAT_UNORM16_VEC2: - case DATAFORMAT_UNORM16_VEC4: - return data + readUNormData(L, components, data); - - case DATAFORMAT_INT16_VEC2: - case DATAFORMAT_INT16_VEC4: - return data + readData(L, components, data); - - case DATAFORMAT_UINT16: - case DATAFORMAT_UINT16_VEC2: - case DATAFORMAT_UINT16_VEC4: - return data + readData(L, components, data); - - default: - return data; - } -} - int w_Mesh_setVertices(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); @@ -282,11 +105,13 @@ int w_Mesh_setVertices(lua_State *L) for (const Buffer::DataMember &member : vertexformat) { // Fetch the values from Lua and store them in data buffer. - data = luax_writeAttributeData(L, idx, member.decl.format, member.info.components, data); + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); idx += member.info.components; } lua_pop(L, ncomponents + 1); + + data += stride; } t->unmapVertexData(byteoffset, vertcount * stride); @@ -301,9 +126,7 @@ int w_Mesh_setVertex(lua_State *L) bool istable = lua_istable(L, 3); const std::vector &vertexformat = t->getVertexFormat(); - char *data = (char *) t->getVertexScratchBuffer(); - char *writtendata = data; int idx = istable ? 1 : 3; @@ -317,7 +140,7 @@ int w_Mesh_setVertex(lua_State *L) lua_rawgeti(L, 3, i); // Fetch the values from Lua and store them in data buffer. - writtendata = luax_writeAttributeData(L, -components, member.decl.format, components, writtendata); + luax_writebufferdata(L, -components, member.decl.format, data + member.offset); idx += components; lua_pop(L, components); @@ -328,9 +151,8 @@ int w_Mesh_setVertex(lua_State *L) for (const Buffer::DataMember &member : vertexformat) { // Fetch the values from Lua and store them in data buffer. - int components = member.info.components; - writtendata = luax_writeAttributeData(L, idx, member.decl.format, components, writtendata); - idx += components; + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; } } @@ -346,7 +168,6 @@ int w_Mesh_getVertex(lua_State *L) const std::vector &vertexformat = t->getVertexFormat(); char *data = (char *) t->getVertexScratchBuffer(); - const char *readdata = data; luax_catchexcept(L, [&](){ t->getVertex(index, data, t->getVertexStride()); }); @@ -354,9 +175,8 @@ int w_Mesh_getVertex(lua_State *L) for (const Buffer::DataMember &member : vertexformat) { - int components = member.info.components; - readdata = luax_readAttributeData(L, member.decl.format, components, readdata); - n += components; + luax_readbufferdata(L, member.decl.format, data + member.offset); + n += member.info.components; } return n; @@ -379,7 +199,7 @@ int w_Mesh_setVertexAttribute(lua_State *L) char data[sizeof(float) * 4]; // Fetch the values from Lua and store them in the data buffer. - luax_writeAttributeData(L, 4, member.decl.format, member.info.components, data); + luax_writebufferdata(L, 4, member.decl.format, data); luax_catchexcept(L, [&](){ t->setVertexAttribute(vertindex, attribindex, data, sizeof(float) * 4); }); return 0; @@ -403,7 +223,7 @@ int w_Mesh_getVertexAttribute(lua_State *L) luax_catchexcept(L, [&](){ t->getVertexAttribute(vertindex, attribindex, data, sizeof(float) * 4); }); - luax_readAttributeData(L, member.decl.format, member.info.components, data); + luax_readbufferdata(L, member.decl.format, data); return member.info.components; } diff --git a/src/modules/graphics/wrap_Mesh.h b/src/modules/graphics/wrap_Mesh.h index 29bc319bf..08f73f2e9 100644 --- a/src/modules/graphics/wrap_Mesh.h +++ b/src/modules/graphics/wrap_Mesh.h @@ -30,9 +30,6 @@ namespace love namespace graphics { -char *luax_writeAttributeData(lua_State *L, int startidx, DataFormat format, int components, char *data); -const char *luax_readAttributeData(lua_State *L, DataFormat format, int components, const char *data); - Mesh *luax_checkmesh(lua_State *L, int idx); extern "C" int luaopen_mesh(lua_State *L); From 1ddfcd4cc88e7c7d1dc26ae8e82a0a255be02950 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 23 Feb 2020 16:30:55 -0400 Subject: [PATCH 12/54] Always use explicitly typed buffers, even in internal code --- src/modules/graphics/Buffer.cpp | 68 +++++++++++++++++++++--- src/modules/graphics/Buffer.h | 5 +- src/modules/graphics/Graphics.cpp | 2 +- src/modules/graphics/Graphics.h | 1 - src/modules/graphics/Mesh.cpp | 11 ++-- src/modules/graphics/ParticleSystem.cpp | 3 +- src/modules/graphics/SpriteBatch.cpp | 6 ++- src/modules/graphics/Text.cpp | 3 +- src/modules/graphics/opengl/Buffer.cpp | 25 +++------ src/modules/graphics/opengl/Buffer.h | 3 -- src/modules/graphics/opengl/Graphics.cpp | 5 -- src/modules/graphics/opengl/Graphics.h | 1 - 12 files changed, 88 insertions(+), 45 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index f85205307..096217780 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -28,7 +28,7 @@ namespace graphics love::Type Buffer::type("GraphicsBuffer", &Object::type); -Buffer::Buffer(const Settings &settings, const void */*data*/, size_t size) +Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &bufferformat, size_t size, size_t arraylength) : arrayLength(0) , arrayStride(0) , size(size) @@ -36,11 +36,6 @@ Buffer::Buffer(const Settings &settings, const void */*data*/, size_t size) , usage(settings.usage) , mapFlags(settings.mapFlags) , mapped(false) -{ -} - -Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &bufferformat, const void *data, size_t size, size_t arraylength) - : Buffer(settings, data, size) { if (size == 0 && arraylength == 0) throw love::Exception("Size or array length must be specified."); @@ -128,5 +123,66 @@ int Buffer::getDataMemberIndex(const std::string &name) const return -1; } +std::vector Buffer::getCommonFormatDeclaration(CommonFormat format) +{ + switch (format) + { + case CommonFormat::NONE: + return {}; + case CommonFormat::XYf: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2} + }; + case CommonFormat::XYZf: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC3} + }; + case CommonFormat::RGBAub: + return { + {"VertexColor", DATAFORMAT_UNORM8_VEC4} + }; + case CommonFormat::STf_RGBAub: + return { + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, + {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + }; + case CommonFormat::STPf_RGBAub: + return { + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC3}, + {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + }; + case CommonFormat::XYf_STf: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, + }; + case CommonFormat::XYf_STPf: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC3}, + }; + case CommonFormat::XYf_STf_RGBAub: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, + {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + }; + case CommonFormat::XYf_STus_RGBAub: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, + {"VertexTexCoord", DATAFORMAT_UNORM16_VEC2}, + {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + }; + case CommonFormat::XYf_STPf_RGBAub: + return { + {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, + {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, + {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + }; + } + + return {}; +} + } // graphics } // love diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 86a08698b..68935569a 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -103,8 +103,7 @@ public: {} }; - Buffer(const Settings &settings, const void *data, size_t size); - Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength); + Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, size_t size, size_t arraylength); virtual ~Buffer(); size_t getSize() const { return size; } @@ -154,6 +153,8 @@ public: **/ virtual void copyTo(size_t offset, size_t size, Buffer *other, size_t otheroffset) = 0; + static std::vector getCommonFormatDeclaration(CommonFormat format); + class Mapper { public: diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 855a60d08..db1135840 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -265,7 +265,7 @@ Shader *Graphics::newShader(const std::string &vertex, const std::string &pixel) Buffer *Graphics::newBuffer(const Buffer::Settings &settings, DataFormat format, const void *data, size_t size, size_t arraylength) { std::vector dataformat = {{"", format, 0}}; - return newBuffer(settings, format, data, size, arraylength); + return newBuffer(settings, dataformat, data, size, arraylength); } Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage) diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index e47bc8b65..d598ff198 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -439,7 +439,6 @@ public: ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source); Shader *newShader(const std::string &vertex, const std::string &pixel); - virtual Buffer *newBuffer(const Buffer::Settings &settings, const void *data, size_t size) = 0; virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) = 0; virtual Buffer *newBuffer(const Buffer::Settings &settings, DataFormat format, const void *data, size_t size, size_t arraylength); diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 4396842d1..107c11e49 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -344,15 +344,16 @@ void Mesh::setVertexMap(const std::vector &map) size_t maxval = getVertexCount(); IndexDataType datatype = getIndexDataTypeFromMax(maxval); + DataFormat dataformat = getIndexDataFormat(datatype); // Calculate the size in bytes of the index buffer data. size_t size = map.size() * getIndexDataSize(datatype); - if (indexBuffer.get() == nullptr || size > indexBuffer->getSize()) + if (indexBuffer.get() == nullptr || size > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) { auto gfx = Module::getInstance(Module::M_GRAPHICS); Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); - indexBuffer.set(gfx->newBuffer(settings, nullptr, size), Acquire::NORETAIN); + indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, size, 0), Acquire::NORETAIN); } useIndexBuffer = true; @@ -380,11 +381,13 @@ void Mesh::setVertexMap(const std::vector &map) void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasize) { - if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize()) + DataFormat dataformat = getIndexDataFormat(datatype); + + if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) { auto gfx = Module::getInstance(Module::M_GRAPHICS); Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); - indexBuffer.set(gfx->newBuffer(settings, nullptr, datasize), Acquire::NORETAIN); + indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, datasize, 0), Acquire::NORETAIN); } indexCount = datasize / getIndexDataSize(datatype); diff --git a/src/modules/graphics/ParticleSystem.cpp b/src/modules/graphics/ParticleSystem.cpp index 0f8a5aa50..8f1396e2c 100644 --- a/src/modules/graphics/ParticleSystem.cpp +++ b/src/modules/graphics/ParticleSystem.cpp @@ -192,7 +192,8 @@ void ParticleSystem::createBuffers(size_t size) size_t bytes = sizeof(Vertex) * size * 4; Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, 0, BUFFERUSAGE_STREAM); - buffer = gfx->newBuffer(settings, nullptr, bytes); + auto decl = Buffer::getCommonFormatDeclaration(CommonFormat::XYf_STf_RGBAub); + buffer = gfx->newBuffer(settings, decl, nullptr, bytes, 0); } catch (std::bad_alloc &) { diff --git a/src/modules/graphics/SpriteBatch.cpp b/src/modules/graphics/SpriteBatch.cpp index b8a55f298..3553aa7c0 100644 --- a/src/modules/graphics/SpriteBatch.cpp +++ b/src/modules/graphics/SpriteBatch.cpp @@ -65,7 +65,8 @@ SpriteBatch::SpriteBatch(Graphics *gfx, Texture *texture, int size, BufferUsage size_t vertex_size = vertex_stride * 4 * size; Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY, usage); - array_buf = gfx->newBuffer(settings, nullptr, vertex_size); + auto decl = Buffer::getCommonFormatDeclaration(vertex_format); + array_buf = gfx->newBuffer(settings, decl, nullptr, vertex_size, 0); } SpriteBatch::~SpriteBatch() @@ -220,7 +221,8 @@ void SpriteBatch::setBufferSize(int newsize) { auto gfx = Module::getInstance(Module::M_GRAPHICS); Buffer::Settings settings(array_buf->getTypeFlags(), array_buf->getMapFlags(), array_buf->getUsage()); - new_array_buf = gfx->newBuffer(settings, nullptr, vertex_size); + auto decl = Buffer::getCommonFormatDeclaration(vertex_format); + new_array_buf = gfx->newBuffer(settings, decl, nullptr, vertex_size, 0); // Copy as much of the old data into the new GLBuffer as can fit. size_t copy_size = vertex_stride * 4 * new_next; diff --git a/src/modules/graphics/Text.cpp b/src/modules/graphics/Text.cpp index f9db16d5e..3e2962d39 100644 --- a/src/modules/graphics/Text.cpp +++ b/src/modules/graphics/Text.cpp @@ -62,7 +62,8 @@ void Text::uploadVertices(const std::vector &vertices, size_t auto gfx = Module::getInstance(Module::M_GRAPHICS); Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, 0, BUFFERUSAGE_DYNAMIC); - Buffer *new_buffer = gfx->newBuffer(settings, nullptr, newsize); + auto decl = Buffer::getCommonFormatDeclaration(Font::vertexFormat); + Buffer *new_buffer = gfx->newBuffer(settings, decl, nullptr, newsize, 0); if (vertex_buffer != nullptr) vertex_buffer->copyTo(0, vertex_buffer->getSize(), new_buffer, 0); diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 698aa5352..e94048d6d 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -35,25 +35,8 @@ namespace graphics namespace opengl { -Buffer::Buffer(const Settings &settings, const void *data, size_t size) - : love::graphics::Buffer(settings, data, size) -{ - initialize(data); -} - Buffer::Buffer(love::graphics::Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) - : love::graphics::Buffer(gfx, settings, format, data, size, arraylength) -{ - initialize(data); -} - -Buffer::~Buffer() -{ - unloadVolatile(); - delete[] memoryMap; -} - -void Buffer::initialize(const void *data) + : love::graphics::Buffer(gfx, settings, format, size, arraylength) { if (typeFlags & TYPEFLAG_VERTEX) mapType = BUFFERTYPE_VERTEX; @@ -81,6 +64,12 @@ void Buffer::initialize(const void *data) } } +Buffer::~Buffer() +{ + unloadVolatile(); + delete[] memoryMap; +} + bool Buffer::loadVolatile() { return load(true); diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index df74fd982..e3c089ebc 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -42,7 +42,6 @@ class Buffer final : public love::graphics::Buffer, public Volatile { public: - Buffer(const Settings &settings, const void *data, size_t size); Buffer(love::graphics::Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength); virtual ~Buffer(); @@ -60,8 +59,6 @@ public: private: - void initialize(const void *data); - bool load(bool restore); void unmapStatic(size_t offset, size_t size); diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 3fba07d52..988b75f79 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -145,11 +145,6 @@ love::graphics::Shader *Graphics::newShaderInternal(love::graphics::ShaderStage return new Shader(vertex, pixel); } -love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const void *data, size_t size) -{ - return new Buffer(settings, data, size); -} - love::graphics::Buffer *Graphics::newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) { return new Buffer(this, settings, format, data, size, arraylength); diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index e40ee702b..d5e2e6bc7 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -60,7 +60,6 @@ public: const char *getName() const override; love::graphics::Texture *newTexture(const Texture::Settings &settings, const Texture::Slices *data = nullptr) override; - love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const void *data, size_t size) override; love::graphics::Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) override; void setViewportSize(int width, int height, int pixelwidth, int pixelheight) override; From 2c90ccabb39a64b039c87e5ea836a9080d04054d Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 23 Feb 2020 16:49:38 -0400 Subject: [PATCH 13/54] Avoid some hardcoded strings --- src/modules/graphics/Buffer.cpp | 40 ++++++++++++++++----------------- src/modules/graphics/vertex.cpp | 7 ++++++ src/modules/graphics/vertex.h | 2 ++ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 096217780..211e84500 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -131,53 +131,53 @@ std::vector Buffer::getCommonFormatDeclaration(CommonFo return {}; case CommonFormat::XYf: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2} + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 } }; case CommonFormat::XYZf: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC3} + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC3 } }; case CommonFormat::RGBAub: return { - {"VertexColor", DATAFORMAT_UNORM8_VEC4} + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 } }; case CommonFormat::STf_RGBAub: return { - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, - {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 }, }; case CommonFormat::STPf_RGBAub: return { - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC3}, - {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC3 }, + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 }, }; case CommonFormat::XYf_STf: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2 }, }; case CommonFormat::XYf_STPf: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC3}, + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC3 }, }; case CommonFormat::XYf_STf_RGBAub: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, - {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 }, }; case CommonFormat::XYf_STus_RGBAub: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, - {"VertexTexCoord", DATAFORMAT_UNORM16_VEC2}, - {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_UNORM16_VEC2 }, + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 }, }; case CommonFormat::XYf_STPf_RGBAub: return { - {"VertexPosition", DATAFORMAT_FLOAT_VEC2}, - {"VertexTexCoord", DATAFORMAT_FLOAT_VEC2}, - {"VertexColor", DATAFORMAT_UNORM8_VEC4}, + { getConstant(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2 }, + { getConstant(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4 }, }; } diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index c5e3e32dd..c64496b98 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -320,6 +320,13 @@ DEFINE_STRINGMAP_BEGIN(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) } DEFINE_STRINGMAP_END(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) +const char *getConstant(BuiltinVertexAttribute attrib) +{ + const char *name = nullptr; + getConstant(attrib, name); + return name; +} + DEFINE_STRINGMAP_BEGIN(IndexDataType, INDEX_MAX_ENUM, indexType) { { "uint16", INDEX_UINT16 }, diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index a24e92604..33072939e 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -393,5 +393,7 @@ DECLARE_STRINGMAP(DataBaseType); DECLARE_STRINGMAP(CullMode); DECLARE_STRINGMAP(Winding); +const char *getConstant(BuiltinVertexAttribute attrib); + } // graphics } // love From 4197a364fd43bc06e9f4e0f65d5ba511739ac783 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 23 Feb 2020 22:39:18 -0400 Subject: [PATCH 14/54] Internal restructuring of some Mesh code --- src/modules/graphics/Graphics.cpp | 19 ++- src/modules/graphics/Graphics.h | 3 +- src/modules/graphics/Mesh.cpp | 154 ++++++++++++++++--------- src/modules/graphics/Mesh.h | 22 ++-- src/modules/graphics/vertex.cpp | 8 -- src/modules/graphics/vertex.h | 9 -- src/modules/graphics/wrap_Graphics.cpp | 55 ++++++--- 7 files changed, 158 insertions(+), 112 deletions(-) diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index db1135840..2cb470ed3 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -268,26 +268,21 @@ Buffer *Graphics::newBuffer(const Buffer::Settings &settings, DataFormat format, return newBuffer(settings, dataformat, data, size, arraylength); } -Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage) -{ - return newMesh(Mesh::getDefaultVertexFormat(), &vertices[0], vertices.size() * sizeof(Vertex), drawmode, usage); -} - -Mesh *Graphics::newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage) -{ - return newMesh(Mesh::getDefaultVertexFormat(), vertexcount, drawmode, usage); -} - -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) +Mesh *Graphics::newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, vertexcount, drawmode, usage); } -love::graphics::Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) +Mesh *Graphics::newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage) { return new Mesh(this, vertexformat, data, datasize, drawmode, usage); } +Mesh *Graphics::newMesh(const std::vector &attributes, PrimitiveType drawmode) +{ + return new Mesh(attributes, drawmode); +} + love::graphics::Text *Graphics::newText(graphics::Font *font, const std::vector &text) { return new Text(font, text); diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index d598ff198..83ee68e01 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -442,10 +442,9 @@ public: virtual Buffer *newBuffer(const Buffer::Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) = 0; virtual Buffer *newBuffer(const Buffer::Settings &settings, DataFormat format, const void *data, size_t size, size_t arraylength); - Mesh *newMesh(const std::vector &vertices, PrimitiveType drawmode, BufferUsage usage); - Mesh *newMesh(int vertexcount, PrimitiveType drawmode, BufferUsage usage); Mesh *newMesh(const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); Mesh *newMesh(const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); + Mesh *newMesh(const std::vector &attributes, PrimitiveType drawmode); Text *newText(Font *font, const std::vector &text = {}); diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 107c11e49..98fff062d 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -34,27 +34,13 @@ namespace love namespace graphics { -static const char *getBuiltinAttribName(BuiltinVertexAttribute attribid) -{ - const char *name = ""; - getConstant(attribid, name); - return name; -} - static_assert(offsetof(Vertex, x) == sizeof(float) * 0, "Incorrect position offset in Vertex struct"); static_assert(offsetof(Vertex, s) == sizeof(float) * 2, "Incorrect texture coordinate offset in Vertex struct"); static_assert(offsetof(Vertex, color.r) == sizeof(float) * 4, "Incorrect color offset in Vertex struct"); std::vector Mesh::getDefaultVertexFormat() { - // Corresponds to the love::Vertex struct. - std::vector vertexformat = { - { getBuiltinAttribName(ATTRIB_POS), DATAFORMAT_FLOAT_VEC2, 0 }, - { getBuiltinAttribName(ATTRIB_TEXCOORD), DATAFORMAT_FLOAT_VEC2, 0 }, - { getBuiltinAttribName(ATTRIB_COLOR), DATAFORMAT_UNORM8_VEC4, 0 }, - }; - - return vertexformat; + return Buffer::getCommonFormatDeclaration(CommonFormat::XYf_STf_RGBAub); } love::Type Mesh::type("Mesh", &Drawable::type); @@ -63,6 +49,7 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector & : vertexBuffer(nullptr) , vertexCount(0) , vertexStride(0) + , vertexScratchBuffer(nullptr) , indexBuffer(nullptr) , useIndexBuffer(false) , indexCount(0) @@ -89,6 +76,7 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector & : vertexBuffer(nullptr) , vertexCount((size_t) vertexcount) , vertexStride(0) + , vertexScratchBuffer(nullptr) , indexBuffer(nullptr) , useIndexBuffer(false) , indexCount(0) @@ -115,6 +103,37 @@ Mesh::Mesh(graphics::Graphics *gfx, const std::vector & vertexScratchBuffer = new char[vertexStride]; } +Mesh::Mesh(const std::vector &attributes, PrimitiveType drawmode) + : vertexBuffer(nullptr) + , vertexCount(0) + , vertexStride(0) + , vertexScratchBuffer(nullptr) + , indexBuffer(nullptr) + , useIndexBuffer(false) + , indexCount(0) + , indexDataType(INDEX_UINT16) + , primitiveType(drawmode) + , rangeStart(-1) + , rangeCount(-1) +{ + if (attributes.size() == 0) + throw love::Exception("At least one buffer attribute must be specified in this constructor."); + + attachedAttributes = attributes; + + vertexCount = LOVE_UINT32_MAX; + + for (const auto &attrib : attachedAttributes) + { + if (getAttachedAttributeIndex(attrib.name) != -1) + throw love::Exception("Duplicate vertex attribute name: %s", attrib.name.c_str()); + + vertexCount = std::min(vertexCount, attrib.buffer->getArrayLength()); + } + + indexDataType = getIndexDataTypeFromMax(vertexCount); +} + Mesh::~Mesh() { delete vertexScratchBuffer; @@ -126,18 +145,32 @@ void Mesh::setupAttachedAttributes() { const std::string &name = vertexFormat[i].decl.name; - if (attachedAttributes.find(name) != attachedAttributes.end()) + if (getAttachedAttributeIndex(name) != -1) throw love::Exception("Duplicate vertex attribute name: %s", name.c_str()); - attachedAttributes[name] = {vertexBuffer, (int) i, STEP_PER_VERTEX, true}; + attachedAttributes.push_back({name, vertexBuffer, (int) i, STEP_PER_VERTEX, true}); } } +int Mesh::getAttachedAttributeIndex(const std::string &name) const +{ + for (int i = 0; i < (int) attachedAttributes.size(); i++) + { + if (attachedAttributes[i].name == name) + return i; + } + + return -1; +} + void Mesh::setVertex(size_t vertindex, const void *data, size_t datasize) { if (vertindex >= vertexCount) throw love::Exception("Invalid vertex index: %ld", vertindex + 1); + if (vertexBuffer.get() == nullptr) + throw love::Exception("setVertex can only be called on a Mesh which owns its own vertex buffer."); + size_t offset = vertindex * vertexStride; size_t size = std::min(datasize, vertexStride); @@ -152,6 +185,9 @@ size_t Mesh::getVertex(size_t vertindex, void *data, size_t datasize) if (vertindex >= vertexCount) throw love::Exception("Invalid vertex index: %ld", vertindex + 1); + if (vertexBuffer.get() == nullptr) + throw love::Exception("getVertex can only be called on a Mesh which owns its own vertex buffer."); + size_t offset = vertindex * vertexStride; size_t size = std::min(datasize, vertexStride); @@ -175,6 +211,9 @@ void Mesh::setVertexAttribute(size_t vertindex, int attribindex, const void *dat if (attribindex >= (int) vertexFormat.size()) throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); + if (vertexBuffer.get() == nullptr) + throw love::Exception("setVertexAttribute can only be called on a Mesh which owns its own vertex buffer."); + const auto &member = vertexFormat[attribindex]; size_t offset = vertindex * vertexStride + member.offset; @@ -194,6 +233,9 @@ size_t Mesh::getVertexAttribute(size_t vertindex, int attribindex, void *data, s if (attribindex >= (int) vertexFormat.size()) throw love::Exception("Invalid vertex attribute index: %d", attribindex + 1); + if (vertexBuffer.get() == nullptr) + throw love::Exception("getVertexAttribute can only be called on a Mesh which owns its own vertex buffer."); + const auto &member = vertexFormat[attribindex]; size_t offset = vertindex * vertexStride + member.offset; @@ -239,39 +281,37 @@ int Mesh::getAttributeIndex(const std::string &name) const void Mesh::setAttributeEnabled(const std::string &name, bool enable) { - auto it = attachedAttributes.find(name); - - if (it == attachedAttributes.end()) + int index = getAttachedAttributeIndex(name); + if (index == -1) throw love::Exception("Mesh does not have an attached vertex attribute named '%s'", name.c_str()); - it->second.enabled = enable; + attachedAttributes[index].enabled = enable; } bool Mesh::isAttributeEnabled(const std::string &name) const { - const auto it = attachedAttributes.find(name); - - if (it == attachedAttributes.end()) + int index = getAttachedAttributeIndex(name); + if (index == -1) throw love::Exception("Mesh does not have an attached vertex attribute named '%s'", name.c_str()); - return it->second.enabled; + return attachedAttributes[index].enabled; } void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step) { if ((buffer->getTypeFlags() & Buffer::TYPEFLAG_VERTEX) == 0) - throw love::Exception("GraphicsBuffer must be created with vertex buffer support to be used as a Mesh vertex attribute."); + throw love::Exception("Buffer must be created with vertex buffer support to be used as a Mesh vertex attribute."); auto gfx = Module::getInstance(Module::M_GRAPHICS); if (step == STEP_PER_INSTANCE && !gfx->getCapabilities().features[Graphics::FEATURE_INSTANCING]) throw love::Exception("Vertex attribute instancing is not supported on this system."); - AttachedAttribute oldattrib = {}; - AttachedAttribute newattrib = {}; + BufferAttribute oldattrib = {}; + BufferAttribute newattrib = {}; - auto it = attachedAttributes.find(name); - if (it != attachedAttributes.end()) - oldattrib = it->second; + int oldindex = getAttachedAttributeIndex(name); + if (oldindex != -1) + oldattrib = attachedAttributes[oldindex]; else if (attachedAttributes.size() + 1 > VertexAttributes::MAX) throw love::Exception("A maximum of %d attributes can be attached at once.", VertexAttributes::MAX); @@ -283,42 +323,46 @@ void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::s if (newattrib.index < 0) throw love::Exception("The specified vertex buffer does not have a vertex attribute named '%s'", attachname.c_str()); - attachedAttributes[name] = newattrib; + if (oldindex != -1) + attachedAttributes[oldindex] = newattrib; + else + attachedAttributes.push_back(newattrib); } bool Mesh::detachAttribute(const std::string &name) { - auto it = attachedAttributes.find(name); + int index = getAttachedAttributeIndex(name); + if (index == -1) + return false; - if (it != attachedAttributes.end()) - { - attachedAttributes.erase(it); + attachedAttributes.erase(attachedAttributes.begin() + index); - if (getAttributeIndex(name) != -1) - attachAttribute(name, vertexBuffer, name); + if (getAttributeIndex(name) != -1) + attachAttribute(name, vertexBuffer, name); - return true; - } - - return false; + return true; } void *Mesh::mapVertexData() { - return vertexBuffer->map(); + return vertexBuffer.get() != nullptr ? vertexBuffer->map() : nullptr; } void Mesh::unmapVertexData(size_t modifiedoffset, size_t modifiedsize) { + if (!vertexBuffer.get()) + return; + vertexBuffer->setMappedRangeModified(modifiedoffset, modifiedsize); vertexBuffer->unmap(); } void Mesh::flush() { - vertexBuffer->unmap(); + if (vertexBuffer.get()) + vertexBuffer->unmap(); - if (indexBuffer != nullptr) + if (indexBuffer.get()) indexBuffer->unmap(); } @@ -352,7 +396,8 @@ void Mesh::setVertexMap(const std::vector &map) if (indexBuffer.get() == nullptr || size > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); + auto usage = vertexBuffer.get() ? vertexBuffer->getUsage() : BUFFERUSAGE_DYNAMIC; + Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, usage); indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, size, 0), Acquire::NORETAIN); } @@ -386,7 +431,8 @@ void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasiz if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) { auto gfx = Module::getInstance(Module::M_GRAPHICS); - Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, vertexBuffer->getUsage()); + auto usage = vertexBuffer.get() ? vertexBuffer->getUsage() : BUFFERUSAGE_DYNAMIC; + Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_READ, usage); indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, datasize, 0), Acquire::NORETAIN); } @@ -529,32 +575,32 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) for (const auto &attrib : attachedAttributes) { - if (!attrib.second.enabled) + if (!attrib.enabled) continue; - Buffer *buffer = attrib.second.buffer.get(); + Buffer *buffer = attrib.buffer.get(); int attributeindex = -1; // If the attribute is one of the LOVE-defined ones, use the constant // attribute index for it, otherwise query the index from the shader. BuiltinVertexAttribute builtinattrib; - if (getConstant(attrib.first.c_str(), builtinattrib)) + if (getConstant(attrib.name.c_str(), builtinattrib)) attributeindex = (int) builtinattrib; else if (Shader::current) - attributeindex = Shader::current->getVertexAttributeIndex(attrib.first); + attributeindex = Shader::current->getVertexAttributeIndex(attrib.name); if (attributeindex >= 0) { // Make sure the buffer isn't mapped (sends data to GPU if needed.) buffer->unmap(); - const auto &member = buffer->getDataMember(attrib.second.index); + const auto &member = buffer->getDataMember(attrib.index); - uint16 offset = (uint16) buffer->getMemberOffset(attrib.second.index); + uint16 offset = (uint16) buffer->getMemberOffset(attrib.index); uint16 stride = (uint16) buffer->getArrayStride(); attributes.set(attributeindex, member.decl.format, offset, activebuffers); - attributes.setBufferLayout(activebuffers, stride, attrib.second.step); + attributes.setBufferLayout(activebuffers, stride, attrib.step); // TODO: Ideally we want to reuse buffers with the same stride+step. buffers.set(activebuffers, buffer, 0); diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 7e099f3dc..0c81642fc 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -50,10 +50,20 @@ class Mesh : public Drawable { public: + struct BufferAttribute + { + std::string name; + StrongRef buffer; + int index; + AttributeStep step; + bool enabled; + }; + static love::Type type; Mesh(Graphics *gfx, const std::vector &vertexformat, const void *data, size_t datasize, PrimitiveType drawmode, BufferUsage usage); Mesh(Graphics *gfx, const std::vector &vertexformat, int vertexcount, PrimitiveType drawmode, BufferUsage usage); + Mesh(const std::vector &attributes, PrimitiveType drawmode); virtual ~Mesh(); @@ -105,6 +115,7 @@ public: **/ void attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step = STEP_PER_VERTEX); bool detachAttribute(const std::string &name); + const std::vector &getAttachedAttributes(); void *mapVertexData(); void unmapVertexData(size_t modifiedoffset = 0, size_t modifiedsize = -1); @@ -172,19 +183,12 @@ private: friend class SpriteBatch; - struct AttachedAttribute - { - StrongRef buffer; - int index; - AttributeStep step; - bool enabled; - }; - void setupAttachedAttributes(); + int getAttachedAttributeIndex(const std::string &name) const; std::vector vertexFormat; - std::unordered_map attachedAttributes; + std::vector attachedAttributes; // Vertex buffer, for the vertex data. StrongRef vertexBuffer; diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index c64496b98..0ecfb7d26 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -358,14 +358,6 @@ DEFINE_STRINGMAP_BEGIN(AttributeStep, STEP_MAX_ENUM, attributeStep) } DEFINE_STRINGMAP_END(AttributeStep, STEP_MAX_ENUM, attributeStep) -DEFINE_STRINGMAP_BEGIN(DataTypeDeprecated, DATADEPRECATED_MAX_ENUM, dataType) -{ - { "unorm8", DATADEPRECATED_UNORM8 }, - { "unorm16", DATADEPRECATED_UNORM16 }, - { "float", DATADEPRECATED_FLOAT }, -} -DEFINE_STRINGMAP_END(DataTypeDeprecated, DATADEPRECATED_MAX_ENUM, dataType) - DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) { { "float", DATAFORMAT_FLOAT }, diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 33072939e..0c7477579 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -102,14 +102,6 @@ enum BufferUsage BUFFERUSAGE_MAX_ENUM }; -enum DataTypeDeprecated -{ - DATADEPRECATED_UNORM8, - DATADEPRECATED_UNORM16, - DATADEPRECATED_FLOAT, - DATADEPRECATED_MAX_ENUM -}; - // Value types used when interfacing with the GPU (vertex and shader data). // The order of this enum affects the dataFormatInfo array. enum DataFormat @@ -387,7 +379,6 @@ DECLARE_STRINGMAP(IndexDataType); DECLARE_STRINGMAP(BufferUsage); DECLARE_STRINGMAP(PrimitiveType); DECLARE_STRINGMAP(AttributeStep); -DECLARE_STRINGMAP(DataTypeDeprecated); DECLARE_STRINGMAP(DataFormat); DECLARE_STRINGMAP(DataBaseType); DECLARE_STRINGMAP(CullMode); diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index dc24f7eaf..418a89e23 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1557,6 +1557,8 @@ static Mesh *newStandardMesh(lua_State *L) PrimitiveType drawmode = luax_optmeshdrawmode(L, 2, PRIMITIVE_TRIANGLE_FAN); BufferUsage usage = luax_optmeshusage(L, 3, BUFFERUSAGE_DYNAMIC); + auto format = Mesh::getDefaultVertexFormat(); + // First argument is a table of standard vertices, or the number of // standard vertices. if (lua_istable(L, 1)) @@ -1595,12 +1597,12 @@ static Mesh *newStandardMesh(lua_State *L) vertices.push_back(v); } - luax_catchexcept(L, [&](){ t = instance()->newMesh(vertices, drawmode, usage); }); + luax_catchexcept(L, [&](){ t = instance()->newMesh(format, vertices.data(), vertices.size() * sizeof(Vertex), drawmode, usage); }); } else { int count = (int) luaL_checkinteger(L, 1); - luax_catchexcept(L, [&](){ t = instance()->newMesh(count, drawmode, usage); }); + luax_catchexcept(L, [&](){ t = instance()->newMesh(format, count, drawmode, usage); }); } return t; @@ -1641,24 +1643,41 @@ static Mesh *newCustomMesh(lua_State *L) if (!getConstant(tname, format)) { - DataTypeDeprecated legacyType = DATADEPRECATED_FLOAT; - - if (strcmp(tname, "byte") == 0) // Legacy name. - legacyType = DATADEPRECATED_UNORM8; - else if (!getConstant(tname, legacyType)) - { - luax_enumerror(L, "Mesh vertex data format name", getConstants(format), tname); - return nullptr; - } - int components = (int) luaL_checkinteger(L, -1); - if (components <= 0 || components > 4) - { - luaL_error(L, "Number of vertex attribute components must be between 1 and 4 (got %d)", components); - return nullptr; - } - // TODO: convert legacy type+components to new format enum. + // Check deprecated format names. + if (strcmp(tname, "byte") == 0 || strcmp(tname, "unorm8") == 0) + { + if (components == 4) + format = DATAFORMAT_UNORM8_VEC4; + else + luaL_error(L, "Invalid component count (%d) for vertex data type %s", components, tname); + } + else if (strcmp(tname, "unorm16") == 0) + { + if (components == 2) + format = DATAFORMAT_UNORM16_VEC2; + else if (components == 4) + format = DATAFORMAT_UNORM16_VEC4; + else + luaL_error(L, "Invalid component count (%d) for vertex data type %s", components, tname); + + } + else if (strcmp(tname, "float") == 0) + { + if (components == 1) + format = DATAFORMAT_FLOAT; + else if (components == 2) + format = DATAFORMAT_FLOAT_VEC2; + else if (components == 3) + format = DATAFORMAT_FLOAT_VEC3; + else if (components == 4) + format = DATAFORMAT_FLOAT_VEC4; + else + luaL_error(L, "Invalid component count (%d) for vertex data type %s", components, tname); + } + else + luax_enumerror(L, "vertex data format", getConstants(format), tname); } lua_pop(L, 4); From d77dabaa6bc50705e7fb66bc92111e2d8e00d4a3 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 28 Feb 2020 23:01:35 -0400 Subject: [PATCH 15/54] Add Mesh:getAttachedAttributes. --- src/modules/graphics/Mesh.cpp | 26 ++++++------------ src/modules/graphics/Mesh.h | 3 +- src/modules/graphics/wrap_Graphics.cpp | 2 +- src/modules/graphics/wrap_Mesh.cpp | 38 ++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 98fff062d..8897d6ac1 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -121,10 +121,13 @@ Mesh::Mesh(const std::vector &attributes, PrimitiveType d attachedAttributes = attributes; - vertexCount = LOVE_UINT32_MAX; + vertexCount = attachedAttributes.size() > 0 ? LOVE_UINT32_MAX : 0; for (const auto &attrib : attachedAttributes) { + if ((attrib.buffer->getTypeFlags() & Buffer::TYPEFLAG_VERTEX) == 0) + throw love::Exception("Buffer must be created with vertex buffer support to be used as a Mesh vertex attribute."); + if (getAttachedAttributeIndex(attrib.name) != -1) throw love::Exception("Duplicate vertex attribute name: %s", attrib.name.c_str()); @@ -268,17 +271,6 @@ const std::vector &Mesh::getVertexFormat() const return vertexFormat; } -int Mesh::getAttributeIndex(const std::string &name) const -{ - for (int i = 0; i < (int) vertexFormat.size(); i++) - { - if (vertexFormat[i].decl.name == name) - return i; - } - - return -1; -} - void Mesh::setAttributeEnabled(const std::string &name, bool enable) { int index = getAttachedAttributeIndex(name); @@ -317,10 +309,10 @@ void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::s newattrib.buffer = buffer; newattrib.enabled = oldattrib.buffer.get() ? oldattrib.enabled : true; - newattrib.index = buffer->getDataMemberIndex(attachname); + newattrib.indexInBuffer = buffer->getDataMemberIndex(attachname); newattrib.step = step; - if (newattrib.index < 0) + if (newattrib.indexInBuffer < 0) throw love::Exception("The specified vertex buffer does not have a vertex attribute named '%s'", attachname.c_str()); if (oldindex != -1) @@ -337,7 +329,7 @@ bool Mesh::detachAttribute(const std::string &name) attachedAttributes.erase(attachedAttributes.begin() + index); - if (getAttributeIndex(name) != -1) + if (vertexBuffer.get() && vertexBuffer->getDataMemberIndex(name) != -1) attachAttribute(name, vertexBuffer, name); return true; @@ -594,9 +586,9 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount) // Make sure the buffer isn't mapped (sends data to GPU if needed.) buffer->unmap(); - const auto &member = buffer->getDataMember(attrib.index); + const auto &member = buffer->getDataMember(attrib.indexInBuffer); - uint16 offset = (uint16) buffer->getMemberOffset(attrib.index); + uint16 offset = (uint16) member.offset; uint16 stride = (uint16) buffer->getArrayStride(); attributes.set(attributeindex, member.decl.format, offset, activebuffers); diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 0c81642fc..83165adf4 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -54,7 +54,7 @@ public: { std::string name; StrongRef buffer; - int index; + int indexInBuffer; AttributeStep step; bool enabled; }; @@ -101,7 +101,6 @@ public: * Gets the format of each vertex attribute stored in the Mesh. **/ const std::vector &getVertexFormat() const; - int getAttributeIndex(const std::string &name) const; /** * Sets whether a specific vertex attribute is used when drawing the Mesh. diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 418a89e23..fa7895535 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1557,7 +1557,7 @@ static Mesh *newStandardMesh(lua_State *L) PrimitiveType drawmode = luax_optmeshdrawmode(L, 2, PRIMITIVE_TRIANGLE_FAN); BufferUsage usage = luax_optmeshusage(L, 3, BUFFERUSAGE_DYNAMIC); - auto format = Mesh::getDefaultVertexFormat(); + std::vector format = Mesh::getDefaultVertexFormat(); // First argument is a table of standard vertices, or the number of // standard vertices. diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index f3b132594..15e32e71d 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -298,6 +298,8 @@ int w_Mesh_attachAttribute(lua_State *L) { Mesh *mesh = luax_checkmesh(L, 3); buffer = mesh->getVertexBuffer(); + if (buffer == nullptr) + return luaL_error(L, "Mesh does not have its own vertex buffer."); } AttributeStep step = STEP_PER_VERTEX; @@ -321,6 +323,41 @@ int w_Mesh_detachAttribute(lua_State *L) return 1; } +int w_Mesh_getAttachedAttributes(lua_State *L) +{ + Mesh *t = luax_checkmesh(L, 1); + const auto &attributes = t->getAttachedAttributes(); + + lua_createtable(L, (int) attributes.size(), 0); + + for (int i = 0; i < (int) attributes.size(); i++) + { + const auto &attrib = attributes[i]; + + lua_createtable(L, 4, 0); + + luax_pushstring(L, attrib.name); + lua_rawseti(L, -1, 1); + + luax_pushtype(L, attrib.buffer.get()); + lua_rawseti(L, -1, 2); + + const char *stepstr = nullptr; + if (!getConstant(attrib.step, stepstr)) + return luaL_error(L, "Invalid vertex attribute step."); + lua_pushstring(L, stepstr); + lua_rawseti(L, -1, 3); + + const Buffer::DataMember &member = attrib.buffer->getDataMember(attrib.indexInBuffer); + luax_pushstring(L, member.decl.name); + lua_rawseti(L, -1, 4); + + lua_rawseti(L, -1, i + 1); + } + + return 1; +} + int w_Mesh_flush(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); @@ -507,6 +544,7 @@ static const luaL_Reg w_Mesh_functions[] = { "isAttributeEnabled", w_Mesh_isAttributeEnabled }, { "attachAttribute", w_Mesh_attachAttribute }, { "detachAttribute", w_Mesh_detachAttribute }, + { "getAttachedAttributes", w_Mesh_getAttachedAttributes }, { "flush", w_Mesh_flush }, { "setVertexMap", w_Mesh_setVertexMap }, { "getVertexMap", w_Mesh_getVertexMap }, From bbdadcba8a998a4c2517edc7e95024a6784420f8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 28 Feb 2020 23:12:22 -0400 Subject: [PATCH 16/54] Fix build --- src/modules/graphics/Mesh.cpp | 5 +++++ src/modules/graphics/Mesh.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index b39b5388f..816493361 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -335,6 +335,11 @@ bool Mesh::detachAttribute(const std::string &name) return true; } +const std::vector &Mesh::getAttachedAttributes() const +{ + return attachedAttributes; +} + void *Mesh::mapVertexData() { return vertexBuffer.get() != nullptr ? vertexBuffer->map() : nullptr; diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 83165adf4..187f0bc0c 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -114,7 +114,7 @@ public: **/ void attachAttribute(const std::string &name, Buffer *buffer, const std::string &attachname, AttributeStep step = STEP_PER_VERTEX); bool detachAttribute(const std::string &name); - const std::vector &getAttachedAttributes(); + const std::vector &getAttachedAttributes() const; void *mapVertexData(); void unmapVertexData(size_t modifiedoffset = 0, size_t modifiedsize = -1); From 0efb49dc5f96c21811442b143436ee4e88d80f04 Mon Sep 17 00:00:00 2001 From: Andrew West Date: Sun, 1 Mar 2020 12:39:51 +0000 Subject: [PATCH 17/54] Changed to set the window title before creation rather than after --- src/scripts/boot.lua | 2 +- src/scripts/boot.lua.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index ce19898e9..9130f7355 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -532,6 +532,7 @@ function love.init() -- Setup window here. if c.window and c.modules.window then + love.window.setTitle(c.window.title or c.title) assert(love.window.setMode(c.window.width, c.window.height, { fullscreen = c.window.fullscreen, @@ -551,7 +552,6 @@ function love.init() x = c.window.x, y = c.window.y, }), "Could not set window mode") - love.window.setTitle(c.window.title or c.title) if c.window.icon then assert(love.image, "If an icon is set in love.conf, love.image must be loaded!") love.window.setIcon(love.image.newImageData(c.window.icon)) diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index fb4a1a301..efa2ee738 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1055,6 +1055,9 @@ const unsigned char boot_lua[] = 0x09, 0x69, 0x66, 0x20, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x54, + 0x69, 0x74, 0x6c, 0x65, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x20, 0x6f, 0x72, 0x20, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x09, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x20, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, @@ -1094,9 +1097,6 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x79, 0x20, 0x3d, 0x20, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x79, 0x2c, 0x0a, 0x09, 0x09, 0x7d, 0x29, 0x2c, 0x20, 0x22, 0x43, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x65, 0x74, 0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x29, 0x0a, - 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x54, - 0x69, 0x74, 0x6c, 0x65, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x20, 0x6f, 0x72, 0x20, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x09, 0x09, 0x69, 0x66, 0x20, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x69, 0x63, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x69, 0x6d, 0x61, From 2cff535eb1fd8cc9f6867329d462805667b8c525 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 3 Mar 2020 19:30:22 -0400 Subject: [PATCH 18/54] Move shader parsing code from Lua to C++. --- .../xcode/liblove.xcodeproj/project.pbxproj | 2 - src/modules/graphics/Graphics.cpp | 109 ++-- src/modules/graphics/Graphics.h | 17 +- src/modules/graphics/Shader.cpp | 533 +++++++++++++++++- src/modules/graphics/Shader.h | 25 +- src/modules/graphics/ShaderStage.cpp | 7 + src/modules/graphics/ShaderStage.h | 2 + src/modules/graphics/opengl/Graphics.cpp | 23 +- src/modules/graphics/opengl/Graphics.h | 2 - src/modules/graphics/wrap_Graphics.cpp | 107 +--- src/modules/graphics/wrap_GraphicsShader.lua | 503 ----------------- 11 files changed, 625 insertions(+), 705 deletions(-) delete mode 100644 src/modules/graphics/wrap_GraphicsShader.lua diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 28f3d8b20..68ed3dbc0 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -1868,7 +1868,6 @@ FA620A301AA2F8DB005DB4C2 /* wrap_Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Texture.cpp; sourceTree = ""; }; FA620A311AA2F8DB005DB4C2 /* wrap_Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Texture.h; sourceTree = ""; }; FA620A391AA305F6005DB4C2 /* types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types.cpp; sourceTree = ""; }; - FA665DC321C34C900074BBD6 /* wrap_GraphicsShader.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = wrap_GraphicsShader.lua; sourceTree = ""; }; FA6A2B641F5F7B6B0074C308 /* wrap_Data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Data.h; sourceTree = ""; }; FA6A2B651F5F7B6B0074C308 /* wrap_Data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Data.cpp; sourceTree = ""; }; FA6A2B681F5F7F560074C308 /* DataView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DataView.cpp; sourceTree = ""; }; @@ -2855,7 +2854,6 @@ FADF54391E3DAFF700012CC0 /* wrap_Graphics.cpp */, FADF543A1E3DAFF700012CC0 /* wrap_Graphics.h */, FADF54371E3DAFBA00012CC0 /* wrap_Graphics.lua */, - FA665DC321C34C900074BBD6 /* wrap_GraphicsShader.lua */, FADF54281E3DAADA00012CC0 /* wrap_Mesh.cpp */, FADF54291E3DAADA00012CC0 /* wrap_Mesh.h */, FADF541E1E3DA52C00012CC0 /* wrap_ParticleSystem.cpp */, diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 9c704ed50..4ff2e7d1e 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -104,8 +104,6 @@ bool isDebugEnabled() love::Type Graphics::type("graphics", &Module::type); -Graphics::DefaultShaderCode Graphics::defaultShaderCode[Shader::STANDARD_MAX_ENUM][Shader::LANGUAGE_MAX_ENUM][2]; - Graphics::Graphics() : width(0) , height(0) @@ -214,13 +212,8 @@ love::graphics::ParticleSystem *Graphics::newParticleSystem(Texture *texture, in return new ParticleSystem(texture, size); } -ShaderStage *Graphics::newShaderStage(ShaderStage::StageType stage, const std::string &optsource) +ShaderStage *Graphics::newShaderStage(ShaderStage::StageType stage, const std::string &source, const Shader::SourceInfo &info) { - if (stage == ShaderStage::STAGE_MAX_ENUM) - throw love::Exception("Invalid shader stage."); - - const std::string &source = optsource.empty() ? getCurrentDefaultShaderCode().source[stage] : optsource; - ShaderStage *s = nullptr; std::string cachekey; @@ -241,7 +234,8 @@ ShaderStage *Graphics::newShaderStage(ShaderStage::StageType stage, const std::s if (s == nullptr) { - s = newShaderStageInternal(stage, cachekey, source, getRenderer() == RENDERER_OPENGLES); + std::string glsl = Shader::createShaderStageCode(this, stage, source, info); + s = newShaderStageInternal(stage, cachekey, glsl, getRenderer() == RENDERER_OPENGLES); if (!cachekey.empty()) cachedShaderStages[stage][cachekey] = s; } @@ -249,15 +243,48 @@ ShaderStage *Graphics::newShaderStage(ShaderStage::StageType stage, const std::s return s; } -Shader *Graphics::newShader(const std::string &vertex, const std::string &pixel) +Shader *Graphics::newShader(const std::vector &stagessource) { - if (vertex.empty() && pixel.empty()) - throw love::Exception("Error creating shader: no source code!"); + StrongRef stages[ShaderStage::STAGE_MAX_ENUM] = {}; - StrongRef vertexstage(newShaderStage(ShaderStage::STAGE_VERTEX, vertex), Acquire::NORETAIN); - StrongRef pixelstage(newShaderStage(ShaderStage::STAGE_PIXEL, pixel), Acquire::NORETAIN); + bool validstages[ShaderStage::STAGE_MAX_ENUM] = {}; + validstages[ShaderStage::STAGE_VERTEX] = true; + validstages[ShaderStage::STAGE_PIXEL] = true; - return newShaderInternal(vertexstage.get(), pixelstage.get()); + for (const std::string &source : stagessource) + { + Shader::SourceInfo info = Shader::getSourceInfo(source); + bool isanystage = false; + + for (int i = 0; i < ShaderStage::STAGE_MAX_ENUM; i++) + { + if (!validstages[i]) + continue; + + if (info.isStage[i]) + { + isanystage = true; + stages[i].set(newShaderStage((ShaderStage::StageType) i, source, info), Acquire::NORETAIN); + } + } + + if (!isanystage) + throw love::Exception("Could not parse shader code (missing 'position' or 'effect' function?)"); + } + + for (int i = 0; i < ShaderStage::STAGE_MAX_ENUM; i++) + { + auto stype = (ShaderStage::StageType) i; + if (validstages[i] && stages[i].get() == nullptr) + { + const std::string &source = Shader::getDefaultCode(Shader::STANDARD_DEFAULT, stype); + Shader::SourceInfo info = Shader::getSourceInfo(source); + stages[i].set(newShaderStage(stype, source, info), Acquire::NORETAIN); + } + + } + + return newShaderInternal(stages[ShaderStage::STAGE_VERTEX], stages[ShaderStage::STAGE_PIXEL]); } Mesh *Graphics::newMesh(const std::vector &vertices, PrimitiveType drawmode, vertex::Usage usage) @@ -290,26 +317,44 @@ void Graphics::cleanupCachedShaderStage(ShaderStage::StageType type, const std:: cachedShaderStages[type].erase(hashkey); } -bool Graphics::validateShader(bool gles, const std::string &vertex, const std::string &pixel, std::string &err) +bool Graphics::validateShader(bool gles, const std::vector &stagessource, std::string &err) { - if (vertex.empty() && pixel.empty()) - { - err = "Error validating shader: no source code!"; - return false; - } + StrongRef stages[ShaderStage::STAGE_MAX_ENUM] = {}; - StrongRef vertexstage; - StrongRef pixelstage; + bool validstages[ShaderStage::STAGE_MAX_ENUM] = {}; + validstages[ShaderStage::STAGE_VERTEX] = true; + validstages[ShaderStage::STAGE_PIXEL] = true; // Don't use cached shader stages, since the gles flag may not match the // current renderer. - if (!vertex.empty()) - vertexstage.set(new ShaderStageForValidation(this, ShaderStage::STAGE_VERTEX, vertex, gles), Acquire::NORETAIN); + for (const std::string &source : stagessource) + { + Shader::SourceInfo info = Shader::getSourceInfo(source); + bool isanystage = false; - if (!pixel.empty()) - pixelstage.set(new ShaderStageForValidation(this, ShaderStage::STAGE_PIXEL, pixel, gles), Acquire::NORETAIN); + for (int i = 0; i < ShaderStage::STAGE_MAX_ENUM; i++) + { + auto stype = (ShaderStage::StageType) i; - return Shader::validate(vertexstage.get(), pixelstage.get(), err); + if (!validstages[i]) + continue; + + if (info.isStage[i]) + { + isanystage = true; + std::string glsl = Shader::createShaderStageCode(this, stype, source, info); + stages[i].set(new ShaderStageForValidation(this, stype, glsl, gles), Acquire::NORETAIN); + } + } + + if (!isanystage) + { + err = "Could not parse shader code (missing 'position' or 'effect' function?)"; + return false; + } + } + + return Shader::validate(stages[ShaderStage::STAGE_VERTEX], stages[ShaderStage::STAGE_PIXEL], err); } int Graphics::getWidth() const @@ -1743,14 +1788,6 @@ Vector2 Graphics::inverseTransformPoint(Vector2 point) return p; } -const Graphics::DefaultShaderCode &Graphics::getCurrentDefaultShaderCode() const -{ - int languageindex = (int) getShaderLanguageTarget(); - int gammaindex = isGammaCorrect() ? 1 : 0; - - return defaultShaderCode[Shader::STANDARD_DEFAULT][languageindex][gammaindex]; -} - /** * Constants. **/ diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index 6068d8560..600ab389d 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -415,11 +415,6 @@ public: } }; - struct DefaultShaderCode - { - std::string source[ShaderStage::STAGE_MAX_ENUM]; - }; - Graphics(); virtual ~Graphics(); @@ -436,8 +431,7 @@ public: SpriteBatch *newSpriteBatch(Texture *texture, int size, vertex::Usage usage); ParticleSystem *newParticleSystem(Texture *texture, int size); - ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source); - Shader *newShader(const std::string &vertex, const std::string &pixel); + Shader *newShader(const std::vector &stagessource); virtual Buffer *newBuffer(size_t size, const void *data, BufferType type, vertex::Usage usage, uint32 mapflags) = 0; @@ -448,7 +442,7 @@ public: Text *newText(Font *font, const std::vector &text = {}); - bool validateShader(bool gles, const std::string &vertex, const std::string &pixel, std::string &err); + bool validateShader(bool gles, const std::vector &stages, std::string &err); /** * Resets the current color, background color, line style, and so forth. @@ -827,9 +821,6 @@ public: static void flushBatchedDrawsGlobal(); - virtual Shader::Language getShaderLanguageTarget() const = 0; - const DefaultShaderCode &getCurrentDefaultShaderCode() const; - void cleanupCachedShaderStage(ShaderStage::StageType type, const std::string &cachekey); template @@ -869,9 +860,6 @@ public: static bool getConstant(StackType in, const char *&out); static std::vector getConstants(StackType); - // Default shader code (a shader is always required internally.) - static DefaultShaderCode defaultShaderCode[Shader::STANDARD_MAX_ENUM][Shader::LANGUAGE_MAX_ENUM][2]; - protected: struct DisplayState @@ -945,6 +933,7 @@ protected: {} }; + ShaderStage *newShaderStage(ShaderStage::StageType stage, const std::string &source, const Shader::SourceInfo &info); virtual ShaderStage *newShaderStageInternal(ShaderStage::StageType stage, const std::string &cachekey, const std::string &source, bool gles) = 0; virtual Shader *newShaderInternal(ShaderStage *vertex, ShaderStage *pixel) = 0; virtual StreamBuffer *newStreamBuffer(BufferType type, size_t size) = 0; diff --git a/src/modules/graphics/Shader.cpp b/src/modules/graphics/Shader.cpp index f94b952f6..fbfdc7ebe 100644 --- a/src/modules/graphics/Shader.cpp +++ b/src/modules/graphics/Shader.cpp @@ -28,12 +28,402 @@ // C++ #include +#include +#include namespace love { namespace graphics { +namespace glsl +{ +static const char global_syntax[] = R"( +#if !defined(GL_ES) && __VERSION__ < 140 + #define lowp + #define mediump + #define highp +#endif +#if defined(VERTEX) || __VERSION__ > 100 || defined(GL_FRAGMENT_PRECISION_HIGH) + #define LOVE_HIGHP_OR_MEDIUMP highp +#else + #define LOVE_HIGHP_OR_MEDIUMP mediump +#endif +#define number float +#define Image sampler2D +#define ArrayImage sampler2DArray +#define CubeImage samplerCube +#define VolumeImage sampler3D +#if __VERSION__ >= 300 && !defined(LOVE_GLSL1_ON_GLSL3) + #define DepthImage sampler2DShadow + #define DepthArrayImage sampler2DArrayShadow + #define DepthCubeImage samplerCubeShadow +#endif +#define extern uniform +#ifdef GL_EXT_texture_array +#extension GL_EXT_texture_array : enable +#endif +#ifdef GL_OES_texture_3D +#extension GL_OES_texture_3D : enable +#endif +#ifdef GL_OES_standard_derivatives +#extension GL_OES_standard_derivatives : enable +#endif +)"; + +static const char global_uniforms[] = R"( +// According to the GLSL ES 1.0 spec, uniform precision must match between stages, +// but we can't guarantee that highp is always supported in fragment shaders... +// We *really* don't want to use mediump for these in vertex shaders though. +uniform LOVE_HIGHP_OR_MEDIUMP vec4 love_UniformsPerDraw[13]; + +// These are initialized in love_initializeBuiltinUniforms below. GLSL ES can't +// do it as an initializer. +LOVE_HIGHP_OR_MEDIUMP mat4 TransformMatrix; +LOVE_HIGHP_OR_MEDIUMP mat4 ProjectionMatrix; +LOVE_HIGHP_OR_MEDIUMP mat3 NormalMatrix; + +LOVE_HIGHP_OR_MEDIUMP vec4 love_ScreenSize; +LOVE_HIGHP_OR_MEDIUMP vec4 ConstantColor; + +#define TransformProjectionMatrix (ProjectionMatrix * TransformMatrix) + +// Alternate names +#define ViewSpaceFromLocal TransformMatrix +#define ClipSpaceFromView ProjectionMatrix +#define ClipSpaceFromLocal TransformProjectionMatrix +#define ViewNormalFromLocal NormalMatrix + +void love_initializeBuiltinUniforms() { + TransformMatrix = mat4( + love_UniformsPerDraw[0], + love_UniformsPerDraw[1], + love_UniformsPerDraw[2], + love_UniformsPerDraw[3] + ); + + ProjectionMatrix = mat4( + love_UniformsPerDraw[4], + love_UniformsPerDraw[5], + love_UniformsPerDraw[6], + love_UniformsPerDraw[7] + ); + + NormalMatrix = mat3( + love_UniformsPerDraw[8].xyz, + love_UniformsPerDraw[9].xyz, + love_UniformsPerDraw[10].xyz + ); + + love_ScreenSize = love_UniformsPerDraw[11]; + ConstantColor = love_UniformsPerDraw[12]; +} +)"; + +static const char global_functions[] = R"( +#ifdef GL_ES + #if __VERSION__ >= 300 || defined(GL_EXT_texture_array) + precision lowp sampler2DArray; + #endif + #if __VERSION__ >= 300 || defined(GL_OES_texture_3D) + precision lowp sampler3D; + #endif + #if __VERSION__ >= 300 + precision lowp sampler2DShadow; + precision lowp samplerCubeShadow; + precision lowp sampler2DArrayShadow; + #endif +#endif + +#if __VERSION__ >= 130 && !defined(LOVE_GLSL1_ON_GLSL3) + #define Texel texture +#else + #if __VERSION__ >= 130 + #define texture2D Texel + #define texture3D Texel + #define textureCube Texel + #define texture2DArray Texel + #define love_texture2D texture + #define love_texture3D texture + #define love_textureCube texture + #define love_texture2DArray texture + #else + #define love_texture2D texture2D + #define love_texture3D texture3D + #define love_textureCube textureCube + #define love_texture2DArray texture2DArray + #endif + vec4 Texel(sampler2D s, vec2 c) { return love_texture2D(s, c); } + vec4 Texel(samplerCube s, vec3 c) { return love_textureCube(s, c); } + #if __VERSION__ > 100 || defined(GL_OES_texture_3D) + vec4 Texel(sampler3D s, vec3 c) { return love_texture3D(s, c); } + #endif + #if __VERSION__ >= 130 || defined(GL_EXT_texture_array) + vec4 Texel(sampler2DArray s, vec3 c) { return love_texture2DArray(s, c); } + #endif + #ifdef PIXEL + vec4 Texel(sampler2D s, vec2 c, float b) { return love_texture2D(s, c, b); } + vec4 Texel(samplerCube s, vec3 c, float b) { return love_textureCube(s, c, b); } + #if __VERSION__ > 100 || defined(GL_OES_texture_3D) + vec4 Texel(sampler3D s, vec3 c, float b) { return love_texture3D(s, c, b); } + #endif + #if __VERSION__ >= 130 || defined(GL_EXT_texture_array) + vec4 Texel(sampler2DArray s, vec3 c, float b) { return love_texture2DArray(s, c, b); } + #endif + #endif + #define texture love_texture +#endif + +float gammaToLinearPrecise(float c) { + return c <= 0.04045 ? c / 12.92 : pow((c + 0.055) / 1.055, 2.4); +} +vec3 gammaToLinearPrecise(vec3 c) { + bvec3 leq = lessThanEqual(c, vec3(0.04045)); + c.r = leq.r ? c.r / 12.92 : pow((c.r + 0.055) / 1.055, 2.4); + c.g = leq.g ? c.g / 12.92 : pow((c.g + 0.055) / 1.055, 2.4); + c.b = leq.b ? c.b / 12.92 : pow((c.b + 0.055) / 1.055, 2.4); + return c; +} +vec4 gammaToLinearPrecise(vec4 c) { return vec4(gammaToLinearPrecise(c.rgb), c.a); } +float linearToGammaPrecise(float c) { + return c < 0.0031308 ? c * 12.92 : 1.055 * pow(c, 1.0 / 2.4) - 0.055; +} +vec3 linearToGammaPrecise(vec3 c) { + bvec3 lt = lessThanEqual(c, vec3(0.0031308)); + c.r = lt.r ? c.r * 12.92 : 1.055 * pow(c.r, 1.0 / 2.4) - 0.055; + c.g = lt.g ? c.g * 12.92 : 1.055 * pow(c.g, 1.0 / 2.4) - 0.055; + c.b = lt.b ? c.b * 12.92 : 1.055 * pow(c.b, 1.0 / 2.4) - 0.055; + return c; +} +vec4 linearToGammaPrecise(vec4 c) { return vec4(linearToGammaPrecise(c.rgb), c.a); } + +// http://chilliant.blogspot.com.au/2012/08/srgb-approximations-for-hlsl.html?m=1 + +mediump float gammaToLinearFast(mediump float c) { return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878); } +mediump vec3 gammaToLinearFast(mediump vec3 c) { return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878); } +mediump vec4 gammaToLinearFast(mediump vec4 c) { return vec4(gammaToLinearFast(c.rgb), c.a); } + +mediump float linearToGammaFast(mediump float c) { return max(1.055 * pow(max(c, 0.0), 0.41666666) - 0.055, 0.0); } +mediump vec3 linearToGammaFast(mediump vec3 c) { return max(1.055 * pow(max(c, vec3(0.0)), vec3(0.41666666)) - 0.055, vec3(0.0)); } +mediump vec4 linearToGammaFast(mediump vec4 c) { return vec4(linearToGammaFast(c.rgb), c.a); } + +#define gammaToLinear gammaToLinearFast +#define linearToGamma linearToGammaFast + +#ifdef LOVE_GAMMA_CORRECT + #define gammaCorrectColor gammaToLinear + #define unGammaCorrectColor linearToGamma + #define gammaCorrectColorPrecise gammaToLinearPrecise + #define unGammaCorrectColorPrecise linearToGammaPrecise + #define gammaCorrectColorFast gammaToLinearFast + #define unGammaCorrectColorFast linearToGammaFast +#else + #define gammaCorrectColor + #define unGammaCorrectColor + #define gammaCorrectColorPrecise + #define unGammaCorrectColorPrecise + #define gammaCorrectColorFast + #define unGammaCorrectColorFast +#endif +)"; + +static const char vertex_header[] = R"( +#define love_Position gl_Position + +#if __VERSION__ >= 130 + #define attribute in + #define varying out + #ifndef LOVE_GLSL1_ON_GLSL3 + #define love_VertexID gl_VertexID + #define love_InstanceID gl_InstanceID + #endif +#endif + +#ifdef GL_ES + uniform mediump float love_PointSize; +#endif +)"; + +static const char vertex_functions[] = R"( +void setPointSize() { +#ifdef GL_ES + gl_PointSize = love_PointSize; +#endif +} +)"; + +static const char vertex_main[] = R"( +attribute vec4 VertexPosition; +attribute vec4 VertexTexCoord; +attribute vec4 VertexColor; + +varying vec4 VaryingTexCoord; +varying vec4 VaryingColor; + +vec4 position(mat4 clipSpaceFromLocal, vec4 localPosition); + +void main() { + love_initializeBuiltinUniforms(); + VaryingTexCoord = VertexTexCoord; + VaryingColor = gammaCorrectColor(VertexColor) * ConstantColor; + setPointSize(); + love_Position = position(ClipSpaceFromLocal, VertexPosition); +} +)"; + +static const char pixel_header[] = R"( +#ifdef GL_ES + precision mediump float; +#endif + +#define love_MaxRenderTargets gl_MaxDrawBuffers + +#if __VERSION__ >= 130 + #define varying in + // Some drivers seem to make the pixel shader do more work when multiple + // pixel shader outputs are defined, even when only one is actually used. + // TODO: We should use reflection or something instead of this, to determine + // how many outputs are actually used in the shader code. + #ifdef LOVE_MULTI_RENDER_TARGETS + layout(location = 0) out vec4 love_RenderTargets[love_MaxRenderTargets]; + #define love_PixelColor love_RenderTargets[0] + #else + layout(location = 0) out vec4 love_PixelColor; + #endif +#else + #ifdef LOVE_MULTI_RENDER_TARGETS + #define love_RenderTargets gl_FragData + #endif + #define love_PixelColor gl_FragColor +#endif + +// Legacy +#define love_MaxCanvases love_MaxRenderTargets +#define love_Canvases love_RenderTargets +#ifdef LOVE_MULTI_RENDER_TARGETS +#define LOVE_MULTI_CANVASES 1 +#endif + +// See Shader::updateScreenParams in Shader.cpp. +#define love_PixelCoord (vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w)) +)"; + +static const char pixel_functions[] = R"( +uniform sampler2D love_VideoYChannel; +uniform sampler2D love_VideoCbChannel; +uniform sampler2D love_VideoCrChannel; + +vec4 VideoTexel(vec2 texcoords) { + vec3 yuv; + yuv[0] = Texel(love_VideoYChannel, texcoords).r; + yuv[1] = Texel(love_VideoCbChannel, texcoords).r; + yuv[2] = Texel(love_VideoCrChannel, texcoords).r; + yuv += vec3(-0.0627451017, -0.501960814, -0.501960814); + + vec4 color; + color.r = dot(yuv, vec3(1.164, 0.000, 1.596)); + color.g = dot(yuv, vec3(1.164, -0.391, -0.813)); + color.b = dot(yuv, vec3(1.164, 2.018, 0.000)); + color.a = 1.0; + + return gammaCorrectColor(color); +} +)"; + +static const char pixel_main[] = R"( +uniform sampler2D MainTex; +varying LOVE_HIGHP_OR_MEDIUMP vec4 VaryingTexCoord; +varying mediump vec4 VaryingColor; + +vec4 effect(vec4 vcolor, Image tex, vec2 texcoord, vec2 pixcoord); + +void main() { + love_initializeBuiltinUniforms(); + love_PixelColor = effect(VaryingColor, MainTex, VaryingTexCoord.st, love_PixelCoord); +} +)"; + +static const char pixel_main_custom[] = R"( +varying LOVE_HIGHP_OR_MEDIUMP vec4 VaryingTexCoord; +varying mediump vec4 VaryingColor; + +void effect(); + +void main() { + love_initializeBuiltinUniforms(); + effect(); +} +)"; + +struct StageInfo +{ + const char *name; + const char *header; + const char *functions; + const char *main; + const char *main_custom; +}; + +static const StageInfo stageInfo[] = +{ + { "VERTEX", vertex_header, vertex_functions, vertex_main, vertex_main }, + { "PIXEL", pixel_header, pixel_functions, pixel_main, pixel_main_custom }, +}; + +static_assert((sizeof(stageInfo) / sizeof(StageInfo)) == ShaderStage::STAGE_MAX_ENUM, "Stages array size must match ShaderStage enum."); + +struct Version +{ + std::string glsl; + std::string glsles; +}; + +// Indexed by Shader::Version +static const Version versions[] = +{ + { "#version 120", "#version 100" }, + { "#version 330 core", "#version 300 es" }, + { "#version 430 core", "#version 310 es" }, +}; + +static Shader::Language getTargetLanguage(const std::string &src) +{ + std::regex r("^\\s*#pragma language (\\w+)"); + std::smatch m; + std::string langstr = std::regex_search(src, m, r) ? m[0] : std::string("glsl1"); + Shader::Language lang = Shader::LANGUAGE_MAX_ENUM; + Shader::getConstant(langstr.c_str(), lang); + return lang; +} + +static bool isVertexCode(const std::string &src) +{ + std::regex r("vec4\\s+position\\s*\\("); + std::smatch m; + return std::regex_search(src, m, r); +} + +static bool isPixelCode(const std::string &src, bool &custompixel, bool &mrt) +{ + custompixel = false; + mrt = false; + std::smatch m; + if (std::regex_search(src, m, std::regex("vec4\\s+effect\\s*\\("))) + return true; + + if (std::regex_search(src, m, std::regex("void\\s+effect\\s*\\("))) + { + custompixel = true; + if (src.find("love_RenderTargets") != std::string::npos || src.find("love_Canvases") != std::string::npos) + mrt = true; + return true; + } + + return false; +} + +} // glsl + static_assert(sizeof(Shader::BuiltinUniformData) == sizeof(float) * 4 * 13, "Update the array in wrap_GraphicsShader.lua if this changes."); love::Type Shader::type("Shader", &Object::type); @@ -41,6 +431,59 @@ love::Type Shader::type("Shader", &Object::type); Shader *Shader::current = nullptr; Shader *Shader::standardShaders[Shader::STANDARD_MAX_ENUM] = {nullptr}; +Shader::SourceInfo Shader::getSourceInfo(const std::string &src) +{ + SourceInfo info = {}; + info.language = glsl::getTargetLanguage(src); + info.isStage[ShaderStage::STAGE_VERTEX] = glsl::isVertexCode(src); + info.isStage[ShaderStage::STAGE_PIXEL] = glsl::isPixelCode(src, info.customPixelFunction, info.usesMRT); + return info; +} + +std::string Shader::createShaderStageCode(Graphics *gfx, ShaderStage::StageType stage, const std::string &code, const Shader::SourceInfo &info) +{ + if (info.language == Shader::LANGUAGE_MAX_ENUM) + throw love::Exception("Invalid shader language"); + + const auto &features = gfx->getCapabilities().features; + + if (info.language == LANGUAGE_GLSL3 && !features[Graphics::FEATURE_GLSL3]) + throw love::Exception("GLSL 3 shaders are not supported on this system."); + + if (info.language == LANGUAGE_GLSL4 && !features[Graphics::FEATURE_GLSL4]) + throw love::Exception("GLSL 4 shaders are not supported on this system."); + + bool gles = gfx->getRenderer() == Graphics::RENDERER_OPENGLES; + bool glsl1on3 = info.language == LANGUAGE_GLSL1 && features[Graphics::FEATURE_GLSL3]; + + Language lang = info.language; + if (glsl1on3) + lang = LANGUAGE_GLSL3; + + glsl::StageInfo stageinfo = glsl::stageInfo[stage]; + + std::stringstream ss; + + ss << (gles ? glsl::versions[lang].glsles : glsl::versions[lang].glsl) << "\n"; + ss << "#define " << stageinfo.name << " " << stageinfo.name << "\n"; + if (glsl1on3) + ss << "#define LOVE_GLSL1_ON_GLSL3 1\n"; + if (isGammaCorrect()) + ss << "#define LOVE_GAMMA_CORRECT 1\n"; + if (info.usesMRT) + ss << "#define LOVE_MULTI_RENDER_TARGETS 1"; + ss << glsl::global_syntax; + ss << stageinfo.header; + ss << glsl::global_uniforms; + ss << glsl::global_functions; + ss << stageinfo.functions; + ss << (info.customPixelFunction ? stageinfo.main_custom : stageinfo.main); + ss << ((!gles && (lang == Shader::LANGUAGE_GLSL1 || glsl1on3)) ? "#line 0\n" : "#line 1\n"); + ss << code; + + return ss.str(); +} + Shader::Shader(ShaderStage *vertex, ShaderStage *pixel) : stages() { @@ -157,6 +600,74 @@ void Shader::deinitialize() glslang::FinalizeProcess(); } +static const std::string defaultVertex = R"( +vec4 position(mat4 clipSpaceFromLocal, vec4 localPosition) +{ + return clipSpaceFromLocal * localPosition; +} +)"; + +static const std::string defaultStandardPixel = R"( +vec4 effect(vec4 vcolor, Image tex, vec2 texcoord, vec2 pixcoord) +{ + return Texel(tex, texcoord) * vcolor; +} +)"; + +static const std::string defaultVideoPixel = R"( +void effect() +{ + love_PixelColor = VideoTexel(VaryingTexCoord.xy) * VaryingColor; +} +)"; + +static const std::string defaultArrayPixel = R"( +uniform ArrayImage MainTex; +void effect() +{ + love_PixelColor = Texel(MainTex, VaryingTexCoord.xyz) * VaryingColor; +} +)"; + +const std::string &Shader::getDefaultCode(StandardShader shader, ShaderStage::StageType stage) +{ + if (stage == ShaderStage::STAGE_VERTEX) + return defaultVertex; + + static std::string nocode = ""; + + switch (shader) + { + case STANDARD_DEFAULT: return defaultStandardPixel; + case STANDARD_VIDEO: return defaultVideoPixel; + case STANDARD_ARRAY: return defaultArrayPixel; + case STANDARD_MAX_ENUM: return nocode; + } + + return nocode; +} + +static StringMap::Entry languageEntries[] = +{ + { "glsl1", Shader::LANGUAGE_GLSL1 }, + { "glsl3", Shader::LANGUAGE_GLSL3 }, + { "glsl4", Shader::LANGUAGE_GLSL4 }, +}; + +static StringMap languages(languageEntries, sizeof(languageEntries)); + +static StringMap::Entry builtinNameEntries[] = +{ + { "MainTex", Shader::BUILTIN_TEXTURE_MAIN }, + { "love_VideoYChannel", Shader::BUILTIN_TEXTURE_VIDEO_Y }, + { "love_VideoCbChannel", Shader::BUILTIN_TEXTURE_VIDEO_CB }, + { "love_VideoCrChannel", Shader::BUILTIN_TEXTURE_VIDEO_CR }, + { "love_UniformsPerDraw", Shader::BUILTIN_UNIFORMS_PER_DRAW }, + { "love_PointSize", Shader::BUILTIN_POINT_SIZE }, +}; + +static StringMap builtinNames(builtinNameEntries, sizeof(builtinNameEntries)); + bool Shader::getConstant(const char *in, Language &out) { return languages.find(in, out); @@ -177,27 +688,5 @@ bool Shader::getConstant(BuiltinUniform in, const char *&out) return builtinNames.find(in, out); } -StringMap::Entry Shader::languageEntries[] = -{ - { "glsl1", LANGUAGE_GLSL1 }, - { "essl1", LANGUAGE_ESSL1 }, - { "glsl3", LANGUAGE_GLSL3 }, - { "essl3", LANGUAGE_ESSL3 }, -}; - -StringMap Shader::languages(Shader::languageEntries, sizeof(Shader::languageEntries)); - -StringMap::Entry Shader::builtinNameEntries[] = -{ - { "MainTex", BUILTIN_TEXTURE_MAIN }, - { "love_VideoYChannel", BUILTIN_TEXTURE_VIDEO_Y }, - { "love_VideoCbChannel", BUILTIN_TEXTURE_VIDEO_CB }, - { "love_VideoCrChannel", BUILTIN_TEXTURE_VIDEO_CR }, - { "love_UniformsPerDraw", BUILTIN_UNIFORMS_PER_DRAW }, - { "love_PointSize", BUILTIN_POINT_SIZE }, -}; - -StringMap Shader::builtinNames(Shader::builtinNameEntries, sizeof(Shader::builtinNameEntries)); - } // graphics } // love diff --git a/src/modules/graphics/Shader.h b/src/modules/graphics/Shader.h index 600cffce6..07628c797 100644 --- a/src/modules/graphics/Shader.h +++ b/src/modules/graphics/Shader.h @@ -55,9 +55,8 @@ public: enum Language { LANGUAGE_GLSL1, - LANGUAGE_ESSL1, LANGUAGE_GLSL3, - LANGUAGE_ESSL3, + LANGUAGE_GLSL4, LANGUAGE_MAX_ENUM }; @@ -94,6 +93,14 @@ public: STANDARD_MAX_ENUM }; + struct SourceInfo + { + Language language; + bool isStage[ShaderStage::STAGE_MAX_ENUM]; + bool customPixelFunction; + bool usesMRT; + }; + struct MatrixSize { short columns; @@ -192,11 +199,16 @@ public: void checkMainTextureType(TextureType textype, bool isDepthSampler) const; void checkMainTexture(Texture *texture) const; + static SourceInfo getSourceInfo(const std::string &src); + static std::string createShaderStageCode(Graphics *gfx, ShaderStage::StageType stage, const std::string &code, const SourceInfo &info); + static bool validate(ShaderStage *vertex, ShaderStage *pixel, std::string &err); static bool initialize(); static void deinitialize(); + static const std::string &getDefaultCode(StandardShader shader, ShaderStage::StageType stage); + static bool getConstant(const char *in, Language &out); static bool getConstant(Language in, const char *&out); @@ -207,15 +219,6 @@ protected: StrongRef stages[ShaderStage::STAGE_MAX_ENUM]; -private: - - static StringMap::Entry languageEntries[]; - static StringMap languages; - - // Names for the built-in uniform variables. - static StringMap::Entry builtinNameEntries[]; - static StringMap builtinNames; - }; // Shader } // graphics diff --git a/src/modules/graphics/ShaderStage.cpp b/src/modules/graphics/ShaderStage.cpp index b953c0038..8a3132cd5 100644 --- a/src/modules/graphics/ShaderStage.cpp +++ b/src/modules/graphics/ShaderStage.cpp @@ -202,6 +202,13 @@ bool ShaderStage::getConstant(StageType in, const char *&out) return stageNames.find(in, out); } +const char *ShaderStage::getConstant(StageType in) +{ + const char *name = nullptr; + getConstant(in, name); + return name; +} + StringMap::Entry ShaderStage::stageNameEntries[] = { { "vertex", STAGE_VERTEX }, diff --git a/src/modules/graphics/ShaderStage.h b/src/modules/graphics/ShaderStage.h index 95b441783..6465c31c5 100644 --- a/src/modules/graphics/ShaderStage.h +++ b/src/modules/graphics/ShaderStage.h @@ -44,6 +44,7 @@ class ShaderStage : public love::Object, public Volatile, public Resource { public: + // Order is used for stages array in ShaderStage.cpp enum StageType { STAGE_VERTEX, @@ -61,6 +62,7 @@ public: static bool getConstant(const char *in, StageType &out); static bool getConstant(StageType in, const char *&out); + static const char *getConstant(StageType in); protected: diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index ffde86c90..a58952554 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -252,12 +252,11 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b // Restore the graphics state. restoreState(states.back()); - int gammacorrect = isGammaCorrect() ? 1 : 0; - Shader::Language target = getShaderLanguageTarget(); - // We always need a default shader. for (int i = 0; i < Shader::STANDARD_MAX_ENUM; i++) { + auto stype = (Shader::StandardShader) i; + if (i == Shader::STANDARD_ARRAY && !capabilities.textureTypes[TEXTURE_2D_ARRAY]) continue; @@ -267,8 +266,10 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b { if (!Shader::standardShaders[i]) { - const auto &code = defaultShaderCode[i][target][gammacorrect]; - Shader::standardShaders[i] = love::graphics::Graphics::newShader(code.source[ShaderStage::STAGE_VERTEX], code.source[ShaderStage::STAGE_PIXEL]); + std::vector stages; + stages.push_back(Shader::getDefaultCode(stype, ShaderStage::STAGE_VERTEX)); + stages.push_back(Shader::getDefaultCode(stype, ShaderStage::STAGE_PIXEL)); + Shader::standardShaders[i] = newShader(stages); } } catch (love::Exception &) @@ -1501,18 +1502,6 @@ bool Graphics::isPixelFormatSupported(PixelFormat format, bool rendertarget, boo return supported.value; } -Shader::Language Graphics::getShaderLanguageTarget() const -{ - if (gl.isCoreProfile()) - return Shader::LANGUAGE_GLSL3; - else if (GLAD_ES_VERSION_3_0) - return Shader::LANGUAGE_ESSL3; - else if (GLAD_ES_VERSION_2_0) - return Shader::LANGUAGE_ESSL1; - else - return Shader::LANGUAGE_GLSL1; -} - } // opengl } // graphics } // love diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index e6b59c71a..6b8d51e54 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -106,8 +106,6 @@ public: Renderer getRenderer() const override; RendererInfo getRendererInfo() const override; - Shader::Language getShaderLanguageTarget() const override; - // Internal use. void cleanupRenderTexture(love::graphics::Texture *texture); diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index a801f6594..933564e6d 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -45,11 +45,6 @@ static const char graphics_lua[] = #include "wrap_Graphics.lua" ; -// This is in a separate file because VS2013 has a 16KB limit for raw strings.. -static const char graphics_shader_lua[] = -#include "wrap_GraphicsShader.lua" -; - namespace love { namespace graphics @@ -1366,7 +1361,7 @@ int w_newParticleSystem(lua_State *L) return 1; } -static int w_getShaderSource(lua_State *L, int startidx, bool gles, std::string &vertexsource, std::string &pixelsource) +static int w_getShaderSource(lua_State *L, int startidx, std::vector &stages) { using namespace love::filesystem; @@ -1426,61 +1421,23 @@ static int w_getShaderSource(lua_State *L, int startidx, bool gles, std::string if (!(has_arg1 || has_arg2)) luaL_checkstring(L, startidx); - luax_getfunction(L, "graphics", "_shaderCodeToGLSL"); - - // push vertexcode and pixelcode strings to the top of the stack - lua_pushboolean(L, gles); - if (has_arg1) - lua_pushvalue(L, startidx + 0); - else - lua_pushnil(L); - + stages.push_back(luax_checkstring(L, startidx + 0)); if (has_arg2) - lua_pushvalue(L, startidx + 1); - else - lua_pushnil(L); - - // call effectCodeToGLSL, returned values will be at the top of the stack - if (lua_pcall(L, 3, 2, 0) != 0) - return luaL_error(L, "%s", lua_tostring(L, -1)); - - // vertex shader code - if (lua_isstring(L, -2)) - vertexsource = luax_checkstring(L, -2); - else if (has_arg1 && has_arg2) - return luaL_error(L, "Could not parse vertex shader code (missing 'position' function?)"); - - // pixel shader code - if (lua_isstring(L, -1)) - pixelsource = luax_checkstring(L, -1); - else if (has_arg1 && has_arg2) - return luaL_error(L, "Could not parse pixel shader code (missing 'effect' function?)"); - - if (vertexsource.empty() && pixelsource.empty()) - { - // Original args had source code, but effectCodeToGLSL couldn't translate it - for (int i = startidx; i < startidx + 2; i++) - { - if (lua_isstring(L, i)) - return luaL_argerror(L, i, "missing 'position' or 'effect' function?"); - } - } + stages.push_back(luax_checkstring(L, startidx + 1)); return 0; } int w_newShader(lua_State *L) { - bool gles = instance()->getRenderer() == Graphics::RENDERER_OPENGLES; - - std::string vertexsource, pixelsource; - w_getShaderSource(L, 1, gles, vertexsource, pixelsource); + std::vector stages; + w_getShaderSource(L, 1, stages); bool should_error = false; try { - Shader *shader = instance()->newShader(vertexsource, pixelsource); + Shader *shader = instance()->newShader(stages); luax_pushtype(L, shader); shader->release(); } @@ -1504,14 +1461,14 @@ int w_validateShader(lua_State *L) { bool gles = luax_checkboolean(L, 1); - std::string vertexsource, pixelsource; - w_getShaderSource(L, 2, gles, vertexsource, pixelsource); + std::vector stages; + w_getShaderSource(L, 2, stages); bool success = true; std::string err; try { - success = instance()->validateShader(gles, vertexsource, pixelsource, err); + success = instance()->validateShader(gles, stages, err); } catch (love::Exception &e) { @@ -2289,46 +2246,6 @@ int w_getShader(lua_State *L) return 1; } -int w_setDefaultShaderCode(lua_State *L) -{ - for (int i = 0; i < 2; i++) - { - luaL_checktype(L, i + 1, LUA_TTABLE); - - for (int lang = 0; lang < Shader::LANGUAGE_MAX_ENUM; lang++) - { - const char *langname; - if (!Shader::getConstant((Shader::Language) lang, langname)) - continue; - - lua_getfield(L, i + 1, langname); - - lua_getfield(L, -1, "vertex"); - lua_getfield(L, -2, "pixel"); - lua_getfield(L, -3, "videopixel"); - lua_getfield(L, -4, "arraypixel"); - - std::string vertex = luax_checkstring(L, -4); - std::string pixel = luax_checkstring(L, -3); - std::string videopixel = luax_checkstring(L, -2); - std::string arraypixel = luax_checkstring(L, -1); - - lua_pop(L, 5); - - Graphics::defaultShaderCode[Shader::STANDARD_DEFAULT][lang][i].source[ShaderStage::STAGE_VERTEX] = vertex; - Graphics::defaultShaderCode[Shader::STANDARD_DEFAULT][lang][i].source[ShaderStage::STAGE_PIXEL] = pixel; - - Graphics::defaultShaderCode[Shader::STANDARD_VIDEO][lang][i].source[ShaderStage::STAGE_VERTEX] = vertex; - Graphics::defaultShaderCode[Shader::STANDARD_VIDEO][lang][i].source[ShaderStage::STAGE_PIXEL] = videopixel; - - Graphics::defaultShaderCode[Shader::STANDARD_ARRAY][lang][i].source[ShaderStage::STAGE_VERTEX] = vertex; - Graphics::defaultShaderCode[Shader::STANDARD_ARRAY][lang][i].source[ShaderStage::STAGE_PIXEL] = arraypixel; - } - } - - return 0; -} - int w_getSupported(lua_State *L) { const Graphics::Capabilities &caps = instance()->getCapabilities(); @@ -3203,7 +3120,6 @@ static const luaL_Reg functions[] = { "setShader", w_setShader }, { "getShader", w_getShader }, - { "_setDefaultShaderCode", w_setDefaultShaderCode }, { "getSupported", w_getSupported }, { "getTextureFormats", w_getTextureFormats }, @@ -3319,11 +3235,6 @@ extern "C" int luaopen_love_graphics(lua_State *L) else lua_error(L); - if (luaL_loadbuffer(L, (const char *)graphics_shader_lua, sizeof(graphics_shader_lua), "wrap_GraphicsShader.lua") == 0) - lua_call(L, 0, 0); - else - lua_error(L); - return n; } diff --git a/src/modules/graphics/wrap_GraphicsShader.lua b/src/modules/graphics/wrap_GraphicsShader.lua deleted file mode 100644 index f0631c6f6..000000000 --- a/src/modules/graphics/wrap_GraphicsShader.lua +++ /dev/null @@ -1,503 +0,0 @@ -R"luastring"--( --- DO NOT REMOVE THE ABOVE LINE. It is used to load this file as a C++ string. --- There is a matching delimiter at the bottom of the file. - ---[[ -Copyright (c) 2006-2020 LOVE Development Team - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software -in a product, an acknowledgment in the product documentation would be -appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. ---]] - -local table_concat, table_insert = table.concat, table.insert -local ipairs = ipairs - -local GLSL = {} - -GLSL.VERSION = { -- index using [target][gles] - glsl1 = {[false]="#version 120", [true]="#version 100"}, - glsl3 = {[false]="#version 330 core", [true]="#version 300 es"}, - glsl4 = {[false]="#version 430 core", [true]="#version 310 es"}, -} - -GLSL.SYNTAX = [[ -#if !defined(GL_ES) && __VERSION__ < 140 - #define lowp - #define mediump - #define highp -#endif -#if defined(VERTEX) || __VERSION__ > 100 || defined(GL_FRAGMENT_PRECISION_HIGH) - #define LOVE_HIGHP_OR_MEDIUMP highp -#else - #define LOVE_HIGHP_OR_MEDIUMP mediump -#endif -#define number float -#define Image sampler2D -#define ArrayImage sampler2DArray -#define CubeImage samplerCube -#define VolumeImage sampler3D -#if __VERSION__ >= 300 && !defined(LOVE_GLSL1_ON_GLSL3) - #define DepthImage sampler2DShadow - #define DepthArrayImage sampler2DArrayShadow - #define DepthCubeImage samplerCubeShadow -#endif -#define extern uniform -#ifdef GL_EXT_texture_array -#extension GL_EXT_texture_array : enable -#endif -#ifdef GL_OES_texture_3D -#extension GL_OES_texture_3D : enable -#endif -#ifdef GL_OES_standard_derivatives -#extension GL_OES_standard_derivatives : enable -#endif -]] - --- Uniforms shared by the vertex and pixel shader stages. -GLSL.UNIFORMS = [[ -// According to the GLSL ES 1.0 spec, uniform precision must match between stages, -// but we can't guarantee that highp is always supported in fragment shaders... -// We *really* don't want to use mediump for these in vertex shaders though. -uniform LOVE_HIGHP_OR_MEDIUMP vec4 love_UniformsPerDraw[13]; - -// These are initialized in love_initializeBuiltinUniforms below. GLSL ES can't -// do it as an initializer. -LOVE_HIGHP_OR_MEDIUMP mat4 TransformMatrix; -LOVE_HIGHP_OR_MEDIUMP mat4 ProjectionMatrix; -LOVE_HIGHP_OR_MEDIUMP mat3 NormalMatrix; - -LOVE_HIGHP_OR_MEDIUMP vec4 love_ScreenSize; -LOVE_HIGHP_OR_MEDIUMP vec4 ConstantColor; - -#define TransformProjectionMatrix (ProjectionMatrix * TransformMatrix) - -// Alternate names -#define ViewSpaceFromLocal TransformMatrix -#define ClipSpaceFromView ProjectionMatrix -#define ClipSpaceFromLocal TransformProjectionMatrix -#define ViewNormalFromLocal NormalMatrix - -void love_initializeBuiltinUniforms() { - TransformMatrix = mat4( - love_UniformsPerDraw[0], - love_UniformsPerDraw[1], - love_UniformsPerDraw[2], - love_UniformsPerDraw[3] - ); - - ProjectionMatrix = mat4( - love_UniformsPerDraw[4], - love_UniformsPerDraw[5], - love_UniformsPerDraw[6], - love_UniformsPerDraw[7] - ); - - NormalMatrix = mat3( - love_UniformsPerDraw[8].xyz, - love_UniformsPerDraw[9].xyz, - love_UniformsPerDraw[10].xyz - ); - - love_ScreenSize = love_UniformsPerDraw[11]; - ConstantColor = love_UniformsPerDraw[12]; -} -]] - -GLSL.FUNCTIONS = [[ -#ifdef GL_ES - #if __VERSION__ >= 300 || defined(GL_EXT_texture_array) - precision lowp sampler2DArray; - #endif - #if __VERSION__ >= 300 || defined(GL_OES_texture_3D) - precision lowp sampler3D; - #endif - #if __VERSION__ >= 300 - precision lowp sampler2DShadow; - precision lowp samplerCubeShadow; - precision lowp sampler2DArrayShadow; - #endif -#endif - -#if __VERSION__ >= 130 && !defined(LOVE_GLSL1_ON_GLSL3) - #define Texel texture -#else - #if __VERSION__ >= 130 - #define texture2D Texel - #define texture3D Texel - #define textureCube Texel - #define texture2DArray Texel - #define love_texture2D texture - #define love_texture3D texture - #define love_textureCube texture - #define love_texture2DArray texture - #else - #define love_texture2D texture2D - #define love_texture3D texture3D - #define love_textureCube textureCube - #define love_texture2DArray texture2DArray - #endif - vec4 Texel(sampler2D s, vec2 c) { return love_texture2D(s, c); } - vec4 Texel(samplerCube s, vec3 c) { return love_textureCube(s, c); } - #if __VERSION__ > 100 || defined(GL_OES_texture_3D) - vec4 Texel(sampler3D s, vec3 c) { return love_texture3D(s, c); } - #endif - #if __VERSION__ >= 130 || defined(GL_EXT_texture_array) - vec4 Texel(sampler2DArray s, vec3 c) { return love_texture2DArray(s, c); } - #endif - #ifdef PIXEL - vec4 Texel(sampler2D s, vec2 c, float b) { return love_texture2D(s, c, b); } - vec4 Texel(samplerCube s, vec3 c, float b) { return love_textureCube(s, c, b); } - #if __VERSION__ > 100 || defined(GL_OES_texture_3D) - vec4 Texel(sampler3D s, vec3 c, float b) { return love_texture3D(s, c, b); } - #endif - #if __VERSION__ >= 130 || defined(GL_EXT_texture_array) - vec4 Texel(sampler2DArray s, vec3 c, float b) { return love_texture2DArray(s, c, b); } - #endif - #endif - #define texture love_texture -#endif - -float gammaToLinearPrecise(float c) { - return c <= 0.04045 ? c / 12.92 : pow((c + 0.055) / 1.055, 2.4); -} -vec3 gammaToLinearPrecise(vec3 c) { - bvec3 leq = lessThanEqual(c, vec3(0.04045)); - c.r = leq.r ? c.r / 12.92 : pow((c.r + 0.055) / 1.055, 2.4); - c.g = leq.g ? c.g / 12.92 : pow((c.g + 0.055) / 1.055, 2.4); - c.b = leq.b ? c.b / 12.92 : pow((c.b + 0.055) / 1.055, 2.4); - return c; -} -vec4 gammaToLinearPrecise(vec4 c) { return vec4(gammaToLinearPrecise(c.rgb), c.a); } -float linearToGammaPrecise(float c) { - return c < 0.0031308 ? c * 12.92 : 1.055 * pow(c, 1.0 / 2.4) - 0.055; -} -vec3 linearToGammaPrecise(vec3 c) { - bvec3 lt = lessThanEqual(c, vec3(0.0031308)); - c.r = lt.r ? c.r * 12.92 : 1.055 * pow(c.r, 1.0 / 2.4) - 0.055; - c.g = lt.g ? c.g * 12.92 : 1.055 * pow(c.g, 1.0 / 2.4) - 0.055; - c.b = lt.b ? c.b * 12.92 : 1.055 * pow(c.b, 1.0 / 2.4) - 0.055; - return c; -} -vec4 linearToGammaPrecise(vec4 c) { return vec4(linearToGammaPrecise(c.rgb), c.a); } - -// http://chilliant.blogspot.com.au/2012/08/srgb-approximations-for-hlsl.html?m=1 - -mediump float gammaToLinearFast(mediump float c) { return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878); } -mediump vec3 gammaToLinearFast(mediump vec3 c) { return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878); } -mediump vec4 gammaToLinearFast(mediump vec4 c) { return vec4(gammaToLinearFast(c.rgb), c.a); } - -mediump float linearToGammaFast(mediump float c) { return max(1.055 * pow(max(c, 0.0), 0.41666666) - 0.055, 0.0); } -mediump vec3 linearToGammaFast(mediump vec3 c) { return max(1.055 * pow(max(c, vec3(0.0)), vec3(0.41666666)) - 0.055, vec3(0.0)); } -mediump vec4 linearToGammaFast(mediump vec4 c) { return vec4(linearToGammaFast(c.rgb), c.a); } - -#define gammaToLinear gammaToLinearFast -#define linearToGamma linearToGammaFast - -#ifdef LOVE_GAMMA_CORRECT - #define gammaCorrectColor gammaToLinear - #define unGammaCorrectColor linearToGamma - #define gammaCorrectColorPrecise gammaToLinearPrecise - #define unGammaCorrectColorPrecise linearToGammaPrecise - #define gammaCorrectColorFast gammaToLinearFast - #define unGammaCorrectColorFast linearToGammaFast -#else - #define gammaCorrectColor - #define unGammaCorrectColor - #define gammaCorrectColorPrecise - #define unGammaCorrectColorPrecise - #define gammaCorrectColorFast - #define unGammaCorrectColorFast -#endif]] - -GLSL.VERTEX = { - HEADER = [[ -#define love_Position gl_Position - -#if __VERSION__ >= 130 - #define attribute in - #define varying out - #ifndef LOVE_GLSL1_ON_GLSL3 - #define love_VertexID gl_VertexID - #define love_InstanceID gl_InstanceID - #endif -#endif - -#ifdef GL_ES - uniform mediump float love_PointSize; -#endif]], - - FUNCTIONS = [[ -void setPointSize() { -#ifdef GL_ES - gl_PointSize = love_PointSize; -#endif -}]], - - MAIN = [[ -attribute vec4 VertexPosition; -attribute vec4 VertexTexCoord; -attribute vec4 VertexColor; - -varying vec4 VaryingTexCoord; -varying vec4 VaryingColor; - -vec4 position(mat4 clipSpaceFromLocal, vec4 localPosition); - -void main() { - love_initializeBuiltinUniforms(); - VaryingTexCoord = VertexTexCoord; - VaryingColor = gammaCorrectColor(VertexColor) * ConstantColor; - setPointSize(); - love_Position = position(ClipSpaceFromLocal, VertexPosition); -}]], -} - -GLSL.PIXEL = { - HEADER = [[ -#ifdef GL_ES - precision mediump float; -#endif - -#define love_MaxRenderTargets gl_MaxDrawBuffers - -#if __VERSION__ >= 130 - #define varying in - // Some drivers seem to make the pixel shader do more work when multiple - // pixel shader outputs are defined, even when only one is actually used. - // TODO: We should use reflection or something instead of this, to determine - // how many outputs are actually used in the shader code. - #ifdef LOVE_MULTI_RENDER_TARGETS - layout(location = 0) out vec4 love_RenderTargets[love_MaxRenderTargets]; - #define love_PixelColor love_RenderTargets[0] - #else - layout(location = 0) out vec4 love_PixelColor; - #endif -#else - #ifdef LOVE_MULTI_RENDER_TARGETS - #define love_RenderTargets gl_FragData - #endif - #define love_PixelColor gl_FragColor -#endif - -// Legacy -#define love_MaxCanvases love_MaxRenderTargets -#define love_Canvases love_RenderTargets -#ifdef LOVE_MULTI_RENDER_TARGETS -#define LOVE_MULTI_CANVASES 1 -#endif - -// See Shader::updateScreenParams in Shader.cpp. -#define love_PixelCoord (vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w))]], - - FUNCTIONS = [[ -uniform sampler2D love_VideoYChannel; -uniform sampler2D love_VideoCbChannel; -uniform sampler2D love_VideoCrChannel; - -vec4 VideoTexel(vec2 texcoords) { - vec3 yuv; - yuv[0] = Texel(love_VideoYChannel, texcoords).r; - yuv[1] = Texel(love_VideoCbChannel, texcoords).r; - yuv[2] = Texel(love_VideoCrChannel, texcoords).r; - yuv += vec3(-0.0627451017, -0.501960814, -0.501960814); - - vec4 color; - color.r = dot(yuv, vec3(1.164, 0.000, 1.596)); - color.g = dot(yuv, vec3(1.164, -0.391, -0.813)); - color.b = dot(yuv, vec3(1.164, 2.018, 0.000)); - color.a = 1.0; - - return gammaCorrectColor(color); -}]], - - MAIN = [[ -uniform sampler2D MainTex; -varying LOVE_HIGHP_OR_MEDIUMP vec4 VaryingTexCoord; -varying mediump vec4 VaryingColor; - -vec4 effect(vec4 vcolor, Image tex, vec2 texcoord, vec2 pixcoord); - -void main() { - love_initializeBuiltinUniforms(); - love_PixelColor = effect(VaryingColor, MainTex, VaryingTexCoord.st, love_PixelCoord); -}]], - - MAIN_CUSTOM = [[ -varying LOVE_HIGHP_OR_MEDIUMP vec4 VaryingTexCoord; -varying mediump vec4 VaryingColor; - -void effect(); - -void main() { - love_initializeBuiltinUniforms(); - effect(); -}]], -} - -local function getLanguageTarget(code) - if not code then return nil end - return (code:match("^%s*#pragma language (%w+)")) or "glsl1" -end - -local function createShaderStageCode(stage, code, lang, gles, glsl1on3, gammacorrect, custom, multirendertarget) - stage = stage:upper() - local lines = { - GLSL.VERSION[lang][gles], - "#define " ..stage .. " " .. stage, - glsl1on3 and "#define LOVE_GLSL1_ON_GLSL3 1" or "", - gammacorrect and "#define LOVE_GAMMA_CORRECT 1" or "", - multirendertarget and "#define LOVE_MULTI_RENDER_TARGETS 1" or "", - GLSL.SYNTAX, - GLSL[stage].HEADER, - GLSL.UNIFORMS, - GLSL.FUNCTIONS, - GLSL[stage].FUNCTIONS, - custom and GLSL[stage].MAIN_CUSTOM or GLSL[stage].MAIN, - ((lang == "glsl1" or glsl1on3) and not gles) and "#line 0" or "#line 1", - code, - } - return table_concat(lines, "\n") -end - -local function isVertexCode(code) - return code:match("vec4%s+position%s*%(") ~= nil -end - -local function isPixelCode(code) - if code:match("vec4%s+effect%s*%(") then - return true - elseif code:match("void%s+effect%s*%(") then -- custom effect function - local multirendertargets = (code:match("love_RenderTargets") ~= nil) or (code:match("love_Canvases") ~= nil) - return true, true, multirendertargets - else - return false - end -end - -function love.graphics._shaderCodeToGLSL(gles, arg1, arg2) - local vertexcode, pixelcode - local is_custompixel = false -- whether pixel code has "effects" function instead of "effect" - local is_multicanvas = false - - if arg1 then - if isVertexCode(arg1) then - vertexcode = arg1 -- first arg contains vertex shader code - end - - local ispixel, isCustomPixel, isMultiCanvas = isPixelCode(arg1) - if ispixel then - pixelcode = arg1 -- first arg contains pixel shader code - is_custompixel, is_multicanvas = isCustomPixel, isMultiCanvas - end - end - - if arg2 then - if isVertexCode(arg2) then - vertexcode = arg2 -- second arg contains vertex shader code - end - - local ispixel, isCustomPixel, isMultiCanvas = isPixelCode(arg2) - if ispixel then - pixelcode = arg2 -- second arg contains pixel shader code - is_custompixel, is_multicanvas = isCustomPixel, isMultiCanvas - end - end - - local graphicsfeatures = love.graphics.getSupported() - local supportsGLSL3 = graphicsfeatures.glsl3 - local supportsGLSL4 = graphicsfeatures.glsl4 - local gammacorrect = love.graphics.isGammaCorrect() - - local targetlang = getLanguageTarget(pixelcode or vertexcode) - if getLanguageTarget(vertexcode or pixelcode) ~= targetlang then - error("vertex and pixel shader languages must match", 2) - end - - if targetlang == "glsl3" and not supportsGLSL3 then - error("GLSL 3 shaders are not supported on this system.", 2) - end - - if targetlang == "glsl4" and not supportsGLSL4 then - error("GLSL 4 shaders are not supported on this system.", 2) - end - - if targetlang ~= nil and not GLSL.VERSION[targetlang] then - error("Invalid shader language: " .. targetlang, 2) - end - - local lang = targetlang or "glsl1" - local glsl1on3 = false - if lang == "glsl1" and supportsGLSL3 then - lang = "glsl3" - glsl1on3 = true - end - - if vertexcode then - vertexcode = createShaderStageCode("VERTEX", vertexcode, lang, gles, glsl1on3, gammacorrect) - end - if pixelcode then - pixelcode = createShaderStageCode("PIXEL", pixelcode, lang, gles, glsl1on3, gammacorrect, is_custompixel, is_multicanvas) - end - - return vertexcode, pixelcode -end - -local defaultcode = { - vertex = [[ -vec4 position(mat4 clipSpaceFromLocal, vec4 localPosition) { - return clipSpaceFromLocal * localPosition; -}]], - pixel = [[ -vec4 effect(vec4 vcolor, Image tex, vec2 texcoord, vec2 pixcoord) { - return Texel(tex, texcoord) * vcolor; -}]], - videopixel = [[ -void effect() { - love_PixelColor = VideoTexel(VaryingTexCoord.xy) * VaryingColor; -}]], - arraypixel = [[ -uniform ArrayImage MainTex; -void effect() { - love_PixelColor = Texel(MainTex, VaryingTexCoord.xyz) * VaryingColor; -}]], -} - -local defaults = {} -local defaults_gammacorrect = {} - -local langs = { - glsl1 = {target="glsl1", gles=false}, - essl1 = {target="glsl1", gles=true}, - glsl3 = {target="glsl3", gles=false}, - essl3 = {target="glsl3", gles=true}, -} - -for lang, info in pairs(langs) do - for _, gammacorrect in ipairs{false, true} do - local t = gammacorrect and defaults_gammacorrect or defaults - t[lang] = { - vertex = createShaderStageCode("VERTEX", defaultcode.vertex, info.target, info.gles, false, gammacorrect), - pixel = createShaderStageCode("PIXEL", defaultcode.pixel, info.target, info.gles, false, gammacorrect, false), - videopixel = createShaderStageCode("PIXEL", defaultcode.videopixel, info.target, info.gles, false, gammacorrect, true), - arraypixel = createShaderStageCode("PIXEL", defaultcode.arraypixel, info.target, info.gles, false, gammacorrect, true), - } - end -end - -love.graphics._setDefaultShaderCode(defaults, defaults_gammacorrect) - --- DO NOT REMOVE THE NEXT LINE. It is used to load this file as a C++ string. ---)luastring"--" From 10fbdf68f478a96cab8466443e726e71ac43738f Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 4 Mar 2020 20:36:06 -0400 Subject: [PATCH 19/54] Fix love.graphics.newCanvas(w, h) not creating a canvas-capable texture --- src/modules/graphics/wrap_Graphics.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 933564e6d..8e8629e15 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -743,15 +743,15 @@ static int w__pushNewTexture(lua_State *L, Texture::Slices *slices, const Textur static void luax_checktexturesettings(lua_State *L, int idx, bool opt, bool checkType, bool checkDimensions, OptionalBool forceRenderTarget, Texture::Settings &s, bool &setdpiscale) { setdpiscale = false; + if (forceRenderTarget.hasValue) + s.renderTarget = forceRenderTarget.value; if (opt && lua_isnoneornil(L, idx)) return; luax_checktablefields(L, idx, "texture setting name", Texture::getConstant); - if (forceRenderTarget.hasValue) - s.renderTarget = forceRenderTarget.value; - else + if (!forceRenderTarget.hasValue) s.renderTarget = luax_boolflag(L, idx, Texture::getConstant(Texture::SETTING_RENDER_TARGET), s.renderTarget); lua_getfield(L, idx, Texture::getConstant(Texture::SETTING_FORMAT)); From e0ff593d096a9ad709d5f4869cd75d11a1aa754d Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 4 Mar 2020 20:37:41 -0400 Subject: [PATCH 20/54] Fix love.graphics.newTexture(imagedata, {canvas=true}) not using an sRGB format when it should --- src/modules/graphics/Texture.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp index 0200e58ef..071157493 100644 --- a/src/modules/graphics/Texture.cpp +++ b/src/modules/graphics/Texture.cpp @@ -194,6 +194,8 @@ Texture::Texture(const Settings &settings, const Slices *slices) love::image::ImageDataBase *slice = slices->get(0, 0); format = slice->getFormat(); + if (sRGB) + format = getSRGBPixelFormat(format); pixelWidth = slice->getWidth(); pixelHeight = slice->getHeight(); From 5db1e835cee97c8cb307d3e41aa0dd897e145468 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 7 Mar 2020 16:09:40 -0400 Subject: [PATCH 21/54] Prevent stb_image from exporting public symbols in the love dll --- src/modules/image/magpie/STBHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/image/magpie/STBHandler.cpp b/src/modules/image/magpie/STBHandler.cpp index 7046b7682..76b083f7c 100644 --- a/src/modules/image/magpie/STBHandler.cpp +++ b/src/modules/image/magpie/STBHandler.cpp @@ -30,12 +30,13 @@ static void loveSTBIAssert(bool test, const char *teststr) } // stb_image - #define STBI_ONLY_JPEG +#define STBI_ONLY_JPEG // #define STBI_ONLY_PNG #define STBI_ONLY_BMP #define STBI_ONLY_TGA #define STBI_ONLY_HDR #define STBI_NO_STDIO +#define STB_IMAGE_STATIC #define STB_IMAGE_IMPLEMENTATION #define STBI_ASSERT(A) loveSTBIAssert((A), #A) #include "libraries/stb/stb_image.h" From 9c2454816f1933744e06c373f3b151bb53f69f9e Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 15 Mar 2020 01:29:33 -0300 Subject: [PATCH 22/54] Fix the active GL texture unit not always being set properly. Fixes issues where texture methods wouldn't have any effect, depending on the current internal opengl state. --- src/modules/graphics/opengl/OpenGL.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 24a2776b2..83d2fe911 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -993,6 +993,11 @@ void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureun else state.curTextureUnit = textureunit; } + else if (!restoreprev && textureunit != state.curTextureUnit) + { + glActiveTexture(GL_TEXTURE0 + textureunit); + state.curTextureUnit = textureunit; + } } void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev) From 789110208f44d12421f389eec184a32a68cedeb5 Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Sun, 15 Mar 2020 16:18:37 +0100 Subject: [PATCH 23/54] Add GitHub action steps to build AppImage --- .github/workflows/main.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7ea9fc84..b8845af80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: linux-os: - runs-on: ubuntu-latest + runs-on: ubuntu-16.04 steps: - name: Update APT run: sudo apt-get update @@ -20,6 +20,26 @@ jobs: run: mkdir build && cd build && ../configure - name: Build run: cd build && make -j2 + - name: Prepare appimagetool + run: | + cd build && + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool && + chmod +x appimagetool && + sudo apt install -y appstream + - name: Clone love-appimages + uses: actions/checkout@v2 + with: + path: build/love-appimages + repository: pfirsich/love-appimages + - name: Build AppImage + run: | + cd build && + python3 love-appimages/build.py .. AppDir --builddir build --appimage love.AppImage + - name: Artifact + uses: actions/upload-artifact@v2-preview + with: + name: love.AppImage + path: build/love.AppImage windows-os: runs-on: windows-latest strategy: From 8fac08809afb7013323fa80735b1c616cd43e554 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 15 Mar 2020 19:24:49 -0300 Subject: [PATCH 24/54] Eliminate redundant glActiveTexture calls when shaders are used. The redundant calls were introduced with the previous commit. --- src/modules/graphics/opengl/OpenGL.cpp | 8 ++++---- src/modules/graphics/opengl/OpenGL.h | 5 +++-- src/modules/graphics/opengl/Shader.cpp | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 83d2fe911..fa0525ecc 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -977,7 +977,7 @@ void OpenGL::setTextureUnit(int textureunit) state.curTextureUnit = textureunit; } -void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureunit, bool restoreprev) +void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureunit, bool restoreprev, bool bindforedit) { if (texture != state.boundTextures[target][textureunit]) { @@ -993,14 +993,14 @@ void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureun else state.curTextureUnit = textureunit; } - else if (!restoreprev && textureunit != state.curTextureUnit) + else if (bindforedit && !restoreprev && textureunit != state.curTextureUnit) { glActiveTexture(GL_TEXTURE0 + textureunit); state.curTextureUnit = textureunit; } } -void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev) +void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev, bool bindforedit) { TextureType textype = TEXTURE_2D; GLuint handle = 0; @@ -1022,7 +1022,7 @@ void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restorepr handle = getDefaultTexture(textype); } - bindTextureToUnit(textype, handle, textureunit, restoreprev); + bindTextureToUnit(textype, handle, textureunit, restoreprev, bindforedit); } void OpenGL::deleteTexture(GLuint texture) diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index b51cf35fe..e926459de 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -324,9 +324,10 @@ public: * * @param textureunit Index in the range of [0, maxtextureunits-1] * @param restoreprev Restore previously bound texture unit when done. + * @param bindforedit If false, the active texture unit may be left alone. **/ - void bindTextureToUnit(TextureType target, GLuint texture, int textureunit, bool restoreprev); - void bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev); + void bindTextureToUnit(TextureType target, GLuint texture, int textureunit, bool restoreprev, bool bindforedit = true); + void bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev, bool bindforedit = true); /** * Helper for deleting an OpenGL texture. diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index c528a8bb7..92c5358b6 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -451,7 +451,7 @@ void Shader::attach() { const TextureUnit &unit = textureUnits[i]; if (unit.active) - gl.bindTextureToUnit(unit.type, unit.texture, i, false); + gl.bindTextureToUnit(unit.type, unit.texture, i, false, false); } // send any pending uniforms to the shader program. @@ -647,7 +647,7 @@ void Shader::sendTextures(const UniformInfo *info, Texture **textures, int count int texunit = info->ints[i]; if (shaderactive) - gl.bindTextureToUnit(info->textureType, gltex, texunit, false); + gl.bindTextureToUnit(info->textureType, gltex, texunit, false, false); // Store texture id so it can be re-bound to the texture unit later. textureUnits[texunit].texture = gltex; From b9dd24d3cede5aaa0f8df79c46a79d00739eb3b8 Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Wed, 20 May 2020 23:05:11 +0200 Subject: [PATCH 25/54] Make getTime() relative to first invocation --- src/modules/timer/Timer.cpp | 8 +++++++- src/modules/timer/Timer.h | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp index 66f1fcd6c..4f0745fe1 100644 --- a/src/modules/timer/Timer.cpp +++ b/src/modules/timer/Timer.cpp @@ -123,7 +123,7 @@ double Timer::getTimerPeriod() return 0; } -double Timer::getTime() +double Timer::getTimeAbsolute() { // The timer period (reciprocal of the frequency.) static const double timerPeriod = getTimerPeriod(); @@ -156,5 +156,11 @@ double Timer::getTime() #endif } +double Timer::getTime() +{ + static const double start = getTimeAbsolute(); + return getTimeAbsolute() - start; +} + } // timer } // love diff --git a/src/modules/timer/Timer.h b/src/modules/timer/Timer.h index 86eeae454..b7f24c0fb 100644 --- a/src/modules/timer/Timer.h +++ b/src/modules/timer/Timer.h @@ -72,9 +72,10 @@ public: double getAverageDelta() const; /** - * Gets the amount of time passed since an unspecified time. Useful for - * profiling code or measuring intervals. The time is microsecond-precise, - * and increases monotonically. + * Gets the amount of time in seconds passed since its first invocation + * (which happens as part of Timer::step at the start of love.run). + * Useful for profiling code or measuring intervals. + * The time is microsecond-precise, and increases monotonically. * @return The time (in seconds) **/ static double getTime(); @@ -102,6 +103,9 @@ private: // Returns the timer period on some platforms. static double getTimerPeriod(); + // Like getTime, but relative to an unspecified time. + static double getTimeAbsolute(); + }; // Timer } // timer From 8d627c88aeaf4a0c68dd9e06dd9feac716f13ffc Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Thu, 21 May 2020 15:56:43 +0200 Subject: [PATCH 26/54] Fix comment regarding first invocation of getTime --- src/modules/timer/Timer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/timer/Timer.h b/src/modules/timer/Timer.h index b7f24c0fb..6e1346749 100644 --- a/src/modules/timer/Timer.h +++ b/src/modules/timer/Timer.h @@ -73,7 +73,8 @@ public: /** * Gets the amount of time in seconds passed since its first invocation - * (which happens as part of Timer::step at the start of love.run). + * (which happens as part of the Timer constructor, + * which is called when the module is first opened). * Useful for profiling code or measuring intervals. * The time is microsecond-precise, and increases monotonically. * @return The time (in seconds) From 0a5db1ba6d4d5b7ba5b5eb6e7214ea40c398a6f5 Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Thu, 21 May 2020 15:56:57 +0200 Subject: [PATCH 27/54] Subtract start time before double conversion To preserve precision the subtraction of the start time happens with integer values now and the platform specific implementations have been split completely. --- src/modules/timer/Timer.cpp | 107 ++++++++++++++++++++++-------------- src/modules/timer/Timer.h | 6 -- 2 files changed, 66 insertions(+), 47 deletions(-) diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp index 4f0745fe1..6b72be211 100644 --- a/src/modules/timer/Timer.cpp +++ b/src/modules/timer/Timer.cpp @@ -35,15 +35,6 @@ #include #endif -#if defined(LOVE_LINUX) -static inline double getTimeOfDay() -{ - timeval t; - gettimeofday(&t, NULL); - return (double) t.tv_sec + (double) t.tv_usec / 1000000.0; -} -#endif - namespace love { namespace timer @@ -109,58 +100,92 @@ double Timer::getAverageDelta() const return averageDelta; } -double Timer::getTimerPeriod() +#if defined(LOVE_LINUX) + +static inline timespec getTimeOfDay() { -#if defined(LOVE_MACOSX) || defined(LOVE_IOS) - mach_timebase_info_data_t info; - mach_timebase_info(&info); - return (double) info.numer / (double) info.denom / 1000000000.0; -#elif defined(LOVE_WINDOWS) - LARGE_INTEGER temp; - if (QueryPerformanceFrequency(&temp) != 0 && temp.QuadPart != 0) - return 1.0 / (double) temp.QuadPart; -#endif - return 0; + timeval t; + gettimeofday(&t, NULL); + return timespec { t.tv_sec, t.tv_usec * 1000 }; } -double Timer::getTimeAbsolute() +static timespec getTimeAbsolute() { - // The timer period (reciprocal of the frequency.) - static const double timerPeriod = getTimerPeriod(); - -#if defined(LOVE_LINUX) - (void) timerPeriod; // Unused on linux - - double mt; // Check for POSIX timers and monotonic clocks. If not supported, use the gettimeofday fallback. #if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) \ && (defined(CLOCK_MONOTONIC_RAW) || defined(CLOCK_MONOTONIC)) - timespec t; + #ifdef CLOCK_MONOTONIC_RAW clockid_t clk_id = CLOCK_MONOTONIC_RAW; #else clockid_t clk_id = CLOCK_MONOTONIC; #endif + + timespec t; if (clock_gettime(clk_id, &t) == 0) - mt = (double) t.tv_sec + (double) t.tv_nsec / 1000000000.0; + return t; else + return getTimeOfDay(); #endif - mt = getTimeOfDay(); - return mt; -#elif defined(LOVE_MACOSX) || defined(LOVE_IOS) - return (double) mach_absolute_time() * timerPeriod; -#elif defined(LOVE_WINDOWS) - LARGE_INTEGER microTime; - QueryPerformanceCounter(µTime); - return (double) microTime.QuadPart * timerPeriod; -#endif + return getTimeOfDay(); } double Timer::getTime() { - static const double start = getTimeAbsolute(); - return getTimeAbsolute() - start; + static const timespec start = getTimeAbsolute(); + const timespec now = getTimeAbsolute(); + const timespec rel = timespec { + now.tv_sec - start.tv_sec, + now.tv_nsec - start.tv_nsec + }; + return (double) rel.tv_sec + (double) rel.tv_nsec / 1.0e9; } +#elif defined(LOVE_MACOSX) || defined(LOVE_IOS) + +static mach_timebase_info_data_t getTimebaseInfo() +{ + mach_timebase_info_data_t info; + mach_timebase_info(&info); + return info; +} + +double Timer::getTime() +{ + static const mach_timebase_info_data_t info = getTimebaseInfo(); + static const uint64_t start = mach_absolute_time(); + const uint64_t rel = mach_absolute_time() - start; + return ((double) rel * 1.0e-9) * (double) info.number / (double) info.denom; +} + +#elif defined(LOVE_WINDOWS) + +static LARGE_INTEGER getTimeAbsolute() +{ + LARGE_INTEGER t; + QueryPerformanceCounter(&t); + return t; +} + +static LARGE_INTEGER getFrequency() +{ + LARGE_INTEGER freq; + // "On systems that run Windows XP or later, the function will always succeed and will thus never return zero." + QueryPerformanceFrequency(&freq); + return freq; +} + +double Timer::getTime() +{ + static const LARGE_INTEGER freq = getFrequency(); + static const LARGE_INTEGER start = getTimeAbsolute(); + const LARGE_INTEGER now = getTimeAbsolute(); + LARGE_INTEGER rel; + rel.QuadPart = now.QuadPart - start.QuadPart; + return rel.QuadPart / freq.QuadPart; +} + +#endif + } // timer } // love diff --git a/src/modules/timer/Timer.h b/src/modules/timer/Timer.h index 6e1346749..cfd9ab180 100644 --- a/src/modules/timer/Timer.h +++ b/src/modules/timer/Timer.h @@ -101,12 +101,6 @@ private: // The current timestep. double dt; - // Returns the timer period on some platforms. - static double getTimerPeriod(); - - // Like getTime, but relative to an unspecified time. - static double getTimeAbsolute(); - }; // Timer } // timer From ba37b262c00cb3e08179227ff21575dde88fdb13 Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Thu, 21 May 2020 16:02:12 +0200 Subject: [PATCH 28/54] Fix getTime for Windows --- src/modules/timer/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp index 6b72be211..6b4a215d7 100644 --- a/src/modules/timer/Timer.cpp +++ b/src/modules/timer/Timer.cpp @@ -182,7 +182,7 @@ double Timer::getTime() const LARGE_INTEGER now = getTimeAbsolute(); LARGE_INTEGER rel; rel.QuadPart = now.QuadPart - start.QuadPart; - return rel.QuadPart / freq.QuadPart; + return (double) rel.QuadPart / (double) freq.QuadPart; } #endif From 1c5b8431ca90ff32ce85a321ec53d88b8fe49511 Mon Sep 17 00:00:00 2001 From: Joel Schumacher Date: Fri, 22 May 2020 00:33:47 +0200 Subject: [PATCH 29/54] Remove usage of invalid timespec Also add a comment to clarify why the subtraction of timespec values should work. --- src/modules/timer/Timer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp index 6b4a215d7..c3c020f38 100644 --- a/src/modules/timer/Timer.cpp +++ b/src/modules/timer/Timer.cpp @@ -24,6 +24,7 @@ #include "common/delay.h" #include "Timer.h" +#include #if defined(LOVE_WINDOWS) #include #elif defined(LOVE_MACOSX) || defined(LOVE_IOS) @@ -134,11 +135,10 @@ double Timer::getTime() { static const timespec start = getTimeAbsolute(); const timespec now = getTimeAbsolute(); - const timespec rel = timespec { - now.tv_sec - start.tv_sec, - now.tv_nsec - start.tv_nsec - }; - return (double) rel.tv_sec + (double) rel.tv_nsec / 1.0e9; + // tv_sec and tv_nsec should be signed on POSIX, so we are fine in just subtracting here. + const long sec = now.tv_sec - start.tv_sec; + const long nsec = now.tv_nsec - start.tv_nsec; + return (double) sec + (double) nsec / 1.0e9; } #elif defined(LOVE_MACOSX) || defined(LOVE_IOS) From 44033cd1431d7139c1fad9d542d9f1d7a516bb72 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 21 May 2020 20:08:43 -0300 Subject: [PATCH 30/54] Fix a compile error on macOS/iOS --- src/modules/timer/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp index c3c020f38..db0df8241 100644 --- a/src/modules/timer/Timer.cpp +++ b/src/modules/timer/Timer.cpp @@ -155,7 +155,7 @@ double Timer::getTime() static const mach_timebase_info_data_t info = getTimebaseInfo(); static const uint64_t start = mach_absolute_time(); const uint64_t rel = mach_absolute_time() - start; - return ((double) rel * 1.0e-9) * (double) info.number / (double) info.denom; + return ((double) rel * 1.0e-9) * (double) info.numer / (double) info.denom; } #elif defined(LOVE_WINDOWS) From 0fae32706dfde9ae3fb162574ac7fee1578a6f5b Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 23 May 2020 15:19:28 -0300 Subject: [PATCH 31/54] Fix a crash on Windows. Resolves #1570. --- src/modules/graphics/vertex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 8d4e75dcc..098f20e59 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -223,9 +223,9 @@ struct BufferBindings struct AttributeInfo { + DataType type; + uint8 components; uint8 bufferIndex; - DataType type : 4; - uint8 components : 4; uint16 offsetFromVertex; }; From ee43401c81dc5a64ee3da0daf723962a16b0c9fe Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Mon, 8 Jun 2020 11:38:45 +0100 Subject: [PATCH 32/54] Fix "github" typo in readme --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b96e7167f..0bc7671af 100644 --- a/readme.md +++ b/readme.md @@ -59,7 +59,7 @@ For code contributions, pull requests and patches are welcome. Be sure to read t Builds ------ -Releases are found in the [releases][releases] section on github, and are linked on [the site][site], +Releases are found in the [releases][releases] section on GitHub, and are linked on [the site][site], and there's a ppa for ubuntu, [ppa:bartbes/love-stable][stableppa]. There are also unstable/nightly builds: From b092347823bdba79ee5dbed5704c43ddc46cbb2d Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Wed, 10 Jun 2020 12:22:16 +0800 Subject: [PATCH 33/54] Enable JIT in Android --- src/modules/love/love.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/love/love.cpp b/src/modules/love/love.cpp index 415a87be0..475f557da 100644 --- a/src/modules/love/love.cpp +++ b/src/modules/love/love.cpp @@ -36,10 +36,6 @@ #ifdef LOVE_ANDROID #include -extern "C" -{ -#include "luajit.h" -} #endif // LOVE_ANDROID #ifdef LOVE_LEGENDARY_CONSOLE_IO_HACK @@ -383,7 +379,6 @@ int luaopen_love(lua_State *L) lua_setfield(L, -2, "_version_codename"); #ifdef LOVE_ANDROID - luaJIT_setmode(L, 0, LUAJIT_MODE_ENGINE | LUAJIT_MODE_OFF); lua_register(L, "print", w_print_sdl_log); #endif From 5602d29812b8db21ecb76f4362d74afdbcb428ba Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Mon, 15 Jun 2020 13:18:36 +0800 Subject: [PATCH 34/54] Update lodepng to 20200306 --- src/libraries/lodepng/lodepng.cpp | 5540 +++++++++++++++-------------- src/libraries/lodepng/lodepng.h | 455 ++- 2 files changed, 3178 insertions(+), 2817 deletions(-) diff --git a/src/libraries/lodepng/lodepng.cpp b/src/libraries/lodepng/lodepng.cpp index 37b0562b7..ee8cf33d2 100644 --- a/src/libraries/lodepng/lodepng.cpp +++ b/src/libraries/lodepng/lodepng.cpp @@ -1,7 +1,7 @@ /* -LodePNG version 20170917 +LodePNG version 20200306 -Copyright (c) 2005-2017 Lode Vandevenne +Copyright (c) 2005-2020 Lode Vandevenne This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,16 +30,21 @@ Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for #include "lodepng.h" -#include -#include -#include +#ifdef LODEPNG_COMPILE_DISK +#include /* LONG_MAX */ +#include /* file handling */ +#endif /* LODEPNG_COMPILE_DISK */ + +#ifdef LODEPNG_COMPILE_ALLOCATORS +#include /* allocations */ +#endif /* LODEPNG_COMPILE_ALLOCATORS */ #if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ #pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ #pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ #endif /*_MSC_VER */ -const char* LODEPNG_VERSION_STRING = "20170917"; +const char* LODEPNG_VERSION_STRING = "20200306"; /* This source file is built up in the following large parts. The code sections @@ -50,6 +55,12 @@ with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way -The C++ wrapper around all of the above */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* // Tools for C, and common code for PNG and Zlib. // */ +/* ////////////////////////////////////////////////////////////////////////// */ +/* ////////////////////////////////////////////////////////////////////////// */ + /*The malloc, realloc and free functions defined here with "lodepng_" in front of the name, so that you can easily change them to others related to your platform if needed. Everything else in the code calls these. Pass @@ -60,41 +71,113 @@ lodepng source code. Don't forget to remove "static" if you copypaste them from here.*/ #ifdef LODEPNG_COMPILE_ALLOCATORS -static void* lodepng_malloc(size_t size) -{ +static void* lodepng_malloc(size_t size) { +#ifdef LODEPNG_MAX_ALLOC + if(size > LODEPNG_MAX_ALLOC) return 0; +#endif return malloc(size); } -static void* lodepng_realloc(void* ptr, size_t new_size) -{ +/* NOTE: when realloc returns NULL, it leaves the original memory untouched */ +static void* lodepng_realloc(void* ptr, size_t new_size) { +#ifdef LODEPNG_MAX_ALLOC + if(new_size > LODEPNG_MAX_ALLOC) return 0; +#endif return realloc(ptr, new_size); } -static void lodepng_free(void* ptr) -{ +static void lodepng_free(void* ptr) { free(ptr); } #else /*LODEPNG_COMPILE_ALLOCATORS*/ +/* TODO: support giving additional void* payload to the custom allocators */ void* lodepng_malloc(size_t size); void* lodepng_realloc(void* ptr, size_t new_size); void lodepng_free(void* ptr); #endif /*LODEPNG_COMPILE_ALLOCATORS*/ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // Tools for C, and common code for PNG and Zlib. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ +/* convince the compiler to inline a function, for use when this measurably improves performance */ +/* inline is not available in C90, but use it when supported by the compiler */ +#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined(__cplusplus) && (__cplusplus >= 199711L)) +#define LODEPNG_INLINE inline +#else +#define LODEPNG_INLINE /* not available */ +#endif + +/* restrict is not available in C90, but use it when supported by the compiler */ +#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) ||\ + (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ + (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) +#define LODEPNG_RESTRICT __restrict +#else +#define LODEPNG_RESTRICT /* not available */ +#endif + +/* Replacements for C library functions such as memcpy and strlen, to support platforms +where a full C library is not available. The compiler can recognize them and compile +to something as fast. */ + +static void lodepng_memcpy(void* LODEPNG_RESTRICT dst, + const void* LODEPNG_RESTRICT src, size_t size) { + size_t i; + for(i = 0; i < size; i++) ((char*)dst)[i] = ((const char*)src)[i]; +} + +static void lodepng_memset(void* LODEPNG_RESTRICT dst, + int value, size_t num) { + size_t i; + for(i = 0; i < num; i++) ((char*)dst)[i] = (char)value; +} + +/* does not check memory out of bounds, do not use on untrusted data */ +static size_t lodepng_strlen(const char* a) { + const char* orig = a; + /* avoid warning about unused function in case of disabled COMPILE... macros */ + (void)(&lodepng_strlen); + while(*a) a++; + return (size_t)(a - orig); +} + +#define LODEPNG_MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define LODEPNG_MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define LODEPNG_ABS(x) ((x) < 0 ? -(x) : (x)) + +#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER) +/* Safely check if adding two integers will overflow (no undefined +behavior, compiler removing the code, etc...) and output result. */ +static int lodepng_addofl(size_t a, size_t b, size_t* result) { + *result = a + b; /* Unsigned addition is well defined and safe in C90 */ + return *result < a; +} +#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)*/ + +#ifdef LODEPNG_COMPILE_DECODER +/* Safely check if multiplying two integers will overflow (no undefined +behavior, compiler removing the code, etc...) and output result. */ +static int lodepng_mulofl(size_t a, size_t b, size_t* result) { + *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */ + return (a != 0 && *result / a != b); +} + +#ifdef LODEPNG_COMPILE_ZLIB +/* Safely check if a + b > c, even if overflow could happen. */ +static int lodepng_gtofl(size_t a, size_t b, size_t c) { + size_t d; + if(lodepng_addofl(a, b, &d)) return 1; + return d > c; +} +#endif /*LODEPNG_COMPILE_ZLIB*/ +#endif /*LODEPNG_COMPILE_DECODER*/ + /* Often in case of an error a value is assigned to a variable and then it breaks out of a loop (to go to the cleanup phase of a function). This macro does that. It makes the error handling code shorter and more readable. -Example: if(!uivector_resizev(&frequencies_ll, 286, 0)) ERROR_BREAK(83); +Example: if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83); */ -#define CERROR_BREAK(errorvar, code)\ -{\ +#define CERROR_BREAK(errorvar, code){\ errorvar = code;\ break;\ } @@ -103,22 +186,19 @@ Example: if(!uivector_resizev(&frequencies_ll, 286, 0)) ERROR_BREAK(83); #define ERROR_BREAK(code) CERROR_BREAK(error, code) /*Set error var to the error code, and return it.*/ -#define CERROR_RETURN_ERROR(errorvar, code)\ -{\ +#define CERROR_RETURN_ERROR(errorvar, code){\ errorvar = code;\ return code;\ } /*Try the code, if it returns error, also return the error.*/ -#define CERROR_TRY_RETURN(call)\ -{\ +#define CERROR_TRY_RETURN(call){\ unsigned error = call;\ if(error) return error;\ } /*Set error var to the error code, and return from the void function.*/ -#define CERROR_RETURN(errorvar, code)\ -{\ +#define CERROR_RETURN(errorvar, code){\ errorvar = code;\ return;\ } @@ -133,65 +213,43 @@ About uivector, ucvector and string: */ #ifdef LODEPNG_COMPILE_ZLIB +#ifdef LODEPNG_COMPILE_ENCODER /*dynamic vector of unsigned ints*/ -typedef struct uivector -{ +typedef struct uivector { unsigned* data; size_t size; /*size in number of unsigned longs*/ size_t allocsize; /*allocated size in bytes*/ } uivector; -static void uivector_cleanup(void* p) -{ +static void uivector_cleanup(void* p) { ((uivector*)p)->size = ((uivector*)p)->allocsize = 0; lodepng_free(((uivector*)p)->data); ((uivector*)p)->data = NULL; } /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_reserve(uivector* p, size_t allocsize) -{ - if(allocsize > p->allocsize) - { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); +static unsigned uivector_resize(uivector* p, size_t size) { + size_t allocsize = size * sizeof(unsigned); + if(allocsize > p->allocsize) { + size_t newsize = allocsize + (p->allocsize >> 1u); void* data = lodepng_realloc(p->data, newsize); - if(data) - { + if(data) { p->allocsize = newsize; p->data = (unsigned*)data; } else return 0; /*error: not enough memory*/ } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_resize(uivector* p, size_t size) -{ - if(!uivector_reserve(p, size * sizeof(unsigned))) return 0; p->size = size; return 1; /*success*/ } -/*resize and give all new elements the value*/ -static unsigned uivector_resizev(uivector* p, size_t size, unsigned value) -{ - size_t oldsize = p->size, i; - if(!uivector_resize(p, size)) return 0; - for(i = oldsize; i < size; ++i) p->data[i] = value; - return 1; -} - -static void uivector_init(uivector* p) -{ +static void uivector_init(uivector* p) { p->data = NULL; p->size = p->allocsize = 0; } -#ifdef LODEPNG_COMPILE_ENCODER /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_push_back(uivector* p, unsigned c) -{ +static unsigned uivector_push_back(uivector* p, unsigned c) { if(!uivector_resize(p, p->size + 1)) return 0; p->data[p->size - 1] = c; return 1; @@ -202,130 +260,73 @@ static unsigned uivector_push_back(uivector* p, unsigned c) /* /////////////////////////////////////////////////////////////////////////// */ /*dynamic vector of unsigned chars*/ -typedef struct ucvector -{ +typedef struct ucvector { unsigned char* data; size_t size; /*used size*/ size_t allocsize; /*allocated size*/ } ucvector; /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_reserve(ucvector* p, size_t allocsize) -{ - if(allocsize > p->allocsize) - { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); +static unsigned ucvector_resize(ucvector* p, size_t size) { + if(size > p->allocsize) { + size_t newsize = size + (p->allocsize >> 1u); void* data = lodepng_realloc(p->data, newsize); - if(data) - { + if(data) { p->allocsize = newsize; p->data = (unsigned char*)data; } else return 0; /*error: not enough memory*/ } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_resize(ucvector* p, size_t size) -{ - if(!ucvector_reserve(p, size * sizeof(unsigned char))) return 0; p->size = size; return 1; /*success*/ } -#ifdef LODEPNG_COMPILE_PNG - -static void ucvector_cleanup(void* p) -{ - ((ucvector*)p)->size = ((ucvector*)p)->allocsize = 0; - lodepng_free(((ucvector*)p)->data); - ((ucvector*)p)->data = NULL; +static ucvector ucvector_init(unsigned char* buffer, size_t size) { + ucvector v; + v.data = buffer; + v.allocsize = v.size = size; + return v; } -static void ucvector_init(ucvector* p) -{ - p->data = NULL; - p->size = p->allocsize = 0; -} -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/*you can both convert from vector to buffer&size and vica versa. If you use -init_buffer to take over a buffer and size, it is not needed to use cleanup*/ -static void ucvector_init_buffer(ucvector* p, unsigned char* buffer, size_t size) -{ - p->data = buffer; - p->allocsize = p->size = size; -} -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#if (defined(LODEPNG_COMPILE_PNG) && defined(LODEPNG_COMPILE_ANCILLARY_CHUNKS)) || defined(LODEPNG_COMPILE_ENCODER) -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_push_back(ucvector* p, unsigned char c) -{ - if(!ucvector_resize(p, p->size + 1)) return 0; - p->data[p->size - 1] = c; - return 1; -} -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ - - /* ////////////////////////////////////////////////////////////////////////// */ #ifdef LODEPNG_COMPILE_PNG #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned string_resize(char** out, size_t size) -{ - char* data = (char*)lodepng_realloc(*out, size + 1); - if(data) - { - data[size] = 0; /*null termination char*/ - *out = data; - } - return data != 0; -} -/*init a {char*, size_t} pair for use as string*/ -static void string_init(char** out) -{ - *out = NULL; - string_resize(out, 0); -} - -/*free the above pair again*/ -static void string_cleanup(char** out) -{ +/*free string pointer and set it to NULL*/ +static void string_cleanup(char** out) { lodepng_free(*out); *out = NULL; } -static void string_set(char** out, const char* in) -{ - size_t insize = strlen(in), i; - if(string_resize(out, insize)) - { - for(i = 0; i != insize; ++i) - { - (*out)[i] = in[i]; - } +static char* alloc_string_sized(const char* in, size_t insize) { + char* out = (char*)lodepng_malloc(insize + 1); + if(out) { + lodepng_memcpy(out, in, insize); + out[insize] = 0; } + return out; +} + +/* dynamically allocates a new string with a copy of the null terminated input text */ +static char* alloc_string(const char* in) { + return alloc_string_sized(in, lodepng_strlen(in)); } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ #endif /*LODEPNG_COMPILE_PNG*/ /* ////////////////////////////////////////////////////////////////////////// */ -unsigned lodepng_read32bitInt(const unsigned char* buffer) -{ - return (unsigned)((buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]); +#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG) +static unsigned lodepng_read32bitInt(const unsigned char* buffer) { + return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) | + ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]); } +#endif /*defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)*/ #if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER) /*buffer must have at least 4 allocated bytes available*/ -static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) -{ +static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) { buffer[0] = (unsigned char)((value >> 24) & 0xff); buffer[1] = (unsigned char)((value >> 16) & 0xff); buffer[2] = (unsigned char)((value >> 8) & 0xff); @@ -333,14 +334,6 @@ static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) } #endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ -#ifdef LODEPNG_COMPILE_ENCODER -static void lodepng_add32bitInt(ucvector* buffer, unsigned value) -{ - ucvector_resize(buffer, buffer->size + 4); /*todo: give error if resize failed*/ - lodepng_set32bitInt(&buffer->data[buffer->size - 4], value); -} -#endif /*LODEPNG_COMPILE_ENCODER*/ - /* ////////////////////////////////////////////////////////////////////////// */ /* / File IO / */ /* ////////////////////////////////////////////////////////////////////////// */ @@ -348,15 +341,13 @@ static void lodepng_add32bitInt(ucvector* buffer, unsigned value) #ifdef LODEPNG_COMPILE_DISK /* returns negative value on error. This should be pure C compatible, so no fstat. */ -static long lodepng_filesize(const char* filename) -{ +static long lodepng_filesize(const char* filename) { FILE* file; long size; file = fopen(filename, "rb"); if(!file) return -1; - if(fseek(file, 0, SEEK_END) != 0) - { + if(fseek(file, 0, SEEK_END) != 0) { fclose(file); return -1; } @@ -370,8 +361,7 @@ static long lodepng_filesize(const char* filename) } /* load file into buffer that already has the correct allocated size. Returns error code.*/ -static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) -{ +static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) { FILE* file; size_t readsize; file = fopen(filename, "rb"); @@ -380,14 +370,13 @@ static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* readsize = fread(out, 1, size, file); fclose(file); - if (readsize != size) return 78; + if(readsize != size) return 78; return 0; } -unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) -{ +unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) { long size = lodepng_filesize(filename); - if (size < 0) return 78; + if(size < 0) return 78; *outsize = (size_t)size; *out = (unsigned char*)lodepng_malloc((size_t)size); @@ -397,12 +386,11 @@ unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* fil } /*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) -{ +unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) { FILE* file; file = fopen(filename, "wb" ); if(!file) return 79; - fwrite((char*)buffer , 1 , buffersize, file); + fwrite(buffer, 1, buffersize, file); fclose(file); return 0; } @@ -417,52 +405,211 @@ unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const #ifdef LODEPNG_COMPILE_ZLIB #ifdef LODEPNG_COMPILE_ENCODER + +typedef struct { + ucvector* data; + unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/ +} LodePNGBitWriter; + +static void LodePNGBitWriter_init(LodePNGBitWriter* writer, ucvector* data) { + writer->data = data; + writer->bp = 0; +} + /*TODO: this ignores potential out of memory errors*/ -#define addBitToStream(/*size_t**/ bitpointer, /*ucvector**/ bitstream, /*unsigned char*/ bit)\ -{\ - /*add a new byte at the end*/\ - if(((*bitpointer) & 7) == 0) ucvector_push_back(bitstream, (unsigned char)0);\ - /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/\ - (bitstream->data[bitstream->size - 1]) |= (bit << ((*bitpointer) & 0x7));\ - ++(*bitpointer);\ +#define WRITEBIT(writer, bit){\ + /* append new byte */\ + if(((writer->bp) & 7u) == 0) {\ + if(!ucvector_resize(writer->data, writer->data->size + 1)) return;\ + writer->data->data[writer->data->size - 1] = 0;\ + }\ + (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u));\ + ++writer->bp;\ } -static void addBitsToStream(size_t* bitpointer, ucvector* bitstream, unsigned value, size_t nbits) -{ - size_t i; - for(i = 0; i != nbits; ++i) addBitToStream(bitpointer, bitstream, (unsigned char)((value >> i) & 1)); +/* LSB of value is written first, and LSB of bytes is used first */ +static void writeBits(LodePNGBitWriter* writer, unsigned value, size_t nbits) { + if(nbits == 1) { /* compiler should statically compile this case if nbits == 1 */ + WRITEBIT(writer, value); + } else { + /* TODO: increase output size only once here rather than in each WRITEBIT */ + size_t i; + for(i = 0; i != nbits; ++i) { + WRITEBIT(writer, (unsigned char)((value >> i) & 1)); + } + } } -static void addBitsToStreamReversed(size_t* bitpointer, ucvector* bitstream, unsigned value, size_t nbits) -{ +/* This one is to use for adding huffman symbol, the value bits are written MSB first */ +static void writeBitsReversed(LodePNGBitWriter* writer, unsigned value, size_t nbits) { size_t i; - for(i = 0; i != nbits; ++i) addBitToStream(bitpointer, bitstream, (unsigned char)((value >> (nbits - 1 - i)) & 1)); + for(i = 0; i != nbits; ++i) { + /* TODO: increase output size only once here rather than in each WRITEBIT */ + WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u)); + } } #endif /*LODEPNG_COMPILE_ENCODER*/ #ifdef LODEPNG_COMPILE_DECODER -#define READBIT(bitpointer, bitstream) ((bitstream[bitpointer >> 3] >> (bitpointer & 0x7)) & (unsigned char)1) +typedef struct { + const unsigned char* data; + size_t size; /*size of data in bytes*/ + size_t bitsize; /*size of data in bits, end of valid bp values, should be 8*size*/ + size_t bp; + unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at least 32 bits*/ +} LodePNGBitReader; -static unsigned char readBitFromStream(size_t* bitpointer, const unsigned char* bitstream) -{ - unsigned char result = (unsigned char)(READBIT(*bitpointer, bitstream)); - ++(*bitpointer); +/* data size argument is in bytes. Returns error if size too large causing overflow */ +static unsigned LodePNGBitReader_init(LodePNGBitReader* reader, const unsigned char* data, size_t size) { + size_t temp; + reader->data = data; + reader->size = size; + /* size in bits, return error if overflow (if size_t is 32 bit this supports up to 500MB) */ + if(lodepng_mulofl(size, 8u, &reader->bitsize)) return 105; + /*ensure incremented bp can be compared to bitsize without overflow even when it would be incremented 32 too much and + trying to ensure 32 more bits*/ + if(lodepng_addofl(reader->bitsize, 64u, &temp)) return 105; + reader->bp = 0; + reader->buffer = 0; + return 0; /*ok*/ +} + +/* +ensureBits functions: +Ensures the reader can at least read nbits bits in one or more readBits calls, +safely even if not enough bits are available. +Returns 1 if there are enough bits available, 0 if not. +*/ + +/*See ensureBits documentation above. This one ensures exactly 1 bit */ +/*static unsigned ensureBits1(LodePNGBitReader* reader) { + if(reader->bp >= reader->bitsize) return 0; + reader->buffer = (unsigned)reader->data[reader->bp >> 3u] >> (reader->bp & 7u); + return 1; +}*/ + +/*See ensureBits documentation above. This one ensures up to 9 bits */ +static unsigned ensureBits9(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 1u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 17 bits */ +static unsigned ensureBits17(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 2u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 25 bits */ +static LODEPNG_INLINE unsigned ensureBits25(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 3u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/*See ensureBits documentation above. This one ensures up to 32 bits */ +static LODEPNG_INLINE unsigned ensureBits32(LodePNGBitReader* reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if(start + 4u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u))); + return 1; + } else { + reader->buffer = 0; + if(start + 0u < size) reader->buffer |= reader->data[start + 0]; + if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + if(start + 3u < size) reader->buffer |= ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + return reader->bp + nbits <= reader->bitsize; + } +} + +/* Get bits without advancing the bit pointer. Must have enough bits available with ensureBits. Max nbits is 31. */ +static unsigned peekBits(LodePNGBitReader* reader, size_t nbits) { + /* The shift allows nbits to be only up to 31. */ + return reader->buffer & ((1u << nbits) - 1u); +} + +/* Must have enough bits available with ensureBits */ +static void advanceBits(LodePNGBitReader* reader, size_t nbits) { + reader->buffer >>= nbits; + reader->bp += nbits; +} + +/* Must have enough bits available with ensureBits */ +static unsigned readBits(LodePNGBitReader* reader, size_t nbits) { + unsigned result = peekBits(reader, nbits); + advanceBits(reader, nbits); return result; } -static unsigned readBitsFromStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) -{ - unsigned result = 0, i; - for(i = 0; i != nbits; ++i) - { - result += ((unsigned)READBIT(*bitpointer, bitstream)) << i; - ++(*bitpointer); +/* Public for testing only. steps and result must have numsteps values. */ +unsigned lode_png_test_bitreader(const unsigned char* data, size_t size, + size_t numsteps, const size_t* steps, unsigned* result) { + size_t i; + LodePNGBitReader reader; + unsigned error = LodePNGBitReader_init(&reader, data, size); + if(error) return 0; + for(i = 0; i < numsteps; i++) { + size_t step = steps[i]; + unsigned ok; + if(step > 25) ok = ensureBits32(&reader, step); + else if(step > 17) ok = ensureBits25(&reader, step); + else if(step > 9) ok = ensureBits17(&reader, step); + else ok = ensureBits9(&reader, step); + if(!ok) return 0; + result[i] = readBits(&reader, step); } - return result; + return 1; } #endif /*LODEPNG_COMPILE_DECODER*/ +static unsigned reverseBits(unsigned bits, unsigned num) { + /*TODO: implement faster lookup table based version when needed*/ + unsigned i, result = 0; + for(i = 0; i < num; i++) result |= ((bits >> (num - i - 1u)) & 1u) << i; + return result; +} + /* ////////////////////////////////////////////////////////////////////////// */ /* / Deflate - Huffman / */ /* ////////////////////////////////////////////////////////////////////////// */ @@ -496,8 +643,8 @@ static const unsigned DISTANCEEXTRA[30] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; -/*the order in which "code length alphabet code lengths" are stored, out of this -the huffman tree of the dynamic huffman tree lengths is generated*/ +/*the order in which "code length alphabet code lengths" are stored as specified by deflate, out of this the huffman +tree of the dynamic huffman tree lengths is generated*/ static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; @@ -506,98 +653,149 @@ static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] /* Huffman tree struct, containing multiple representations of the tree */ -typedef struct HuffmanTree -{ - unsigned* tree2d; - unsigned* tree1d; - unsigned* lengths; /*the lengths of the codes of the 1d-tree*/ +typedef struct HuffmanTree { + unsigned* codes; /*the huffman codes (bit patterns representing the symbols)*/ + unsigned* lengths; /*the lengths of the huffman codes*/ unsigned maxbitlen; /*maximum number of bits a single code can get*/ unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ + /* for reading only */ + unsigned char* table_len; /*length of symbol from lookup table, or max length if secondary lookup needed*/ + unsigned short* table_value; /*value of symbol from lookup table, or pointer to secondary table if needed*/ } HuffmanTree; -/*function used for debug purposes to draw the tree in ascii art with C++*/ -/* -static void HuffmanTree_draw(HuffmanTree* tree) -{ - std::cout << "tree. length: " << tree->numcodes << " maxbitlen: " << tree->maxbitlen << std::endl; - for(size_t i = 0; i != tree->tree1d.size; ++i) - { - if(tree->lengths.data[i]) - std::cout << i << " " << tree->tree1d.data[i] << " " << tree->lengths.data[i] << std::endl; - } - std::cout << std::endl; -}*/ - -static void HuffmanTree_init(HuffmanTree* tree) -{ - tree->tree2d = 0; - tree->tree1d = 0; +static void HuffmanTree_init(HuffmanTree* tree) { + tree->codes = 0; tree->lengths = 0; + tree->table_len = 0; + tree->table_value = 0; } -static void HuffmanTree_cleanup(HuffmanTree* tree) -{ - lodepng_free(tree->tree2d); - lodepng_free(tree->tree1d); +static void HuffmanTree_cleanup(HuffmanTree* tree) { + lodepng_free(tree->codes); lodepng_free(tree->lengths); + lodepng_free(tree->table_len); + lodepng_free(tree->table_value); } -/*the tree representation used by the decoder. return value is error*/ -static unsigned HuffmanTree_make2DTree(HuffmanTree* tree) -{ - unsigned nodefilled = 0; /*up to which node it is filled*/ - unsigned treepos = 0; /*position in the tree (1 of the numcodes columns)*/ - unsigned n, i; +/* amount of bits for first huffman table lookup (aka root bits), see HuffmanTree_makeTable and huffmanDecodeSymbol.*/ +/* values 8u and 9u work the fastest */ +#define FIRSTBITS 9u - tree->tree2d = (unsigned*)lodepng_malloc(tree->numcodes * 2 * sizeof(unsigned)); - if(!tree->tree2d) return 83; /*alloc fail*/ +/* a symbol value too big to represent any valid symbol, to indicate reading disallowed huffman bits combination, +which is possible in case of only 0 or 1 present symbols. */ +#define INVALIDSYMBOL 65535u - /* - convert tree1d[] to tree2d[][]. In the 2D array, a value of 32767 means - uninited, a value >= numcodes is an address to another bit, a value < numcodes - is a code. The 2 rows are the 2 possible bit values (0 or 1), there are as - many columns as codes - 1. - A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. - Here, the internal nodes are stored (what their 0 and 1 option point to). - There is only memory for such good tree currently, if there are more nodes - (due to too long length codes), error 55 will happen - */ - for(n = 0; n < tree->numcodes * 2; ++n) - { - tree->tree2d[n] = 32767; /*32767 here means the tree2d isn't filled there yet*/ +/* make table for huffman decoding */ +static unsigned HuffmanTree_makeTable(HuffmanTree* tree) { + static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/ + static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u; + size_t i, numpresent, pointer, size; /*total table size*/ + unsigned* maxlens = (unsigned*)lodepng_malloc(headsize * sizeof(unsigned)); + if(!maxlens) return 83; /*alloc fail*/ + + /* compute maxlens: max total bit length of symbols sharing prefix in the first table*/ + lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens)); + for(i = 0; i < tree->numcodes; i++) { + unsigned symbol = tree->codes[i]; + unsigned l = tree->lengths[i]; + unsigned index; + if(l <= FIRSTBITS) continue; /*symbols that fit in first table don't increase secondary table size*/ + /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See later comment about the reversing*/ + index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS); + maxlens[index] = LODEPNG_MAX(maxlens[index], l); } + /* compute total table size: size of first table plus all secondary tables for symbols longer than FIRSTBITS */ + size = headsize; + for(i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS)); + } + tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len)); + tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value)); + if(!tree->table_len || !tree->table_value) { + lodepng_free(maxlens); + /* freeing tree->table values is done at a higher scope */ + return 83; /*alloc fail*/ + } + /*initialize with an invalid length to indicate unused entries*/ + for(i = 0; i < size; ++i) tree->table_len[i] = 16; - for(n = 0; n < tree->numcodes; ++n) /*the codes*/ - { - for(i = 0; i != tree->lengths[n]; ++i) /*the bits for this code*/ - { - unsigned char bit = (unsigned char)((tree->tree1d[n] >> (tree->lengths[n] - i - 1)) & 1); - /*oversubscribed, see comment in lodepng_error_text*/ - if(treepos > 2147483647 || treepos + 2 > tree->numcodes) return 55; - if(tree->tree2d[2 * treepos + bit] == 32767) /*not yet filled in*/ - { - if(i + 1 == tree->lengths[n]) /*last bit*/ - { - tree->tree2d[2 * treepos + bit] = n; /*put the current code in it*/ - treepos = 0; - } - else - { - /*put address of the next step in here, first that address has to be found of course - (it's just nodefilled + 1)...*/ - ++nodefilled; - /*addresses encoded with numcodes added to it*/ - tree->tree2d[2 * treepos + bit] = nodefilled + tree->numcodes; - treepos = nodefilled; - } + /*fill in the first table for long symbols: max prefix size and pointer to secondary tables*/ + pointer = headsize; + for(i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if(l <= FIRSTBITS) continue; + tree->table_len[i] = l; + tree->table_value[i] = pointer; + pointer += (1u << (l - FIRSTBITS)); + } + lodepng_free(maxlens); + + /*fill in the first table for short symbols, or secondary table for long symbols*/ + numpresent = 0; + for(i = 0; i < tree->numcodes; ++i) { + unsigned l = tree->lengths[i]; + unsigned symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/ + /*reverse bits, because the huffman bits are given in MSB first order but the bit reader reads LSB first*/ + unsigned reverse = reverseBits(symbol, l); + if(l == 0) continue; + numpresent++; + + if(l <= FIRSTBITS) { + /*short symbol, fully in first table, replicated num times if l < FIRSTBITS*/ + unsigned num = 1u << (FIRSTBITS - l); + unsigned j; + for(j = 0; j < num; ++j) { + /*bit reader will read the l bits of symbol first, the remaining FIRSTBITS - l bits go to the MSB's*/ + unsigned index = reverse | (j << l); + if(tree->table_len[index] != 16) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ + tree->table_len[index] = l; + tree->table_value[index] = i; + } + } else { + /*long symbol, shares prefix with other long symbols in first lookup table, needs second lookup*/ + /*the FIRSTBITS MSBs of the symbol are the first table index*/ + unsigned index = reverse & mask; + unsigned maxlen = tree->table_len[index]; + /*log2 of secondary table length, should be >= l - FIRSTBITS*/ + unsigned tablelen = maxlen - FIRSTBITS; + unsigned start = tree->table_value[index]; /*starting index in secondary table*/ + unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this symbol in secondary table*/ + unsigned j; + if(maxlen < l) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ + for(j = 0; j < num; ++j) { + unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */ + unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS))); + tree->table_len[index2] = l; + tree->table_value[index2] = i; } - else treepos = tree->tree2d[2 * treepos + bit] - tree->numcodes; } } - for(n = 0; n < tree->numcodes * 2; ++n) - { - if(tree->tree2d[n] == 32767) tree->tree2d[n] = 0; /*remove possible remaining 32767's*/ + if(numpresent < 2) { + /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 bits, + but deflate uses 1 bit instead. In case of 0 symbols, no symbols can + appear at all, but such huffman tree could still exist (e.g. if distance + codes are never used). In both cases, not all symbols of the table will be + filled in. Fill them in with an invalid symbol value so returning them from + huffmanDecodeSymbol will cause error. */ + for(i = 0; i < size; ++i) { + if(tree->table_len[i] == 16) { + /* As length, use a value smaller than FIRSTBITS for the head table, + and a value larger than FIRSTBITS for the secondary table, to ensure + valid behavior for advanceBits when reading this symbol. */ + tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1); + tree->table_value[i] = INVALIDSYMBOL; + } + } + } else { + /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. + If that is not the case (due to too long length codes), the table will not + have been fully used, and this is an error (not all bit combinations can be + decoded): an oversubscribed huffman tree, indicated by error 55. */ + for(i = 0; i < size; ++i) { + if(tree->table_len[i] == 16) return 55; + } } return 0; @@ -608,44 +806,40 @@ Second step for the ...makeFromLengths and ...makeFromFrequencies functions. numcodes, lengths and maxbitlen must already be filled in correctly. return value is error. */ -static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) -{ - uivector blcount; - uivector nextcode; +static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) { + unsigned* blcount; + unsigned* nextcode; unsigned error = 0; unsigned bits, n; - uivector_init(&blcount); - uivector_init(&nextcode); + tree->codes = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); + blcount = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + nextcode = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + if(!tree->codes || !blcount || !nextcode) error = 83; /*alloc fail*/ - tree->tree1d = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); - if(!tree->tree1d) error = 83; /*alloc fail*/ - - if(!uivector_resizev(&blcount, tree->maxbitlen + 1, 0) - || !uivector_resizev(&nextcode, tree->maxbitlen + 1, 0)) - error = 83; /*alloc fail*/ - - if(!error) - { + if(!error) { + for(n = 0; n != tree->maxbitlen + 1; n++) blcount[n] = nextcode[n] = 0; /*step 1: count number of instances of each code length*/ - for(bits = 0; bits != tree->numcodes; ++bits) ++blcount.data[tree->lengths[bits]]; + for(bits = 0; bits != tree->numcodes; ++bits) ++blcount[tree->lengths[bits]]; /*step 2: generate the nextcode values*/ - for(bits = 1; bits <= tree->maxbitlen; ++bits) - { - nextcode.data[bits] = (nextcode.data[bits - 1] + blcount.data[bits - 1]) << 1; + for(bits = 1; bits <= tree->maxbitlen; ++bits) { + nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u; } /*step 3: generate all the codes*/ - for(n = 0; n != tree->numcodes; ++n) - { - if(tree->lengths[n] != 0) tree->tree1d[n] = nextcode.data[tree->lengths[n]]++; + for(n = 0; n != tree->numcodes; ++n) { + if(tree->lengths[n] != 0) { + tree->codes[n] = nextcode[tree->lengths[n]]++; + /*remove superfluous bits from the code*/ + tree->codes[n] &= ((1u << tree->lengths[n]) - 1u); + } } } - uivector_cleanup(&blcount); - uivector_cleanup(&nextcode); + lodepng_free(blcount); + lodepng_free(nextcode); - if(!error) return HuffmanTree_make2DTree(tree); - else return error; + if(!error) error = HuffmanTree_makeTable(tree); + return error; } /* @@ -654,8 +848,7 @@ by Deflate. maxbitlen is the maximum bits that a code in the tree can have. return value is error. */ static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen, - size_t numcodes, unsigned maxbitlen) -{ + size_t numcodes, unsigned maxbitlen) { unsigned i; tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); if(!tree->lengths) return 83; /*alloc fail*/ @@ -671,8 +864,7 @@ static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* b Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ /*chain node for boundary package merge*/ -typedef struct BPMNode -{ +typedef struct BPMNode { int weight; /*the sum of all weights in this chain*/ unsigned index; /*index of this leaf node (called "count" in the paper)*/ struct BPMNode* tail; /*the next nodes in this chain (null if last)*/ @@ -680,8 +872,7 @@ typedef struct BPMNode } BPMNode; /*lists of chains*/ -typedef struct BPMLists -{ +typedef struct BPMLists { /*memory pool*/ unsigned memsize; BPMNode* memory; @@ -695,26 +886,22 @@ typedef struct BPMLists } BPMLists; /*creates a new chain node with the given parameters, from the memory in the lists */ -static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) -{ +static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) { unsigned i; BPMNode* result; /*memory full, so garbage collect*/ - if(lists->nextfree >= lists->numfree) - { + if(lists->nextfree >= lists->numfree) { /*mark only those that are in use*/ for(i = 0; i != lists->memsize; ++i) lists->memory[i].in_use = 0; - for(i = 0; i != lists->listsize; ++i) - { + for(i = 0; i != lists->listsize; ++i) { BPMNode* node; for(node = lists->chains0[i]; node != 0; node = node->tail) node->in_use = 1; for(node = lists->chains1[i]; node != 0; node = node->tail) node->in_use = 1; } /*collect those that are free*/ lists->numfree = 0; - for(i = 0; i != lists->memsize; ++i) - { + for(i = 0; i != lists->memsize; ++i) { if(!lists->memory[i].in_use) lists->freelist[lists->numfree++] = &lists->memory[i]; } lists->nextfree = 0; @@ -728,58 +915,48 @@ static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMN } /*sort the leaves with stable mergesort*/ -static void bpmnode_sort(BPMNode* leaves, size_t num) -{ +static void bpmnode_sort(BPMNode* leaves, size_t num) { BPMNode* mem = (BPMNode*)lodepng_malloc(sizeof(*leaves) * num); size_t width, counter = 0; - for(width = 1; width < num; width *= 2) - { + for(width = 1; width < num; width *= 2) { BPMNode* a = (counter & 1) ? mem : leaves; BPMNode* b = (counter & 1) ? leaves : mem; size_t p; - for(p = 0; p < num; p += 2 * width) - { + for(p = 0; p < num; p += 2 * width) { size_t q = (p + width > num) ? num : (p + width); size_t r = (p + 2 * width > num) ? num : (p + 2 * width); size_t i = p, j = q, k; - for(k = p; k < r; k++) - { + for(k = p; k < r; k++) { if(i < q && (j >= r || a[i].weight <= a[j].weight)) b[k] = a[i++]; else b[k] = a[j++]; } } counter++; } - if(counter & 1) memcpy(leaves, mem, sizeof(*leaves) * num); + if(counter & 1) lodepng_memcpy(leaves, mem, sizeof(*leaves) * num); lodepng_free(mem); } /*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/ -static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) -{ +static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) { unsigned lastindex = lists->chains1[c]->index; - if(c == 0) - { + if(c == 0) { if(lastindex >= numpresent) return; lists->chains0[c] = lists->chains1[c]; lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); - } - else - { + } else { /*sum of the weights of the head nodes of the previous lookahead chains.*/ int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; lists->chains0[c] = lists->chains1[c]; - if(lastindex < numpresent && sum > leaves[lastindex].weight) - { + if(lastindex < numpresent && sum > leaves[lastindex].weight) { lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); return; } lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); /*in the end we are only interested in the chain of the last list, so no need to recurse if we're at the last one (this gives measurable speedup)*/ - if(num + 1 < (int)(2 * numpresent - 2)) - { + if(num + 1 < (int)(2 * numpresent - 2)) { boundaryPM(lists, leaves, numpresent, c - 1, num); boundaryPM(lists, leaves, numpresent, c - 1, num); } @@ -787,47 +964,39 @@ static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int } unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, - size_t numcodes, unsigned maxbitlen) -{ + size_t numcodes, unsigned maxbitlen) { unsigned error = 0; unsigned i; size_t numpresent = 0; /*number of symbols with non-zero frequency*/ BPMNode* leaves; /*the symbols, only those with > 0 frequency*/ if(numcodes == 0) return 80; /*error: a tree of 0 symbols is not supposed to be made*/ - if((1u << maxbitlen) < numcodes) return 80; /*error: represent all symbols*/ + if((1u << maxbitlen) < (unsigned)numcodes) return 80; /*error: represent all symbols*/ leaves = (BPMNode*)lodepng_malloc(numcodes * sizeof(*leaves)); if(!leaves) return 83; /*alloc fail*/ - for(i = 0; i != numcodes; ++i) - { - if(frequencies[i] > 0) - { + for(i = 0; i != numcodes; ++i) { + if(frequencies[i] > 0) { leaves[numpresent].weight = (int)frequencies[i]; leaves[numpresent].index = i; ++numpresent; } } - for(i = 0; i != numcodes; ++i) lengths[i] = 0; + lodepng_memset(lengths, 0, numcodes * sizeof(*lengths)); /*ensure at least two present symbols. There should be at least one symbol according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To make these work as well ensure there are at least two symbols. The Package-Merge code below also doesn't work correctly if there's only one - symbol, it'd give it the theoritical 0 bits but in practice zlib wants 1 bit*/ - if(numpresent == 0) - { + symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 bit*/ + if(numpresent == 0) { lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/ - } - else if(numpresent == 1) - { + } else if(numpresent == 1) { lengths[leaves[0].index] = 1; lengths[leaves[0].index == 0 ? 1 : 0] = 1; - } - else - { + } else { BPMLists lists; BPMNode* node; @@ -843,15 +1012,13 @@ unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequen lists.chains1 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); if(!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) error = 83; /*alloc fail*/ - if(!error) - { + if(!error) { for(i = 0; i != lists.memsize; ++i) lists.freelist[i] = &lists.memory[i]; bpmnode_create(&lists, leaves[0].weight, 1, 0); bpmnode_create(&lists, leaves[1].weight, 2, 0); - for(i = 0; i != lists.listsize; ++i) - { + for(i = 0; i != lists.listsize; ++i) { lists.chains0[i] = &lists.memory[0]; lists.chains1[i] = &lists.memory[1]; } @@ -859,8 +1026,7 @@ unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequen /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/ for(i = 2; i != 2 * numpresent - 2; ++i) boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); - for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) - { + for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { for(i = 0; i != node->index; ++i) ++lengths[leaves[i].index]; } } @@ -877,36 +1043,22 @@ unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequen /*Create the Huffman tree given the symbol frequencies*/ static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree* tree, const unsigned* frequencies, - size_t mincodes, size_t numcodes, unsigned maxbitlen) -{ + size_t mincodes, size_t numcodes, unsigned maxbitlen) { unsigned error = 0; while(!frequencies[numcodes - 1] && numcodes > mincodes) --numcodes; /*trim zeroes*/ + tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); + if(!tree->lengths) return 83; /*alloc fail*/ tree->maxbitlen = maxbitlen; tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->lengths = (unsigned*)lodepng_realloc(tree->lengths, numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - /*initialize all lengths to 0*/ - memset(tree->lengths, 0, numcodes * sizeof(unsigned)); error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); if(!error) error = HuffmanTree_makeFromLengths2(tree); return error; } - -static unsigned HuffmanTree_getCode(const HuffmanTree* tree, unsigned index) -{ - return tree->tree1d[index]; -} - -static unsigned HuffmanTree_getLength(const HuffmanTree* tree, unsigned index) -{ - return tree->lengths[index]; -} #endif /*LODEPNG_COMPILE_ENCODER*/ /*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ -static unsigned generateFixedLitLenTree(HuffmanTree* tree) -{ +static unsigned generateFixedLitLenTree(HuffmanTree* tree) { unsigned i, error = 0; unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); if(!bitlen) return 83; /*alloc fail*/ @@ -924,8 +1076,7 @@ static unsigned generateFixedLitLenTree(HuffmanTree* tree) } /*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static unsigned generateFixedDistanceTree(HuffmanTree* tree) -{ +static unsigned generateFixedDistanceTree(HuffmanTree* tree) { unsigned i, error = 0; unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); if(!bitlen) return 83; /*alloc fail*/ @@ -941,26 +1092,21 @@ static unsigned generateFixedDistanceTree(HuffmanTree* tree) #ifdef LODEPNG_COMPILE_DECODER /* -returns the code, or (unsigned)(-1) if error happened -inbitlength is the length of the complete buffer, in bits (so its byte length times 8) +returns the code. The bit reader must already have been ensured at least 15 bits */ -static unsigned huffmanDecodeSymbol(const unsigned char* in, size_t* bp, - const HuffmanTree* codetree, size_t inbitlength) -{ - unsigned treepos = 0, ct; - for(;;) - { - if(*bp >= inbitlength) return (unsigned)(-1); /*error: end of input memory reached without endcode*/ - /* - decode the symbol from the tree. The "readBitFromStream" code is inlined in - the expression below because this is the biggest bottleneck while decoding - */ - ct = codetree->tree2d[(treepos << 1) + READBIT(*bp, in)]; - ++(*bp); - if(ct < codetree->numcodes) return ct; /*the symbol is decoded, return it*/ - else treepos = ct - codetree->numcodes; /*symbol not yet decoded, instead move tree position*/ - - if(treepos >= codetree->numcodes) return (unsigned)(-1); /*error: it appeared outside the codetree*/ +static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* codetree) { + unsigned short code = peekBits(reader, FIRSTBITS); + unsigned short l = codetree->table_len[code]; + unsigned short value = codetree->table_value[code]; + if(l <= FIRSTBITS) { + advanceBits(reader, l); + return value; + } else { + unsigned index2; + advanceBits(reader, FIRSTBITS); + index2 = value + peekBits(reader, l - FIRSTBITS); + advanceBits(reader, codetree->table_len[index2] - FIRSTBITS); + return codetree->table_value[index2]; } } #endif /*LODEPNG_COMPILE_DECODER*/ @@ -971,22 +1117,20 @@ static unsigned huffmanDecodeSymbol(const unsigned char* in, size_t* bp, /* / Inflator (Decompressor) / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*get the tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static void getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) -{ - /*TODO: check for out of memory errors*/ - generateFixedLitLenTree(tree_ll); - generateFixedDistanceTree(tree_d); +/*get the tree of a deflated block with fixed tree, as specified in the deflate specification +Returns error code.*/ +static unsigned getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) { + unsigned error = generateFixedLitLenTree(tree_ll); + if(error) return error; + return generateFixedDistanceTree(tree_d); } /*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, - const unsigned char* in, size_t* bp, size_t inlength) -{ + LodePNGBitReader* reader) { /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ unsigned error = 0; unsigned n, HLIT, HDIST, HCLEN, i; - size_t inbitlength = inlength * 8; /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ unsigned* bitlen_ll = 0; /*lit,len code lengths*/ @@ -995,30 +1139,31 @@ static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, unsigned* bitlen_cl = 0; HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ - if((*bp) + 14 > (inlength << 3)) return 49; /*error: the bit pointer is or will go past the memory*/ + if(!ensureBits17(reader, 14)) return 49; /*error: the bit pointer is or will go past the memory*/ /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ - HLIT = readBitsFromStream(bp, in, 5) + 257; + HLIT = readBits(reader, 5) + 257; /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ - HDIST = readBitsFromStream(bp, in, 5) + 1; + HDIST = readBits(reader, 5) + 1; /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ - HCLEN = readBitsFromStream(bp, in, 4) + 4; + HCLEN = readBits(reader, 4) + 4; - if((*bp) + HCLEN * 3 > (inlength << 3)) return 50; /*error: the bit pointer is or will go past the memory*/ + bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); + if(!bitlen_cl) return 83 /*alloc fail*/; HuffmanTree_init(&tree_cl); - while(!error) - { + while(!error) { /*read the code length codes out of 3 * (amount of code length codes) bits*/ - - bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); - if(!bitlen_cl) ERROR_BREAK(83 /*alloc fail*/); - - for(i = 0; i != NUM_CODE_LENGTH_CODES; ++i) - { - if(i < HCLEN) bitlen_cl[CLCL_ORDER[i]] = readBitsFromStream(bp, in, 3); - else bitlen_cl[CLCL_ORDER[i]] = 0; /*if not, it must stay 0*/ + if(lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) { + ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/ + } + for(i = 0; i != HCLEN; ++i) { + ensureBits9(reader, 3); /*out of bounds already checked above */ + bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3); + } + for(i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) { + bitlen_cl[CLCL_ORDER[i]] = 0; } error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); @@ -1028,83 +1173,69 @@ static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/); - for(i = 0; i != NUM_DEFLATE_CODE_SYMBOLS; ++i) bitlen_ll[i] = 0; - for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen_d[i] = 0; + lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll)); + lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d)); /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ i = 0; - while(i < HLIT + HDIST) - { - unsigned code = huffmanDecodeSymbol(in, bp, &tree_cl, inbitlength); - if(code <= 15) /*a length code*/ - { + while(i < HLIT + HDIST) { + unsigned code; + ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 extra bits below*/ + code = huffmanDecodeSymbol(reader, &tree_cl); + if(code <= 15) /*a length code*/ { if(i < HLIT) bitlen_ll[i] = code; else bitlen_d[i - HLIT] = code; ++i; - } - else if(code == 16) /*repeat previous*/ - { + } else if(code == 16) /*repeat previous*/ { unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ unsigned value; /*set value to the previous code*/ if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/ - if((*bp + 2) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 2); + replength += readBits(reader, 2); if(i < HLIT + 1) value = bitlen_ll[i - 1]; else value = bitlen_d[i - HLIT - 1]; /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { + for(n = 0; n < replength; ++n) { if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ if(i < HLIT) bitlen_ll[i] = value; else bitlen_d[i - HLIT] = value; ++i; } - } - else if(code == 17) /*repeat "0" 3-10 times*/ - { + } else if(code == 17) /*repeat "0" 3-10 times*/ { unsigned replength = 3; /*read in the bits that indicate repeat length*/ - if((*bp + 3) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 3); + replength += readBits(reader, 3); /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { + for(n = 0; n < replength; ++n) { if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ if(i < HLIT) bitlen_ll[i] = 0; else bitlen_d[i - HLIT] = 0; ++i; } - } - else if(code == 18) /*repeat "0" 11-138 times*/ - { + } else if(code == 18) /*repeat "0" 11-138 times*/ { unsigned replength = 11; /*read in the bits that indicate repeat length*/ - if((*bp + 7) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 7); + replength += readBits(reader, 7); /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { + for(n = 0; n < replength; ++n) { if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ if(i < HLIT) bitlen_ll[i] = 0; else bitlen_d[i - HLIT] = 0; ++i; } + } else /*if(code == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ } - else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - if(code == (unsigned)(-1)) - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inbitlength ? 10 : 11; - } - else error = 16; /*unexisting code, this can never happen*/ - break; + /*check if any of the ensureBits above went out of bounds*/ + if(reader->bp > reader->bitsize) { + /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol + (10=no endcode, 11=wrong jump outside of tree)*/ + /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ + ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ } } if(error) break; @@ -1127,92 +1258,88 @@ static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, return error; } -/*inflate a block with dynamic of fixed Huffman tree*/ -static unsigned inflateHuffmanBlock(ucvector* out, const unsigned char* in, size_t* bp, - size_t* pos, size_t inlength, unsigned btype) -{ +/*inflate a block with dynamic of fixed Huffman tree. btype must be 1 or 2.*/ +static unsigned inflateHuffmanBlock(ucvector* out, LodePNGBitReader* reader, + unsigned btype) { unsigned error = 0; HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ HuffmanTree tree_d; /*the huffman tree for distance codes*/ - size_t inbitlength = inlength * 8; HuffmanTree_init(&tree_ll); HuffmanTree_init(&tree_d); - if(btype == 1) getTreeInflateFixed(&tree_ll, &tree_d); - else if(btype == 2) error = getTreeInflateDynamic(&tree_ll, &tree_d, in, bp, inlength); + if(btype == 1) error = getTreeInflateFixed(&tree_ll, &tree_d); + else /*if(btype == 2)*/ error = getTreeInflateDynamic(&tree_ll, &tree_d, reader); - while(!error) /*decode all symbols until end reached, breaks at end code*/ - { + while(!error) /*decode all symbols until end reached, breaks at end code*/ { /*code_ll is literal, length or end code*/ - unsigned code_ll = huffmanDecodeSymbol(in, bp, &tree_ll, inbitlength); - if(code_ll <= 255) /*literal symbol*/ - { - /*ucvector_push_back would do the same, but for some reason the two lines below run 10% faster*/ - if(!ucvector_resize(out, (*pos) + 1)) ERROR_BREAK(83 /*alloc fail*/); - out->data[*pos] = (unsigned char)code_ll; - ++(*pos); - } - else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ - { + unsigned code_ll; + ensureBits25(reader, 20); /* up to 15 for the huffman symbol, up to 5 for the length extra bits */ + code_ll = huffmanDecodeSymbol(reader, &tree_ll); + if(code_ll <= 255) /*literal symbol*/ { + if(!ucvector_resize(out, out->size + 1)) ERROR_BREAK(83 /*alloc fail*/); + out->data[out->size - 1] = (unsigned char)code_ll; + } else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ { unsigned code_d, distance; unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ - size_t start, forward, backward, length; + size_t start, backward, length; /*part 1: get length base*/ length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; /*part 2: get extra bits and add the value of that to length*/ numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; - if((*bp + numextrabits_l) > inbitlength) ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - length += readBitsFromStream(bp, in, numextrabits_l); + if(numextrabits_l != 0) { + /* bits already ensured above */ + length += readBits(reader, numextrabits_l); + } /*part 3: get distance code*/ - code_d = huffmanDecodeSymbol(in, bp, &tree_d, inbitlength); - if(code_d > 29) - { - if(code_d == (unsigned)(-1)) /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inlength * 8 ? 10 : 11; + ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to 13 for the extra bits */ + code_d = huffmanDecodeSymbol(reader, &tree_d); + if(code_d > 29) { + if(code_d <= 31) { + ERROR_BREAK(18); /*error: invalid distance code (30-31 are never used)*/ + } else /* if(code_d == INVALIDSYMBOL) */{ + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ } - else error = 18; /*error: invalid distance code (30-31 are never used)*/ - break; } distance = DISTANCEBASE[code_d]; /*part 4: get extra bits from distance*/ numextrabits_d = DISTANCEEXTRA[code_d]; - if((*bp + numextrabits_d) > inbitlength) ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - distance += readBitsFromStream(bp, in, numextrabits_d); + if(numextrabits_d != 0) { + /* bits already ensured above */ + distance += readBits(reader, numextrabits_d); + } /*part 5: fill in all the out[n] values based on the length and dist*/ - start = (*pos); + start = out->size; if(distance > start) ERROR_BREAK(52); /*too long backward distance*/ backward = start - distance; - if(!ucvector_resize(out, (*pos) + length)) ERROR_BREAK(83 /*alloc fail*/); - if (distance < length) { - for(forward = 0; forward < length; ++forward) - { - out->data[(*pos)++] = out->data[backward++]; + if(!ucvector_resize(out, out->size + length)) ERROR_BREAK(83 /*alloc fail*/); + if(distance < length) { + size_t forward; + lodepng_memcpy(out->data + start, out->data + backward, distance); + start += distance; + for(forward = distance; forward < length; ++forward) { + out->data[start++] = out->data[backward++]; } } else { - memcpy(out->data + *pos, out->data + backward, length); - *pos += length; + lodepng_memcpy(out->data + start, out->data + backward, length); } - } - else if(code_ll == 256) - { + } else if(code_ll == 256) { break; /*end code, break the loop*/ + } else /*if(code_ll == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ } - else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { + /*check if any of the ensureBits above went out of bounds*/ + if(reader->bp > reader->bitsize) { /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol (10=no endcode, 11=wrong jump outside of tree)*/ - error = ((*bp) > inlength * 8) ? 10 : 11; - break; + /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ + ERROR_BREAK(51); /*error, bit pointer jumps past memory*/ } } @@ -1222,57 +1349,56 @@ static unsigned inflateHuffmanBlock(ucvector* out, const unsigned char* in, size return error; } -static unsigned inflateNoCompression(ucvector* out, const unsigned char* in, size_t* bp, size_t* pos, size_t inlength) -{ - size_t p; - unsigned LEN, NLEN, n, error = 0; +static unsigned inflateNoCompression(ucvector* out, LodePNGBitReader* reader, + const LodePNGDecompressSettings* settings) { + size_t bytepos; + size_t size = reader->size; + unsigned LEN, NLEN, error = 0; /*go to first boundary of byte*/ - while(((*bp) & 0x7) != 0) ++(*bp); - p = (*bp) / 8; /*byte position*/ + bytepos = (reader->bp + 7u) >> 3u; /*read LEN (2 bytes) and NLEN (2 bytes)*/ - if(p + 4 >= inlength) return 52; /*error, bit pointer will jump past memory*/ - LEN = in[p] + 256u * in[p + 1]; p += 2; - NLEN = in[p] + 256u * in[p + 1]; p += 2; + if(bytepos + 4 >= size) return 52; /*error, bit pointer will jump past memory*/ + LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; + NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; /*check if 16-bit NLEN is really the one's complement of LEN*/ - if(LEN + NLEN != 65535) return 21; /*error: NLEN is not one's complement of LEN*/ + if(!settings->ignore_nlen && LEN + NLEN != 65535) { + return 21; /*error: NLEN is not one's complement of LEN*/ + } - if(!ucvector_resize(out, (*pos) + LEN)) return 83; /*alloc fail*/ + if(!ucvector_resize(out, out->size + LEN)) return 83; /*alloc fail*/ /*read the literal data: LEN bytes are now stored in the out buffer*/ - if(p + LEN > inlength) return 23; /*error: reading outside of in buffer*/ - for(n = 0; n < LEN; ++n) out->data[(*pos)++] = in[p++]; + if(bytepos + LEN > size) return 23; /*error: reading outside of in buffer*/ - (*bp) = p * 8; + lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN); + bytepos += LEN; + + reader->bp = bytepos << 3u; return error; } static unsigned lodepng_inflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - /*bit pointer in the "in" data, current byte is bp >> 3, current bit is bp & 0x7 (from lsb to msb of the byte)*/ - size_t bp = 0; + const LodePNGDecompressSettings* settings) { unsigned BFINAL = 0; - size_t pos = 0; /*byte position in the out buffer*/ - unsigned error = 0; + LodePNGBitReader reader; + unsigned error = LodePNGBitReader_init(&reader, in, insize); - (void)settings; + if(error) return error; - while(!BFINAL) - { + while(!BFINAL) { unsigned BTYPE; - if(bp + 2 >= insize * 8) return 52; /*error, bit pointer will jump past memory*/ - BFINAL = readBitFromStream(&bp, in); - BTYPE = 1u * readBitFromStream(&bp, in); - BTYPE += 2u * readBitFromStream(&bp, in); + if(!ensureBits9(&reader, 3)) return 52; /*error, bit pointer will jump past memory*/ + BFINAL = readBits(&reader, 1); + BTYPE = readBits(&reader, 2); if(BTYPE == 3) return 20; /*error: invalid BTYPE*/ - else if(BTYPE == 0) error = inflateNoCompression(out, in, &bp, &pos, insize); /*no compression*/ - else error = inflateHuffmanBlock(out, in, &bp, &pos, insize, BTYPE); /*compression, BTYPE 01 or 10*/ + else if(BTYPE == 0) error = inflateNoCompression(out, &reader, settings); /*no compression*/ + else error = inflateHuffmanBlock(out, &reader, BTYPE); /*compression, BTYPE 01 or 10*/ if(error) return error; } @@ -1282,28 +1408,22 @@ static unsigned lodepng_inflatev(ucvector* out, unsigned lodepng_inflate(unsigned char** out, size_t* outsize, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - unsigned error; - ucvector v; - ucvector_init_buffer(&v, *out, *outsize); - error = lodepng_inflatev(&v, in, insize, settings); + const LodePNGDecompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_inflatev(&v, in, insize, settings); *out = v.data; *outsize = v.size; return error; } -static unsigned inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - if(settings->custom_inflate) - { - return settings->custom_inflate(out, outsize, in, insize, settings); - } - else - { - return lodepng_inflate(out, outsize, in, insize, settings); +static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { + if(settings->custom_inflate) { + unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings); + out->allocsize = out->size; + return error; + } else { + return lodepng_inflatev(out, in, insize, settings); } } @@ -1317,31 +1437,23 @@ static unsigned inflate(unsigned char** out, size_t* outsize, static const size_t MAX_SUPPORTED_DEFLATE_LENGTH = 258; -/*bitlen is the size in bits of the code*/ -static void addHuffmanSymbol(size_t* bp, ucvector* compressed, unsigned code, unsigned bitlen) -{ - addBitsToStreamReversed(bp, compressed, code, bitlen); -} - /*search the index in the array, that has the largest value smaller than or equal to the given value, given array must be sorted (if no value is smaller, it returns the size of the given array)*/ -static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) -{ +static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) { /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/ size_t left = 1; size_t right = array_size - 1; while(left <= right) { size_t mid = (left + right) >> 1; - if (array[mid] >= value) right = mid - 1; + if(array[mid] >= value) right = mid - 1; else left = mid + 1; } if(left >= array_size || array[left] > value) left--; return left; } -static void addLengthDistance(uivector* values, size_t length, size_t distance) -{ +static void addLengthDistance(uivector* values, size_t length, size_t distance) { /*values in encoded vector are those used by deflate: 0-255: literal bytes 256: end @@ -1353,10 +1465,15 @@ static void addLengthDistance(uivector* values, size_t length, size_t distance) unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); - uivector_push_back(values, length_code + FIRST_LENGTH_CODE_INDEX); - uivector_push_back(values, extra_length); - uivector_push_back(values, dist_code); - uivector_push_back(values, extra_distance); + size_t pos = values->size; + /*TODO: return error when this fails (out of memory)*/ + unsigned ok = uivector_resize(values, values->size + 4); + if(ok) { + values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX; + values->data[pos + 1] = extra_length; + values->data[pos + 2] = dist_code; + values->data[pos + 3] = extra_distance; + } } /*3 bytes of data get encoded into two bytes. The hash cannot use more than 3 @@ -1364,8 +1481,7 @@ bytes as input because 3 is the minimum match length for deflate*/ static const unsigned HASH_NUM_VALUES = 65536; static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ -typedef struct Hash -{ +typedef struct Hash { int* head; /*hash value to head circular pos - can be outdated if went around window*/ /*circular pos to prev circular pos*/ unsigned short* chain; @@ -1378,8 +1494,7 @@ typedef struct Hash unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/ } Hash; -static unsigned hash_init(Hash* hash, unsigned windowsize) -{ +static unsigned hash_init(Hash* hash, unsigned windowsize) { unsigned i; hash->head = (int*)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); hash->val = (int*)lodepng_malloc(sizeof(int) * windowsize); @@ -1389,8 +1504,7 @@ static unsigned hash_init(Hash* hash, unsigned windowsize) hash->headz = (int*)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); hash->chainz = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) - { + if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) { return 83; /*alloc fail*/ } @@ -1405,8 +1519,7 @@ static unsigned hash_init(Hash* hash, unsigned windowsize) return 0; } -static void hash_cleanup(Hash* hash) -{ +static void hash_cleanup(Hash* hash) { lodepng_free(hash->head); lodepng_free(hash->val); lodepng_free(hash->chain); @@ -1418,29 +1531,26 @@ static void hash_cleanup(Hash* hash) -static unsigned getHash(const unsigned char* data, size_t size, size_t pos) -{ +static unsigned getHash(const unsigned char* data, size_t size, size_t pos) { unsigned result = 0; - if(pos + 2 < size) - { + if(pos + 2 < size) { /*A simple shift and xor hash is used. Since the data of PNGs is dominated by zeroes due to the filters, a better hash does not have a significant effect on speed in traversing the chain, and causes more time spend on calculating the hash.*/ - result ^= (unsigned)(data[pos + 0] << 0u); - result ^= (unsigned)(data[pos + 1] << 4u); - result ^= (unsigned)(data[pos + 2] << 8u); + result ^= ((unsigned)data[pos + 0] << 0u); + result ^= ((unsigned)data[pos + 1] << 4u); + result ^= ((unsigned)data[pos + 2] << 8u); } else { size_t amount, i; if(pos >= size) return 0; amount = size - pos; - for(i = 0; i != amount; ++i) result ^= (unsigned)(data[pos + i] << (i * 8u)); + for(i = 0; i != amount; ++i) result ^= ((unsigned)data[pos + i] << (i * 8u)); } return result & HASH_BIT_MASK; } -static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) -{ +static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) { const unsigned char* start = data + pos; const unsigned char* end = start + MAX_SUPPORTED_DEFLATE_LENGTH; if(end > data + size) end = data + size; @@ -1451,15 +1561,14 @@ static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) } /*wpos = pos & (windowsize - 1)*/ -static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) -{ +static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) { hash->val[wpos] = (int)hashval; if(hash->head[hashval] != -1) hash->chain[wpos] = hash->head[hashval]; - hash->head[hashval] = wpos; + hash->head[hashval] = (int)wpos; hash->zeros[wpos] = numzeros; if(hash->headz[numzeros] != -1) hash->chainz[wpos] = hash->headz[numzeros]; - hash->headz[numzeros] = wpos; + hash->headz[numzeros] = (int)wpos; } /* @@ -1473,12 +1582,11 @@ this hash technique is one out of several ways to speed this up. */ static unsigned encodeLZ77(uivector* out, Hash* hash, const unsigned char* in, size_t inpos, size_t insize, unsigned windowsize, - unsigned minmatch, unsigned nicematch, unsigned lazymatching) -{ + unsigned minmatch, unsigned nicematch, unsigned lazymatching) { size_t pos; unsigned i, error = 0; /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/ - unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8; + unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u; unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/ @@ -1499,20 +1607,16 @@ static unsigned encodeLZ77(uivector* out, Hash* hash, if(nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; - for(pos = inpos; pos < insize; ++pos) - { + for(pos = inpos; pos < insize; ++pos) { size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ unsigned chainlength = 0; hashval = getHash(in, insize, pos); - if(usezeros && hashval == 0) - { + if(usezeros && hashval == 0) { if(numzeros == 0) numzeros = countZeros(in, insize, pos); else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } - else - { + } else { numzeros = 0; } @@ -1528,37 +1632,32 @@ static unsigned encodeLZ77(uivector* out, Hash* hash, /*search for the longest string*/ prev_offset = 0; - for(;;) - { + for(;;) { if(chainlength++ >= maxchainlength) break; - current_offset = hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize; + current_offset = (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize); if(current_offset < prev_offset) break; /*stop when went completely around the circular buffer*/ prev_offset = current_offset; - if(current_offset > 0) - { + if(current_offset > 0) { /*test the next characters*/ foreptr = &in[pos]; backptr = &in[pos - current_offset]; /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/ - if(numzeros >= 3) - { + if(numzeros >= 3) { unsigned skip = hash->zeros[hashpos]; if(skip > numzeros) skip = numzeros; backptr += skip; foreptr += skip; } - while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ - { + while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ { ++backptr; ++foreptr; } current_length = (unsigned)(foreptr - &in[pos]); - if(current_length > length) - { + if(current_length > length) { length = current_length; /*the longest length*/ offset = current_offset; /*the offset that is related to this longest length*/ /*jump out once a length of max length is found (speed gain). This also jumps @@ -1569,39 +1668,30 @@ static unsigned encodeLZ77(uivector* out, Hash* hash, if(hashpos == hash->chain[hashpos]) break; - if(numzeros >= 3 && length > numzeros) - { + if(numzeros >= 3 && length > numzeros) { hashpos = hash->chainz[hashpos]; if(hash->zeros[hashpos] != numzeros) break; - } - else - { + } else { hashpos = hash->chain[hashpos]; /*outdated hash value, happens if particular value was not encountered in whole last window*/ if(hash->val[hashpos] != (int)hashval) break; } } - if(lazymatching) - { - if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) - { + if(lazymatching) { + if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) { lazy = 1; lazylength = length; lazyoffset = offset; continue; /*try the next byte*/ } - if(lazy) - { + if(lazy) { lazy = 0; if(pos == 0) ERROR_BREAK(81); - if(length > lazylength + 1) - { + if(length > lazylength + 1) { /*push the previous character as literal*/ if(!uivector_push_back(out, in[pos - 1])) ERROR_BREAK(83 /*alloc fail*/); - } - else - { + } else { length = lazylength; offset = lazyoffset; hash->head[hashval] = -1; /*the same hashchain update will be done, this ensures no wrong alteration*/ @@ -1613,31 +1703,22 @@ static unsigned encodeLZ77(uivector* out, Hash* hash, if(length >= 3 && offset > windowsize) ERROR_BREAK(86 /*too big (or overflown negative) offset*/); /*encode it as length/distance pair or literal value*/ - if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ - { + if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ { if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } - else if(length < minmatch || (length == 3 && offset > 4096)) - { + } else if(length < minmatch || (length == 3 && offset > 4096)) { /*compensate for the fact that longer offsets have more extra bits, a length of only 3 may be not worth it then*/ if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } - else - { + } else { addLengthDistance(out, length, offset); - for(i = 1; i < length; ++i) - { + for(i = 1; i < length; ++i) { ++pos; wpos = pos & (windowsize - 1); hashval = getHash(in, insize, pos); - if(usezeros && hashval == 0) - { + if(usezeros && hashval == 0) { if(numzeros == 0) numzeros = countZeros(in, insize, pos); else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } - else - { + } else { numzeros = 0; } updateHashChain(hash, wpos, hashval, numzeros); @@ -1650,38 +1731,34 @@ static unsigned encodeLZ77(uivector* out, Hash* hash, /* /////////////////////////////////////////////////////////////////////////// */ -static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) -{ +static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) { /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte, 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/ - size_t i, j, numdeflateblocks = (datasize + 65534) / 65535; + size_t i, numdeflateblocks = (datasize + 65534u) / 65535u; unsigned datapos = 0; - for(i = 0; i != numdeflateblocks; ++i) - { + for(i = 0; i != numdeflateblocks; ++i) { unsigned BFINAL, BTYPE, LEN, NLEN; unsigned char firstbyte; + size_t pos = out->size; BFINAL = (i == numdeflateblocks - 1); BTYPE = 0; - firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1) << 1) + ((BTYPE & 2) << 1)); - ucvector_push_back(out, firstbyte); - LEN = 65535; - if(datasize - datapos < 65535) LEN = (unsigned)datasize - datapos; + if(datasize - datapos < 65535u) LEN = (unsigned)datasize - datapos; NLEN = 65535 - LEN; - ucvector_push_back(out, (unsigned char)(LEN & 255)); - ucvector_push_back(out, (unsigned char)(LEN >> 8)); - ucvector_push_back(out, (unsigned char)(NLEN & 255)); - ucvector_push_back(out, (unsigned char)(NLEN >> 8)); + if(!ucvector_resize(out, out->size + LEN + 5)) return 83; /*alloc fail*/ - /*Decompressed data*/ - for(j = 0; j < 65535 && datapos < datasize; ++j) - { - ucvector_push_back(out, data[datapos++]); - } + firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u)); + out->data[pos + 0] = firstbyte; + out->data[pos + 1] = (unsigned char)(LEN & 255); + out->data[pos + 2] = (unsigned char)(LEN >> 8u); + out->data[pos + 3] = (unsigned char)(NLEN & 255); + out->data[pos + 4] = (unsigned char)(NLEN >> 8u); + lodepng_memcpy(out->data + pos + 5, data + datapos, LEN); + datapos += LEN; } return 0; @@ -1692,16 +1769,13 @@ write the lz77-encoded data, which has lit, len and dist codes, to compressed st tree_ll: the tree for lit and len codes. tree_d: the tree for distance codes. */ -static void writeLZ77data(size_t* bp, ucvector* out, const uivector* lz77_encoded, - const HuffmanTree* tree_ll, const HuffmanTree* tree_d) -{ +static void writeLZ77data(LodePNGBitWriter* writer, const uivector* lz77_encoded, + const HuffmanTree* tree_ll, const HuffmanTree* tree_d) { size_t i = 0; - for(i = 0; i != lz77_encoded->size; ++i) - { + for(i = 0; i != lz77_encoded->size; ++i) { unsigned val = lz77_encoded->data[i]; - addHuffmanSymbol(bp, out, HuffmanTree_getCode(tree_ll, val), HuffmanTree_getLength(tree_ll, val)); - if(val > 256) /*for a length code, 3 more things have to be added*/ - { + writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]); + if(val > 256) /*for a length code, 3 more things have to be added*/ { unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; unsigned length_extra_bits = lz77_encoded->data[++i]; @@ -1712,19 +1786,17 @@ static void writeLZ77data(size_t* bp, ucvector* out, const uivector* lz77_encode unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; unsigned distance_extra_bits = lz77_encoded->data[++i]; - addBitsToStream(bp, out, length_extra_bits, n_length_extra_bits); - addHuffmanSymbol(bp, out, HuffmanTree_getCode(tree_d, distance_code), - HuffmanTree_getLength(tree_d, distance_code)); - addBitsToStream(bp, out, distance_extra_bits, n_distance_extra_bits); + writeBits(writer, length_extra_bits, n_length_extra_bits); + writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]); + writeBits(writer, distance_extra_bits, n_distance_extra_bits); } } } /*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/ -static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, +static unsigned deflateDynamic(LodePNGBitWriter* writer, Hash* hash, const unsigned char* data, size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) -{ + const LodePNGCompressSettings* settings, unsigned final) { unsigned error = 0; /* @@ -1734,7 +1806,7 @@ static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, another huffman tree is used for the dist values ("d"). These two trees are stored using their code lengths, and to compress even more these code lengths are also run-length encoded and huffman compressed. This gives a huffman tree - of code lengths "cl". The code lenghts used to describe this third tree are + of code lengths "cl". The code lengths used to describe this third tree are the code length code lengths ("clcl"). */ @@ -1743,159 +1815,140 @@ static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, HuffmanTree tree_ll; /*tree for lit,len values*/ HuffmanTree tree_d; /*tree for distance codes*/ HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/ - uivector frequencies_ll; /*frequency of lit,len codes*/ - uivector frequencies_d; /*frequency of dist codes*/ - uivector frequencies_cl; /*frequency of code length codes*/ - uivector bitlen_lld; /*lit,len,dist code lenghts (int bits), literally (without repeat codes).*/ - uivector bitlen_lld_e; /*bitlen_lld encoded with repeat codes (this is a rudemtary run length compression)*/ - /*bitlen_cl is the code length code lengths ("clcl"). The bit lengths of codes to represent tree_cl - (these are written as is in the file, it would be crazy to compress these using yet another huffman - tree that needs to be represented by yet another set of code lengths)*/ - uivector bitlen_cl; + unsigned* frequencies_ll = 0; /*frequency of lit,len codes*/ + unsigned* frequencies_d = 0; /*frequency of dist codes*/ + unsigned* frequencies_cl = 0; /*frequency of code length codes*/ + unsigned* bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally (without repeat codes).*/ + unsigned* bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is a rudimentary run length compression)*/ size_t datasize = dataend - datapos; /* - Due to the huffman compression of huffman tree representations ("two levels"), there are some anologies: + If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent + tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are + some analogies: bitlen_lld is to tree_cl what data is to tree_ll and tree_d. bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. */ unsigned BFINAL = final; - size_t numcodes_ll, numcodes_d, i; + size_t i; + size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl; unsigned HLIT, HDIST, HCLEN; uivector_init(&lz77_encoded); HuffmanTree_init(&tree_ll); HuffmanTree_init(&tree_d); HuffmanTree_init(&tree_cl); - uivector_init(&frequencies_ll); - uivector_init(&frequencies_d); - uivector_init(&frequencies_cl); - uivector_init(&bitlen_lld); - uivector_init(&bitlen_lld_e); - uivector_init(&bitlen_cl); + /* could fit on stack, but >1KB is on the larger side so allocate instead */ + frequencies_ll = (unsigned*)lodepng_malloc(286 * sizeof(*frequencies_ll)); + frequencies_d = (unsigned*)lodepng_malloc(30 * sizeof(*frequencies_d)); + frequencies_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if(!frequencies_ll || !frequencies_d || !frequencies_cl) error = 83; /*alloc fail*/ /*This while loop never loops due to a break at the end, it is here to allow breaking out of it to the cleanup phase on error conditions.*/ - while(!error) - { - if(settings->use_lz77) - { + while(!error) { + lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll)); + lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d)); + lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if(settings->use_lz77) { error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, settings->minmatch, settings->nicematch, settings->lazymatching); if(error) break; - } - else - { + } else { if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83 /*alloc fail*/); for(i = datapos; i < dataend; ++i) lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/ } - if(!uivector_resizev(&frequencies_ll, 286, 0)) ERROR_BREAK(83 /*alloc fail*/); - if(!uivector_resizev(&frequencies_d, 30, 0)) ERROR_BREAK(83 /*alloc fail*/); - /*Count the frequencies of lit, len and dist codes*/ - for(i = 0; i != lz77_encoded.size; ++i) - { + for(i = 0; i != lz77_encoded.size; ++i) { unsigned symbol = lz77_encoded.data[i]; - ++frequencies_ll.data[symbol]; - if(symbol > 256) - { + ++frequencies_ll[symbol]; + if(symbol > 256) { unsigned dist = lz77_encoded.data[i + 2]; - ++frequencies_d.data[dist]; + ++frequencies_d[dist]; i += 3; } } - frequencies_ll.data[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ + frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/ - error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll.data, 257, frequencies_ll.size, 15); + error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15); if(error) break; /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/ - error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d.data, 2, frequencies_d.size, 15); + error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15); if(error) break; - numcodes_ll = tree_ll.numcodes; if(numcodes_ll > 286) numcodes_ll = 286; - numcodes_d = tree_d.numcodes; if(numcodes_d > 30) numcodes_d = 30; + numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286); + numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30); /*store the code lengths of both generated trees in bitlen_lld*/ - for(i = 0; i != numcodes_ll; ++i) uivector_push_back(&bitlen_lld, HuffmanTree_getLength(&tree_ll, (unsigned)i)); - for(i = 0; i != numcodes_d; ++i) uivector_push_back(&bitlen_lld, HuffmanTree_getLength(&tree_d, (unsigned)i)); + numcodes_lld = numcodes_ll + numcodes_d; + bitlen_lld = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld)); + /*numcodes_lld_e never needs more size than bitlen_lld*/ + bitlen_lld_e = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e)); + if(!bitlen_lld || !bitlen_lld_e) ERROR_BREAK(83); /*alloc fail*/ + numcodes_lld_e = 0; + + for(i = 0; i != numcodes_ll; ++i) bitlen_lld[i] = tree_ll.lengths[i]; + for(i = 0; i != numcodes_d; ++i) bitlen_lld[numcodes_ll + i] = tree_d.lengths[i]; /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times), 17 (3-10 zeroes), 18 (11-138 zeroes)*/ - for(i = 0; i != (unsigned)bitlen_lld.size; ++i) - { - unsigned j = 0; /*amount of repititions*/ - while(i + j + 1 < (unsigned)bitlen_lld.size && bitlen_lld.data[i + j + 1] == bitlen_lld.data[i]) ++j; + for(i = 0; i != numcodes_lld; ++i) { + unsigned j = 0; /*amount of repetitions*/ + while(i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) ++j; - if(bitlen_lld.data[i] == 0 && j >= 2) /*repeat code for zeroes*/ - { + if(bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ { ++j; /*include the first zero*/ - if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ - { - uivector_push_back(&bitlen_lld_e, 17); - uivector_push_back(&bitlen_lld_e, j - 3); - } - else /*repeat code 18 supports max 138 zeroes*/ - { + if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ { + bitlen_lld_e[numcodes_lld_e++] = 17; + bitlen_lld_e[numcodes_lld_e++] = j - 3; + } else /*repeat code 18 supports max 138 zeroes*/ { if(j > 138) j = 138; - uivector_push_back(&bitlen_lld_e, 18); - uivector_push_back(&bitlen_lld_e, j - 11); + bitlen_lld_e[numcodes_lld_e++] = 18; + bitlen_lld_e[numcodes_lld_e++] = j - 11; } i += (j - 1); - } - else if(j >= 3) /*repeat code for value other than zero*/ - { + } else if(j >= 3) /*repeat code for value other than zero*/ { size_t k; - unsigned num = j / 6, rest = j % 6; - uivector_push_back(&bitlen_lld_e, bitlen_lld.data[i]); - for(k = 0; k < num; ++k) - { - uivector_push_back(&bitlen_lld_e, 16); - uivector_push_back(&bitlen_lld_e, 6 - 3); + unsigned num = j / 6u, rest = j % 6u; + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; + for(k = 0; k < num; ++k) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = 6 - 3; } - if(rest >= 3) - { - uivector_push_back(&bitlen_lld_e, 16); - uivector_push_back(&bitlen_lld_e, rest - 3); + if(rest >= 3) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = rest - 3; } else j -= rest; i += j; - } - else /*too short to benefit from repeat code*/ - { - uivector_push_back(&bitlen_lld_e, bitlen_lld.data[i]); + } else /*too short to benefit from repeat code*/ { + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; } } /*generate tree_cl, the huffmantree of huffmantrees*/ - - if(!uivector_resizev(&frequencies_cl, NUM_CODE_LENGTH_CODES, 0)) ERROR_BREAK(83 /*alloc fail*/); - for(i = 0; i != bitlen_lld_e.size; ++i) - { - ++frequencies_cl.data[bitlen_lld_e.data[i]]; + for(i = 0; i != numcodes_lld_e; ++i) { + ++frequencies_cl[bitlen_lld_e[i]]; /*after a repeat code come the bits that specify the number of repetitions, those don't need to be in the frequencies_cl calculation*/ - if(bitlen_lld_e.data[i] >= 16) ++i; + if(bitlen_lld_e[i] >= 16) ++i; } - error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl.data, - frequencies_cl.size, frequencies_cl.size, 7); + error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl, + NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7); if(error) break; - if(!uivector_resize(&bitlen_cl, tree_cl.numcodes)) ERROR_BREAK(83 /*alloc fail*/); - for(i = 0; i != tree_cl.numcodes; ++i) - { - /*lenghts of code length tree is in the order as specified by deflate*/ - bitlen_cl.data[i] = HuffmanTree_getLength(&tree_cl, CLCL_ORDER[i]); + /*compute amount of code-length-code-lengths to output*/ + numcodes_cl = NUM_CODE_LENGTH_CODES; + /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 (see HCLEN below)*/ + while(numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) { + numcodes_cl--; } - while(bitlen_cl.data[bitlen_cl.size - 1] == 0 && bitlen_cl.size > 4) - { - /*remove zeros at the end, but minimum size must be 4*/ - if(!uivector_resize(&bitlen_cl, bitlen_cl.size - 1)) ERROR_BREAK(83 /*alloc fail*/); - } - if(error) break; /* Write everything into the output @@ -1903,7 +1956,7 @@ static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, After the BFINAL and BTYPE, the dynamic block consists out of the following: - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN - (HCLEN+4)*3 bits code lengths of code length alphabet - - HLIT + 257 code lenghts of lit/length alphabet (encoded using the code length + - HLIT + 257 code lengths of lit/length alphabet (encoded using the code length alphabet, + possible repetition codes 16, 17, 18) - HDIST + 1 code lengths of distance alphabet (encoded using the code length alphabet, + possible repetition codes 16, 17, 18) @@ -1912,41 +1965,39 @@ static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, */ /*Write block type*/ - addBitToStream(bp, out, BFINAL); - addBitToStream(bp, out, 0); /*first bit of BTYPE "dynamic"*/ - addBitToStream(bp, out, 1); /*second bit of BTYPE "dynamic"*/ + writeBits(writer, BFINAL, 1); + writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/ + writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/ /*write the HLIT, HDIST and HCLEN values*/ + /*all three sizes take trimmed ending zeroes into account, done either by HuffmanTree_makeFromFrequencies + or in the loop for numcodes_cl above, which saves space. */ HLIT = (unsigned)(numcodes_ll - 257); HDIST = (unsigned)(numcodes_d - 1); - HCLEN = (unsigned)bitlen_cl.size - 4; - /*trim zeroes for HCLEN. HLIT and HDIST were already trimmed at tree creation*/ - while(!bitlen_cl.data[HCLEN + 4 - 1] && HCLEN > 0) --HCLEN; - addBitsToStream(bp, out, HLIT, 5); - addBitsToStream(bp, out, HDIST, 5); - addBitsToStream(bp, out, HCLEN, 4); + HCLEN = (unsigned)(numcodes_cl - 4); + writeBits(writer, HLIT, 5); + writeBits(writer, HDIST, 5); + writeBits(writer, HCLEN, 4); - /*write the code lenghts of the code length alphabet*/ - for(i = 0; i != HCLEN + 4; ++i) addBitsToStream(bp, out, bitlen_cl.data[i], 3); + /*write the code lengths of the code length alphabet ("bitlen_cl")*/ + for(i = 0; i != numcodes_cl; ++i) writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3); - /*write the lenghts of the lit/len AND the dist alphabet*/ - for(i = 0; i != bitlen_lld_e.size; ++i) - { - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_cl, bitlen_lld_e.data[i]), - HuffmanTree_getLength(&tree_cl, bitlen_lld_e.data[i])); + /*write the lengths of the lit/len AND the dist alphabet*/ + for(i = 0; i != numcodes_lld_e; ++i) { + writeBitsReversed(writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]); /*extra bits of repeat codes*/ - if(bitlen_lld_e.data[i] == 16) addBitsToStream(bp, out, bitlen_lld_e.data[++i], 2); - else if(bitlen_lld_e.data[i] == 17) addBitsToStream(bp, out, bitlen_lld_e.data[++i], 3); - else if(bitlen_lld_e.data[i] == 18) addBitsToStream(bp, out, bitlen_lld_e.data[++i], 7); + if(bitlen_lld_e[i] == 16) writeBits(writer, bitlen_lld_e[++i], 2); + else if(bitlen_lld_e[i] == 17) writeBits(writer, bitlen_lld_e[++i], 3); + else if(bitlen_lld_e[i] == 18) writeBits(writer, bitlen_lld_e[++i], 7); } /*write the compressed data symbols*/ - writeLZ77data(bp, out, &lz77_encoded, &tree_ll, &tree_d); + writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); /*error: the length of the end code 256 must be larger than 0*/ - if(HuffmanTree_getLength(&tree_ll, 256) == 0) ERROR_BREAK(64); + if(tree_ll.lengths[256] == 0) ERROR_BREAK(64); /*write the end code*/ - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, 256), HuffmanTree_getLength(&tree_ll, 256)); + writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); break; /*end of error-while*/ } @@ -1956,21 +2007,19 @@ static unsigned deflateDynamic(ucvector* out, size_t* bp, Hash* hash, HuffmanTree_cleanup(&tree_ll); HuffmanTree_cleanup(&tree_d); HuffmanTree_cleanup(&tree_cl); - uivector_cleanup(&frequencies_ll); - uivector_cleanup(&frequencies_d); - uivector_cleanup(&frequencies_cl); - uivector_cleanup(&bitlen_lld_e); - uivector_cleanup(&bitlen_lld); - uivector_cleanup(&bitlen_cl); + lodepng_free(frequencies_ll); + lodepng_free(frequencies_d); + lodepng_free(frequencies_cl); + lodepng_free(bitlen_lld); + lodepng_free(bitlen_lld_e); return error; } -static unsigned deflateFixed(ucvector* out, size_t* bp, Hash* hash, +static unsigned deflateFixed(LodePNGBitWriter* writer, Hash* hash, const unsigned char* data, size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) -{ + const LodePNGCompressSettings* settings, unsigned final) { HuffmanTree tree_ll; /*tree for literal values and length codes*/ HuffmanTree tree_d; /*tree for distance codes*/ @@ -1981,31 +2030,29 @@ static unsigned deflateFixed(ucvector* out, size_t* bp, Hash* hash, HuffmanTree_init(&tree_ll); HuffmanTree_init(&tree_d); - generateFixedLitLenTree(&tree_ll); - generateFixedDistanceTree(&tree_d); + error = generateFixedLitLenTree(&tree_ll); + if(!error) error = generateFixedDistanceTree(&tree_d); - addBitToStream(bp, out, BFINAL); - addBitToStream(bp, out, 1); /*first bit of BTYPE*/ - addBitToStream(bp, out, 0); /*second bit of BTYPE*/ + if(!error) { + writeBits(writer, BFINAL, 1); + writeBits(writer, 1, 1); /*first bit of BTYPE*/ + writeBits(writer, 0, 1); /*second bit of BTYPE*/ - if(settings->use_lz77) /*LZ77 encoded*/ - { - uivector lz77_encoded; - uivector_init(&lz77_encoded); - error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, - settings->minmatch, settings->nicematch, settings->lazymatching); - if(!error) writeLZ77data(bp, out, &lz77_encoded, &tree_ll, &tree_d); - uivector_cleanup(&lz77_encoded); - } - else /*no LZ77, but still will be Huffman compressed*/ - { - for(i = datapos; i < dataend; ++i) - { - addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, data[i]), HuffmanTree_getLength(&tree_ll, data[i])); + if(settings->use_lz77) /*LZ77 encoded*/ { + uivector lz77_encoded; + uivector_init(&lz77_encoded); + error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, + settings->minmatch, settings->nicematch, settings->lazymatching); + if(!error) writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); + uivector_cleanup(&lz77_encoded); + } else /*no LZ77, but still will be Huffman compressed*/ { + for(i = datapos; i < dataend; ++i) { + writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]); + } } + /*add END code*/ + if(!error) writeBitsReversed(writer,tree_ll.codes[256], tree_ll.lengths[256]); } - /*add END code*/ - if(!error) addHuffmanSymbol(bp, out, HuffmanTree_getCode(&tree_ll, 256), HuffmanTree_getLength(&tree_ll, 256)); /*cleanup*/ HuffmanTree_cleanup(&tree_ll); @@ -2015,20 +2062,20 @@ static unsigned deflateFixed(ucvector* out, size_t* bp, Hash* hash, } static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) -{ + const LodePNGCompressSettings* settings) { unsigned error = 0; size_t i, blocksize, numdeflateblocks; - size_t bp = 0; /*the bit pointer*/ Hash hash; + LodePNGBitWriter writer; + + LodePNGBitWriter_init(&writer, out); if(settings->btype > 2) return 61; else if(settings->btype == 0) return deflateNoCompression(out, in, insize); else if(settings->btype == 1) blocksize = insize; - else /*if(settings->btype == 2)*/ - { + else /*if(settings->btype == 2)*/ { /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ - blocksize = insize / 8 + 8; + blocksize = insize / 8u + 8; if(blocksize < 65536) blocksize = 65536; if(blocksize > 262144) blocksize = 262144; } @@ -2037,17 +2084,17 @@ static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t if(numdeflateblocks == 0) numdeflateblocks = 1; error = hash_init(&hash, settings->windowsize); - if(error) return error; - for(i = 0; i != numdeflateblocks && !error; ++i) - { - unsigned final = (i == numdeflateblocks - 1); - size_t start = i * blocksize; - size_t end = start + blocksize; - if(end > insize) end = insize; + if(!error) { + for(i = 0; i != numdeflateblocks && !error; ++i) { + unsigned final = (i == numdeflateblocks - 1); + size_t start = i * blocksize; + size_t end = start + blocksize; + if(end > insize) end = insize; - if(settings->btype == 1) error = deflateFixed(out, &bp, &hash, in, start, end, settings, final); - else if(settings->btype == 2) error = deflateDynamic(out, &bp, &hash, in, start, end, settings, final); + if(settings->btype == 1) error = deflateFixed(&writer, &hash, in, start, end, settings, final); + else if(settings->btype == 2) error = deflateDynamic(&writer, &hash, in, start, end, settings, final); + } } hash_cleanup(&hash); @@ -2057,12 +2104,9 @@ static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t unsigned lodepng_deflate(unsigned char** out, size_t* outsize, const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) -{ - unsigned error; - ucvector v; - ucvector_init_buffer(&v, *out, *outsize); - error = lodepng_deflatev(&v, in, insize, settings); + const LodePNGCompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_deflatev(&v, in, insize, settings); *out = v.data; *outsize = v.size; return error; @@ -2070,14 +2114,10 @@ unsigned lodepng_deflate(unsigned char** out, size_t* outsize, static unsigned deflate(unsigned char** out, size_t* outsize, const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) -{ - if(settings->custom_deflate) - { + const LodePNGCompressSettings* settings) { + if(settings->custom_deflate) { return settings->custom_deflate(out, outsize, in, insize, settings); - } - else - { + } else { return lodepng_deflate(out, outsize, in, insize, settings); } } @@ -2085,36 +2125,32 @@ static unsigned deflate(unsigned char** out, size_t* outsize, #endif /*LODEPNG_COMPILE_DECODER*/ /* ////////////////////////////////////////////////////////////////////////// */ -/* / Adler32 */ +/* / Adler32 / */ /* ////////////////////////////////////////////////////////////////////////// */ -static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) -{ - unsigned s1 = adler & 0xffff; - unsigned s2 = (adler >> 16) & 0xffff; +static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) { + unsigned s1 = adler & 0xffffu; + unsigned s2 = (adler >> 16u) & 0xffffu; - while(len > 0) - { - /*at least 5550 sums can be done before the sums overflow, saving a lot of module divisions*/ - unsigned amount = len > 5550 ? 5550 : len; + while(len != 0u) { + unsigned i; + /*at least 5552 sums can be done before the sums overflow, saving a lot of module divisions*/ + unsigned amount = len > 5552u ? 5552u : len; len -= amount; - while(amount > 0) - { + for(i = 0; i != amount; ++i) { s1 += (*data++); s2 += s1; - --amount; } - s1 %= 65521; - s2 %= 65521; + s1 %= 65521u; + s2 %= 65521u; } - return (s2 << 16) | s1; + return (s2 << 16u) | s1; } /*Return the adler32 of the bytes data[0..len-1]*/ -static unsigned adler32(const unsigned char* data, unsigned len) -{ - return update_adler32(1L, data, len); +static unsigned adler32(const unsigned char* data, unsigned len) { + return update_adler32(1u, data, len); } /* ////////////////////////////////////////////////////////////////////////// */ @@ -2123,16 +2159,15 @@ static unsigned adler32(const unsigned char* data, unsigned len) #ifdef LODEPNG_COMPILE_DECODER -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ +static unsigned lodepng_zlib_decompressv(ucvector* out, + const unsigned char* in, size_t insize, + const LodePNGDecompressSettings* settings) { unsigned error = 0; unsigned CM, CINFO, FDICT; if(insize < 2) return 53; /*error, size of zlib data too small*/ /*read information from zlib header*/ - if((in[0] * 256 + in[1]) % 31 != 0) - { + if((in[0] * 256 + in[1]) % 31 != 0) { /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ return 24; } @@ -2143,41 +2178,55 @@ unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const uns FDICT = (in[1] >> 5) & 1; /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ - if(CM != 8 || CINFO > 7) - { + if(CM != 8 || CINFO > 7) { /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ return 25; } - if(FDICT != 0) - { + if(FDICT != 0) { /*error: the specification of PNG says about the zlib stream: "The additional flags shall not specify a preset dictionary."*/ return 26; } - error = inflate(out, outsize, in + 2, insize - 2, settings); + error = inflatev(out, in + 2, insize - 2, settings); if(error) return error; - if(!settings->ignore_adler32) - { + if(!settings->ignore_adler32) { unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); - unsigned checksum = adler32(*out, (unsigned)(*outsize)); + unsigned checksum = adler32(out->data, (unsigned)(out->size)); if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/ } return 0; /*no error*/ } -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ - if(settings->custom_zlib) - { + +unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, + size_t insize, const LodePNGDecompressSettings* settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +/*expected_size is expected output size, to avoid intermediate allocations. Set to 0 if not known. */ +static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, + const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { + if(settings->custom_zlib) { return settings->custom_zlib(out, outsize, in, insize, settings); - } - else - { - return lodepng_zlib_decompress(out, outsize, in, insize, settings); + } else { + unsigned error; + ucvector v = ucvector_init(*out, *outsize); + if(expected_size) { + /*reserve the memory to avoid intermediate reallocations*/ + ucvector_resize(&v, *outsize + expected_size); + v.size = *outsize; + } + error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; } } @@ -2186,56 +2235,48 @@ static unsigned zlib_decompress(unsigned char** out, size_t* outsize, const unsi #ifdef LODEPNG_COMPILE_ENCODER unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) -{ - /*initially, *out must be NULL and outsize 0, if you just give some random *out - that's pointing to a non allocated buffer, this'll crash*/ - ucvector outv; + size_t insize, const LodePNGCompressSettings* settings) { size_t i; unsigned error; unsigned char* deflatedata = 0; size_t deflatesize = 0; - /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ - unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ - unsigned FLEVEL = 0; - unsigned FDICT = 0; - unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; - unsigned FCHECK = 31 - CMFFLG % 31; - CMFFLG += FCHECK; - - /*ucvector-controlled version of the output buffer, for dynamic array*/ - ucvector_init_buffer(&outv, *out, *outsize); - - ucvector_push_back(&outv, (unsigned char)(CMFFLG >> 8)); - ucvector_push_back(&outv, (unsigned char)(CMFFLG & 255)); - error = deflate(&deflatedata, &deflatesize, in, insize, settings); - if(!error) - { - unsigned ADLER32 = adler32(in, (unsigned)insize); - for(i = 0; i != deflatesize; ++i) ucvector_push_back(&outv, deflatedata[i]); - lodepng_free(deflatedata); - lodepng_add32bitInt(&outv, ADLER32); + *out = NULL; + *outsize = 0; + if(!error) { + *outsize = deflatesize + 6; + *out = (unsigned char*)lodepng_malloc(*outsize); + if(!*out) error = 83; /*alloc fail*/ } - *out = outv.data; - *outsize = outv.size; + if(!error) { + unsigned ADLER32 = adler32(in, (unsigned)insize); + /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ + unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ + unsigned FLEVEL = 0; + unsigned FDICT = 0; + unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; + unsigned FCHECK = 31 - CMFFLG % 31; + CMFFLG += FCHECK; + (*out)[0] = (unsigned char)(CMFFLG >> 8); + (*out)[1] = (unsigned char)(CMFFLG & 255); + for(i = 0; i != deflatesize; ++i) (*out)[i + 2] = deflatedata[i]; + lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32); + } + + lodepng_free(deflatedata); return error; } /* compress using the default or custom zlib function */ static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) -{ - if(settings->custom_zlib) - { + size_t insize, const LodePNGCompressSettings* settings) { + if(settings->custom_zlib) { return settings->custom_zlib(out, outsize, in, insize, settings); - } - else - { + } else { return lodepng_zlib_compress(out, outsize, in, insize, settings); } } @@ -2245,17 +2286,16 @@ static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsign #else /*no LODEPNG_COMPILE_ZLIB*/ #ifdef LODEPNG_COMPILE_DECODER -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ +static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, + const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ + (void)expected_size; return settings->custom_zlib(out, outsize, in, insize, settings); } #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) -{ + size_t insize, const LodePNGCompressSettings* settings) { if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ return settings->custom_zlib(out, outsize, in, insize, settings); } @@ -2270,8 +2310,7 @@ static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsign /*this is a good tradeoff between speed and compression ratio*/ #define DEFAULT_WINDOWSIZE 2048 -void lodepng_compress_settings_init(LodePNGCompressSettings* settings) -{ +void lodepng_compress_settings_init(LodePNGCompressSettings* settings) { /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ settings->btype = 2; settings->use_lz77 = 1; @@ -2292,16 +2331,16 @@ const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT #ifdef LODEPNG_COMPILE_DECODER -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) -{ +void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) { settings->ignore_adler32 = 0; + settings->ignore_nlen = 0; settings->custom_zlib = 0; settings->custom_inflate = 0; settings->custom_context = 0; } -const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0}; +const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0, 0}; #endif /*LODEPNG_COMPILE_DECODER*/ @@ -2356,13 +2395,11 @@ static unsigned lodepng_crc32_table[256] = { }; /*Return the CRC of the bytes buf[0..len-1].*/ -unsigned lodepng_crc32(const unsigned char* data, size_t length) -{ +unsigned lodepng_crc32(const unsigned char* data, size_t length) { unsigned r = 0xffffffffu; size_t i; - for(i = 0; i < length; ++i) - { - r = lodepng_crc32_table[(r ^ data[i]) & 0xff] ^ (r >> 8); + for(i = 0; i < length; ++i) { + r = lodepng_crc32_table[(r ^ data[i]) & 0xffu] ^ (r >> 8u); } return r ^ 0xffffffffu; } @@ -2371,46 +2408,33 @@ unsigned lodepng_crc32(const unsigned char* data, size_t length); #endif /* !LODEPNG_NO_COMPILE_CRC */ /* ////////////////////////////////////////////////////////////////////////// */ -/* / Reading and writing single bits and bytes from/to stream for LodePNG / */ +/* / Reading and writing PNG color channel bits / */ /* ////////////////////////////////////////////////////////////////////////// */ -static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) -{ +/* The color channel bits of less-than-8-bit pixels are read with the MSB of bytes first, +so LodePNGBitWriter and LodePNGBitReader can't be used for those. */ + +static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) { unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); ++(*bitpointer); return result; } -static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) -{ +/* TODO: make this faster */ +static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) { unsigned result = 0; size_t i; - for(i = 0 ; i < nbits; ++i) - { - result <<= 1; + for(i = 0 ; i < nbits; ++i) { + result <<= 1u; result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); } return result; } -#ifdef LODEPNG_COMPILE_DECODER -static void setBitOfReversedStream0(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) -{ - /*the current bit in bitstream must be 0 for this to work*/ - if(bit) - { - /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/ - bitstream[(*bitpointer) >> 3] |= (bit << (7 - ((*bitpointer) & 0x7))); - } - ++(*bitpointer); -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) -{ +static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) { /*the current bit in bitstream may be 0 or 1 for this to work*/ - if(bit == 0) bitstream[(*bitpointer) >> 3] &= (unsigned char)(~(1 << (7 - ((*bitpointer) & 0x7)))); - else bitstream[(*bitpointer) >> 3] |= (1 << (7 - ((*bitpointer) & 0x7))); + if(bit == 0) bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u)))); + else bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u))); ++(*bitpointer); } @@ -2418,51 +2442,42 @@ static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, /* / PNG chunks / */ /* ////////////////////////////////////////////////////////////////////////// */ -unsigned lodepng_chunk_length(const unsigned char* chunk) -{ +unsigned lodepng_chunk_length(const unsigned char* chunk) { return lodepng_read32bitInt(&chunk[0]); } -void lodepng_chunk_type(char type[5], const unsigned char* chunk) -{ +void lodepng_chunk_type(char type[5], const unsigned char* chunk) { unsigned i; for(i = 0; i != 4; ++i) type[i] = (char)chunk[4 + i]; type[4] = 0; /*null termination char*/ } -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) -{ - if(strlen(type) != 4) return 0; +unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) { + if(lodepng_strlen(type) != 4) return 0; return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); } -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) -{ +unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) { return((chunk[4] & 32) != 0); } -unsigned char lodepng_chunk_private(const unsigned char* chunk) -{ +unsigned char lodepng_chunk_private(const unsigned char* chunk) { return((chunk[6] & 32) != 0); } -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) -{ +unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) { return((chunk[7] & 32) != 0); } -unsigned char* lodepng_chunk_data(unsigned char* chunk) -{ +unsigned char* lodepng_chunk_data(unsigned char* chunk) { return &chunk[8]; } -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) -{ +const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) { return &chunk[8]; } -unsigned lodepng_chunk_check_crc(const unsigned char* chunk) -{ +unsigned lodepng_chunk_check_crc(const unsigned char* chunk) { unsigned length = lodepng_chunk_length(chunk); unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ @@ -2471,37 +2486,72 @@ unsigned lodepng_chunk_check_crc(const unsigned char* chunk) else return 0; } -void lodepng_chunk_generate_crc(unsigned char* chunk) -{ +void lodepng_chunk_generate_crc(unsigned char* chunk) { unsigned length = lodepng_chunk_length(chunk); unsigned CRC = lodepng_crc32(&chunk[4], length + 4); lodepng_set32bitInt(chunk + 8 + length, CRC); } -unsigned char* lodepng_chunk_next(unsigned char* chunk) -{ - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; +unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end) { + if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ + if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 + && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ + return chunk + 8; + } else { + size_t total_chunk_length; + unsigned char* result; + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; + result = chunk + total_chunk_length; + if(result < chunk) return end; /*pointer overflow*/ + return result; + } } -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk) -{ - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; +const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end) { + if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/ + if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 + && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ + return chunk + 8; + } else { + size_t total_chunk_length; + const unsigned char* result; + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; + result = chunk + total_chunk_length; + if(result < chunk) return end; /*pointer overflow*/ + return result; + } } -unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsigned char* chunk) -{ +unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]) { + for(;;) { + if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ + if(lodepng_chunk_type_equals(chunk, type)) return chunk; + chunk = lodepng_chunk_next(chunk, end); + } +} + +const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]) { + for(;;) { + if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ + if(lodepng_chunk_type_equals(chunk, type)) return chunk; + chunk = lodepng_chunk_next_const(chunk, end); + } +} + +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk) { unsigned i; - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; + size_t total_chunk_length, new_length; unsigned char *chunk_start, *new_buffer; - size_t new_length = (*outlength) + total_chunk_length; - if(new_length < total_chunk_length || new_length < (*outlength)) return 77; /*integer overflow happened*/ + + if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return 77; + if(lodepng_addofl(*outsize, total_chunk_length, &new_length)) return 77; new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); if(!new_buffer) return 83; /*alloc fail*/ (*out) = new_buffer; - (*outlength) = new_length; + (*outsize) = new_length; chunk_start = &(*out)[new_length - total_chunk_length]; for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i]; @@ -2509,30 +2559,36 @@ unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsi return 0; } -unsigned lodepng_chunk_create(unsigned char** out, size_t* outlength, unsigned length, - const char* type, const unsigned char* data) -{ - unsigned i; - unsigned char *chunk, *new_buffer; - size_t new_length = (*outlength) + length + 12; - if(new_length < length + 12 || new_length < (*outlength)) return 77; /*integer overflow happened*/ - new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); - if(!new_buffer) return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outlength) = new_length; - chunk = &(*out)[(*outlength) - length - 12]; +/*Sets length and name and allocates the space for data and crc but does not +set data or crc yet. Returns the start of the chunk in chunk. The start of +the data is at chunk + 8. To finalize chunk, add the data, then use +lodepng_chunk_generate_crc */ +static unsigned lodepng_chunk_init(unsigned char** chunk, + ucvector* out, + unsigned length, const char* type) { + size_t new_length = out->size; + if(lodepng_addofl(new_length, length, &new_length)) return 77; + if(lodepng_addofl(new_length, 12, &new_length)) return 77; + if(!ucvector_resize(out, new_length)) return 83; /*alloc fail*/ + *chunk = out->data + new_length - length - 12u; /*1: length*/ - lodepng_set32bitInt(chunk, (unsigned)length); + lodepng_set32bitInt(*chunk, length); /*2: chunk name (4 letters)*/ - chunk[4] = (unsigned char)type[0]; - chunk[5] = (unsigned char)type[1]; - chunk[6] = (unsigned char)type[2]; - chunk[7] = (unsigned char)type[3]; + lodepng_memcpy(*chunk + 4, type, 4); + + return 0; +} + +/* like lodepng_chunk_create but with custom allocsize */ +static unsigned lodepng_chunk_createv(ucvector* out, + unsigned length, const char* type, const unsigned char* data) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type)); /*3: the data*/ - for(i = 0; i != length; ++i) chunk[8 + i] = data[i]; + lodepng_memcpy(chunk + 8, data, length); /*4: CRC (of the chunkname characters and the data)*/ lodepng_chunk_generate_crc(chunk); @@ -2540,48 +2596,54 @@ unsigned lodepng_chunk_create(unsigned char** out, size_t* outlength, unsigned l return 0; } +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, + unsigned length, const char* type, const unsigned char* data) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_chunk_createv(&v, length, type, data); + *out = v.data; + *outsize = v.size; + return error; +} + /* ////////////////////////////////////////////////////////////////////////// */ -/* / Color types and such / */ +/* / Color types, channels, bits / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*return type is a LodePNG error code*/ -static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) /*bd = bitdepth*/ -{ - switch(colortype) - { - case 0: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; /*grey*/ - case 2: if(!( bd == 8 || bd == 16)) return 37; break; /*RGB*/ - case 3: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; /*palette*/ - case 4: if(!( bd == 8 || bd == 16)) return 37; break; /*grey + alpha*/ - case 6: if(!( bd == 8 || bd == 16)) return 37; break; /*RGBA*/ - default: return 31; +/*checks if the colortype is valid and the bitdepth bd is allowed for this colortype. +Return value is a LodePNG error code.*/ +static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) { + switch(colortype) { + case LCT_GREY: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; + case LCT_RGB: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_PALETTE: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; + case LCT_GREY_ALPHA: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_RGBA: if(!( bd == 8 || bd == 16)) return 37; break; + case LCT_MAX_OCTET_VALUE: return 31; /* invalid color type */ + default: return 31; /* invalid color type */ } return 0; /*allowed color type / bits combination*/ } -static unsigned getNumColorChannels(LodePNGColorType colortype) -{ - switch(colortype) - { - case 0: return 1; /*grey*/ - case 2: return 3; /*RGB*/ - case 3: return 1; /*palette*/ - case 4: return 2; /*grey + alpha*/ - case 6: return 4; /*RGBA*/ +static unsigned getNumColorChannels(LodePNGColorType colortype) { + switch(colortype) { + case LCT_GREY: return 1; + case LCT_RGB: return 3; + case LCT_PALETTE: return 1; + case LCT_GREY_ALPHA: return 2; + case LCT_RGBA: return 4; + case LCT_MAX_OCTET_VALUE: return 0; /* invalid color type */ + default: return 0; /*invalid color type*/ } - return 0; /*unexisting color type*/ } -static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) -{ +static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) { /*bits per pixel is amount of channels * bits per channel*/ return getNumColorChannels(colortype) * bitdepth; } /* ////////////////////////////////////////////////////////////////////////// */ -void lodepng_color_mode_init(LodePNGColorMode* info) -{ +void lodepng_color_mode_init(LodePNGColorMode* info) { info->key_defined = 0; info->key_r = info->key_g = info->key_b = 0; info->colortype = LCT_RGBA; @@ -2590,69 +2652,78 @@ void lodepng_color_mode_init(LodePNGColorMode* info) info->palettesize = 0; } -void lodepng_color_mode_cleanup(LodePNGColorMode* info) -{ +/*allocates palette memory if needed, and initializes all colors to black*/ +static void lodepng_color_mode_alloc_palette(LodePNGColorMode* info) { + size_t i; + /*if the palette is already allocated, it will have size 1024 so no reallocation needed in that case*/ + /*the palette must have room for up to 256 colors with 4 bytes each.*/ + if(!info->palette) info->palette = (unsigned char*)lodepng_malloc(1024); + if(!info->palette) return; /*alloc fail*/ + for(i = 0; i != 256; ++i) { + /*Initialize all unused colors with black, the value used for invalid palette indices. + This is an error according to the PNG spec, but common PNG decoders make it black instead. + That makes color conversion slightly faster due to no error handling needed.*/ + info->palette[i * 4 + 0] = 0; + info->palette[i * 4 + 1] = 0; + info->palette[i * 4 + 2] = 0; + info->palette[i * 4 + 3] = 255; + } +} + +void lodepng_color_mode_cleanup(LodePNGColorMode* info) { lodepng_palette_clear(info); } -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) -{ - size_t i; +unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) { lodepng_color_mode_cleanup(dest); - *dest = *source; - if(source->palette) - { + lodepng_memcpy(dest, source, sizeof(LodePNGColorMode)); + if(source->palette) { dest->palette = (unsigned char*)lodepng_malloc(1024); if(!dest->palette && source->palettesize) return 83; /*alloc fail*/ - for(i = 0; i != source->palettesize * 4; ++i) dest->palette[i] = source->palette[i]; + lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4); } return 0; } -static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) -{ +LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth) { + LodePNGColorMode result; + lodepng_color_mode_init(&result); + result.colortype = colortype; + result.bitdepth = bitdepth; + return result; +} + +static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) { size_t i; if(a->colortype != b->colortype) return 0; if(a->bitdepth != b->bitdepth) return 0; if(a->key_defined != b->key_defined) return 0; - if(a->key_defined) - { + if(a->key_defined) { if(a->key_r != b->key_r) return 0; if(a->key_g != b->key_g) return 0; if(a->key_b != b->key_b) return 0; } - /*if one of the palette sizes is 0, then we consider it to be the same as the - other: it means that e.g. the palette was not given by the user and should be - considered the same as the palette inside the PNG.*/ - if(1/*a->palettesize != 0 && b->palettesize != 0*/) { - if(a->palettesize != b->palettesize) return 0; - for(i = 0; i != a->palettesize * 4; ++i) - { - if(a->palette[i] != b->palette[i]) return 0; - } + if(a->palettesize != b->palettesize) return 0; + for(i = 0; i != a->palettesize * 4; ++i) { + if(a->palette[i] != b->palette[i]) return 0; } return 1; } -void lodepng_palette_clear(LodePNGColorMode* info) -{ +void lodepng_palette_clear(LodePNGColorMode* info) { if(info->palette) lodepng_free(info->palette); info->palette = 0; info->palettesize = 0; } unsigned lodepng_palette_add(LodePNGColorMode* info, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ - unsigned char* data; - /*the same resize technique as C++ std::vectors is used, and here it's made so that for a palette with - the max of 256 colors, it'll have the exact alloc size*/ - if(!info->palette) /*allocate palette if empty*/ - { - /*room for 256 colors with 4 bytes each*/ - data = (unsigned char*)lodepng_realloc(info->palette, 1024); - if(!data) return 83; /*alloc fail*/ - else info->palette = data; + unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if(!info->palette) /*allocate palette if empty*/ { + lodepng_color_mode_alloc_palette(info); + if(!info->palette) return 83; /*alloc fail*/ + } + if(info->palettesize >= 256) { + return 108; /*too many palette values*/ } info->palette[4 * info->palettesize + 0] = r; info->palette[4 * info->palettesize + 1] = g; @@ -2662,108 +2733,118 @@ unsigned lodepng_palette_add(LodePNGColorMode* info, return 0; } -unsigned lodepng_get_bpp(const LodePNGColorMode* info) -{ - /*calculate bits per pixel out of colortype and bitdepth*/ +/*calculate bits per pixel out of colortype and bitdepth*/ +unsigned lodepng_get_bpp(const LodePNGColorMode* info) { return lodepng_get_bpp_lct(info->colortype, info->bitdepth); } -unsigned lodepng_get_channels(const LodePNGColorMode* info) -{ +unsigned lodepng_get_channels(const LodePNGColorMode* info) { return getNumColorChannels(info->colortype); } -unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) -{ +unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) { return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; } -unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) -{ +unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) { return (info->colortype & 4) != 0; /*4 or 6*/ } -unsigned lodepng_is_palette_type(const LodePNGColorMode* info) -{ +unsigned lodepng_is_palette_type(const LodePNGColorMode* info) { return info->colortype == LCT_PALETTE; } -unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) -{ +unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) { size_t i; - for(i = 0; i != info->palettesize; ++i) - { + for(i = 0; i != info->palettesize; ++i) { if(info->palette[i * 4 + 3] < 255) return 1; } return 0; } -unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) -{ +unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) { return info->key_defined || lodepng_is_alpha_type(info) || lodepng_has_palette_alpha(info); } -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) -{ - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp(color); - size_t n = w * h; - return ((n / 8) * bpp) + ((n & 7) * bpp + 7) / 8; +static size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); + size_t n = (size_t)w * (size_t)h; + return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u; } -size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) -{ - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); - size_t n = w * h; - return ((n / 8) * bpp) + ((n & 7) * bpp + 7) / 8; +size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) { + return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth); } #ifdef LODEPNG_COMPILE_PNG + +/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer, +and in addition has one extra byte per line: the filter byte. So this gives a larger +result than lodepng_get_raw_size. Set h to 1 to get the size of 1 row including filter byte. */ +static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, unsigned bpp) { + /* + 1 for the filter byte, and possibly plus padding bits per line. */ + /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but avoids overflow of w * bpp */ + size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u; + return (size_t)h * line; +} + #ifdef LODEPNG_COMPILE_DECODER -/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer*/ -static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, const LodePNGColorMode* color) -{ - /*will not overflow for any color type if roughly w * h < 268435455*/ - size_t bpp = lodepng_get_bpp(color); - size_t line = ((w / 8) * bpp) + ((w & 7) * bpp + 7) / 8; - return h * line; +/*Safely checks whether size_t overflow can be caused due to amount of pixels. +This check is overcautious rather than precise. If this check indicates no overflow, +you can safely compute in a size_t (but not an unsigned): +-(size_t)w * (size_t)h * 8 +-amount of bytes in IDAT (including filter, padding and Adam7 bytes) +-amount of bytes in raw color model +Returns 1 if overflow possible, 0 if not. +*/ +static int lodepng_pixel_overflow(unsigned w, unsigned h, + const LodePNGColorMode* pngcolor, const LodePNGColorMode* rawcolor) { + size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor)); + size_t numpixels, total; + size_t line; /* bytes per line in worst case */ + + if(lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) return 1; + if(lodepng_mulofl(numpixels, 8, &total)) return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color */ + + /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + 7u) / 8u" */ + if(lodepng_mulofl((size_t)(w / 8u), bpp, &line)) return 1; + if(lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) return 1; + + if(lodepng_addofl(line, 5, &line)) return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst case */ + if(lodepng_mulofl(line, h, &total)) return 1; /* Total bytes in worst case */ + + return 0; /* no overflow */ } #endif /*LODEPNG_COMPILE_DECODER*/ #endif /*LODEPNG_COMPILE_PNG*/ #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static void LodePNGUnknownChunks_init(LodePNGInfo* info) -{ +static void LodePNGUnknownChunks_init(LodePNGInfo* info) { unsigned i; for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0; for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0; } -static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) -{ +static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) { unsigned i; for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]); } -static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) -{ +static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) { unsigned i; LodePNGUnknownChunks_cleanup(dest); - for(i = 0; i != 3; ++i) - { + for(i = 0; i != 3; ++i) { size_t j; dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; dest->unknown_chunks_data[i] = (unsigned char*)lodepng_malloc(src->unknown_chunks_size[i]); if(!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) return 83; /*alloc fail*/ - for(j = 0; j < src->unknown_chunks_size[i]; ++j) - { + for(j = 0; j < src->unknown_chunks_size[i]; ++j) { dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; } } @@ -2773,18 +2854,15 @@ static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* /******************************************************************************/ -static void LodePNGText_init(LodePNGInfo* info) -{ +static void LodePNGText_init(LodePNGInfo* info) { info->text_num = 0; info->text_keys = NULL; info->text_strings = NULL; } -static void LodePNGText_cleanup(LodePNGInfo* info) -{ +static void LodePNGText_cleanup(LodePNGInfo* info) { size_t i; - for(i = 0; i != info->text_num; ++i) - { + for(i = 0; i != info->text_num; ++i) { string_cleanup(&info->text_keys[i]); string_cleanup(&info->text_strings[i]); } @@ -2792,52 +2870,45 @@ static void LodePNGText_cleanup(LodePNGInfo* info) lodepng_free(info->text_strings); } -static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) -{ +static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { size_t i = 0; dest->text_keys = 0; dest->text_strings = 0; dest->text_num = 0; - for(i = 0; i != source->text_num; ++i) - { + for(i = 0; i != source->text_num; ++i) { CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); } return 0; } -void lodepng_clear_text(LodePNGInfo* info) -{ - LodePNGText_cleanup(info); -} - -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) -{ +static unsigned lodepng_add_text_sized(LodePNGInfo* info, const char* key, const char* str, size_t size) { char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1))); char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1))); - if(!new_keys || !new_strings) - { - lodepng_free(new_keys); - lodepng_free(new_strings); - return 83; /*alloc fail*/ - } + + if(new_keys) info->text_keys = new_keys; + if(new_strings) info->text_strings = new_strings; + + if(!new_keys || !new_strings) return 83; /*alloc fail*/ ++info->text_num; - info->text_keys = new_keys; - info->text_strings = new_strings; - - string_init(&info->text_keys[info->text_num - 1]); - string_set(&info->text_keys[info->text_num - 1], key); - - string_init(&info->text_strings[info->text_num - 1]); - string_set(&info->text_strings[info->text_num - 1], str); + info->text_keys[info->text_num - 1] = alloc_string(key); + info->text_strings[info->text_num - 1] = alloc_string_sized(str, size); + if(!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) return 83; /*alloc fail*/ return 0; } +unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) { + return lodepng_add_text_sized(info, key, str, lodepng_strlen(str)); +} + +void lodepng_clear_text(LodePNGInfo* info) { + LodePNGText_cleanup(info); +} + /******************************************************************************/ -static void LodePNGIText_init(LodePNGInfo* info) -{ +static void LodePNGIText_init(LodePNGInfo* info) { info->itext_num = 0; info->itext_keys = NULL; info->itext_langtags = NULL; @@ -2845,11 +2916,9 @@ static void LodePNGIText_init(LodePNGInfo* info) info->itext_strings = NULL; } -static void LodePNGIText_cleanup(LodePNGInfo* info) -{ +static void LodePNGIText_cleanup(LodePNGInfo* info) { size_t i; - for(i = 0; i != info->itext_num; ++i) - { + for(i = 0; i != info->itext_num; ++i) { string_cleanup(&info->itext_keys[i]); string_cleanup(&info->itext_langtags[i]); string_cleanup(&info->itext_transkeys[i]); @@ -2861,67 +2930,85 @@ static void LodePNGIText_cleanup(LodePNGInfo* info) lodepng_free(info->itext_strings); } -static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) -{ +static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { size_t i = 0; dest->itext_keys = 0; dest->itext_langtags = 0; dest->itext_transkeys = 0; dest->itext_strings = 0; dest->itext_num = 0; - for(i = 0; i != source->itext_num; ++i) - { + for(i = 0; i != source->itext_num; ++i) { CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i], source->itext_transkeys[i], source->itext_strings[i])); } return 0; } -void lodepng_clear_itext(LodePNGInfo* info) -{ +void lodepng_clear_itext(LodePNGInfo* info) { LodePNGIText_cleanup(info); } -unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str) -{ +static unsigned lodepng_add_itext_sized(LodePNGInfo* info, const char* key, const char* langtag, + const char* transkey, const char* str, size_t size) { char** new_keys = (char**)(lodepng_realloc(info->itext_keys, sizeof(char*) * (info->itext_num + 1))); char** new_langtags = (char**)(lodepng_realloc(info->itext_langtags, sizeof(char*) * (info->itext_num + 1))); char** new_transkeys = (char**)(lodepng_realloc(info->itext_transkeys, sizeof(char*) * (info->itext_num + 1))); char** new_strings = (char**)(lodepng_realloc(info->itext_strings, sizeof(char*) * (info->itext_num + 1))); - if(!new_keys || !new_langtags || !new_transkeys || !new_strings) - { - lodepng_free(new_keys); - lodepng_free(new_langtags); - lodepng_free(new_transkeys); - lodepng_free(new_strings); - return 83; /*alloc fail*/ - } + + if(new_keys) info->itext_keys = new_keys; + if(new_langtags) info->itext_langtags = new_langtags; + if(new_transkeys) info->itext_transkeys = new_transkeys; + if(new_strings) info->itext_strings = new_strings; + + if(!new_keys || !new_langtags || !new_transkeys || !new_strings) return 83; /*alloc fail*/ ++info->itext_num; - info->itext_keys = new_keys; - info->itext_langtags = new_langtags; - info->itext_transkeys = new_transkeys; - info->itext_strings = new_strings; - string_init(&info->itext_keys[info->itext_num - 1]); - string_set(&info->itext_keys[info->itext_num - 1], key); - - string_init(&info->itext_langtags[info->itext_num - 1]); - string_set(&info->itext_langtags[info->itext_num - 1], langtag); - - string_init(&info->itext_transkeys[info->itext_num - 1]); - string_set(&info->itext_transkeys[info->itext_num - 1], transkey); - - string_init(&info->itext_strings[info->itext_num - 1]); - string_set(&info->itext_strings[info->itext_num - 1], str); + info->itext_keys[info->itext_num - 1] = alloc_string(key); + info->itext_langtags[info->itext_num - 1] = alloc_string(langtag); + info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey); + info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size); return 0; } + +unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, + const char* transkey, const char* str) { + return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str)); +} + +/* same as set but does not delete */ +static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { + if(profile_size == 0) return 100; /*invalid ICC profile size*/ + + info->iccp_name = alloc_string(name); + info->iccp_profile = (unsigned char*)lodepng_malloc(profile_size); + + if(!info->iccp_name || !info->iccp_profile) return 83; /*alloc fail*/ + + lodepng_memcpy(info->iccp_profile, profile, profile_size); + info->iccp_profile_size = profile_size; + + return 0; /*ok*/ +} + +unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { + if(info->iccp_name) lodepng_clear_icc(info); + info->iccp_defined = 1; + + return lodepng_assign_icc(info, name, profile, profile_size); +} + +void lodepng_clear_icc(LodePNGInfo* info) { + string_cleanup(&info->iccp_name); + lodepng_free(info->iccp_profile); + info->iccp_profile = NULL; + info->iccp_profile_size = 0; + info->iccp_defined = 0; +} #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -void lodepng_info_init(LodePNGInfo* info) -{ +void lodepng_info_init(LodePNGInfo* info) { lodepng_color_mode_init(&info->color); info->interlace_method = 0; info->compression_method = 0; @@ -2936,31 +3023,41 @@ void lodepng_info_init(LodePNGInfo* info) info->time_defined = 0; info->phys_defined = 0; + info->gama_defined = 0; + info->chrm_defined = 0; + info->srgb_defined = 0; + info->iccp_defined = 0; + info->iccp_name = NULL; + info->iccp_profile = NULL; + LodePNGUnknownChunks_init(info); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } -void lodepng_info_cleanup(LodePNGInfo* info) -{ +void lodepng_info_cleanup(LodePNGInfo* info) { lodepng_color_mode_cleanup(&info->color); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS LodePNGText_cleanup(info); LodePNGIText_cleanup(info); + lodepng_clear_icc(info); + LodePNGUnknownChunks_cleanup(info); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } -unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) -{ +unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) { lodepng_info_cleanup(dest); - *dest = *source; + lodepng_memcpy(dest, source, sizeof(LodePNGInfo)); lodepng_color_mode_init(&dest->color); CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); + if(source->iccp_defined) { + CERROR_TRY_RETURN(lodepng_assign_icc(dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size)); + } LodePNGUnknownChunks_init(dest); CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); @@ -2968,25 +3065,17 @@ unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) return 0; } -void lodepng_info_swap(LodePNGInfo* a, LodePNGInfo* b) -{ - LodePNGInfo temp = *a; - *a = *b; - *b = temp; -} - /* ////////////////////////////////////////////////////////////////////////// */ /*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ -static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) -{ +static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) { unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ unsigned p = index & m; in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ in = in << (bits * (m - p)); - if(p == 0) out[index * bits / 8] = in; - else out[index * bits / 8] |= in; + if(p == 0) out[index * bits / 8u] = in; + else out[index * bits / 8u] |= in; } typedef struct ColorTree ColorTree; @@ -2997,26 +3086,20 @@ This is the data structure used to count the number of unique colors and to get index for a color. It's like an octree, but because the alpha channel is used too, each node has 16 instead of 8 children. */ -struct ColorTree -{ +struct ColorTree { ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/ int index; /*the payload. Only has a meaningful value if this is in the last level*/ }; -static void color_tree_init(ColorTree* tree) -{ - int i; - for(i = 0; i != 16; ++i) tree->children[i] = 0; +static void color_tree_init(ColorTree* tree) { + lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children)); tree->index = -1; } -static void color_tree_cleanup(ColorTree* tree) -{ +static void color_tree_cleanup(ColorTree* tree) { int i; - for(i = 0; i != 16; ++i) - { - if(tree->children[i]) - { + for(i = 0; i != 16; ++i) { + if(tree->children[i]) { color_tree_cleanup(tree->children[i]); lodepng_free(tree->children[i]); } @@ -3024,11 +3107,9 @@ static void color_tree_cleanup(ColorTree* tree) } /*returns -1 if color not present, its index otherwise*/ -static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ +static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { int bit = 0; - for(bit = 0; bit < 8; ++bit) - { + for(bit = 0; bit < 8; ++bit) { int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); if(!tree->children[i]) return -1; else tree = tree->children[i]; @@ -3037,95 +3118,74 @@ static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, uns } #ifdef LODEPNG_COMPILE_ENCODER -static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ +static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { return color_tree_get(tree, r, g, b, a) >= 0; } #endif /*LODEPNG_COMPILE_ENCODER*/ /*color is not allowed to already exist. -Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist")*/ -static void color_tree_add(ColorTree* tree, - unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) -{ +Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist") +Returns error code, or 0 if ok*/ +static unsigned color_tree_add(ColorTree* tree, + unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) { int bit; - for(bit = 0; bit < 8; ++bit) - { + for(bit = 0; bit < 8; ++bit) { int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) - { + if(!tree->children[i]) { tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree)); + if(!tree->children[i]) return 83; /*alloc fail*/ color_tree_init(tree->children[i]); } tree = tree->children[i]; } tree->index = (int)index; + return 0; } /*put a pixel, given its RGBA color, into image of any color type*/ static unsigned rgba8ToPixel(unsigned char* out, size_t i, const LodePNGColorMode* mode, ColorTree* tree /*for palette*/, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ - if(mode->colortype == LCT_GREY) - { - unsigned char grey = r; /*((unsigned short)r + g + b) / 3*/; - if(mode->bitdepth == 8) out[i] = grey; - else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = grey; - else - { - /*take the most significant bits of grey*/ - grey = (grey >> (8 - mode->bitdepth)) & ((1 << mode->bitdepth) - 1); - addColorBits(out, i, mode->bitdepth, grey); + unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if(mode->colortype == LCT_GREY) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if(mode->bitdepth == 8) out[i] = gray; + else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = gray; + else { + /*take the most significant bits of gray*/ + gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u); + addColorBits(out, i, mode->bitdepth, gray); } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { out[i * 3 + 0] = r; out[i * 3 + 1] = g; out[i * 3 + 2] = b; - } - else - { + } else { out[i * 6 + 0] = out[i * 6 + 1] = r; out[i * 6 + 2] = out[i * 6 + 3] = g; out[i * 6 + 4] = out[i * 6 + 5] = b; } - } - else if(mode->colortype == LCT_PALETTE) - { + } else if(mode->colortype == LCT_PALETTE) { int index = color_tree_get(tree, r, g, b, a); if(index < 0) return 82; /*color not in palette*/ if(mode->bitdepth == 8) out[i] = index; else addColorBits(out, i, mode->bitdepth, (unsigned)index); - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - unsigned char grey = r; /*((unsigned short)r + g + b) / 3*/; - if(mode->bitdepth == 8) - { - out[i * 2 + 0] = grey; + } else if(mode->colortype == LCT_GREY_ALPHA) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if(mode->bitdepth == 8) { + out[i * 2 + 0] = gray; out[i * 2 + 1] = a; - } - else if(mode->bitdepth == 16) - { - out[i * 4 + 0] = out[i * 4 + 1] = grey; + } else if(mode->bitdepth == 16) { + out[i * 4 + 0] = out[i * 4 + 1] = gray; out[i * 4 + 2] = out[i * 4 + 3] = a; } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { out[i * 4 + 0] = r; out[i * 4 + 1] = g; out[i * 4 + 2] = b; out[i * 4 + 3] = a; - } - else - { + } else { out[i * 8 + 0] = out[i * 8 + 1] = r; out[i * 8 + 2] = out[i * 8 + 3] = g; out[i * 8 + 4] = out[i * 8 + 5] = b; @@ -3139,33 +3199,25 @@ static unsigned rgba8ToPixel(unsigned char* out, size_t i, /*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ static void rgba16ToPixel(unsigned char* out, size_t i, const LodePNGColorMode* mode, - unsigned short r, unsigned short g, unsigned short b, unsigned short a) -{ - if(mode->colortype == LCT_GREY) - { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/; - out[i * 2 + 0] = (grey >> 8) & 255; - out[i * 2 + 1] = grey & 255; - } - else if(mode->colortype == LCT_RGB) - { + unsigned short r, unsigned short g, unsigned short b, unsigned short a) { + if(mode->colortype == LCT_GREY) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 2 + 0] = (gray >> 8) & 255; + out[i * 2 + 1] = gray & 255; + } else if(mode->colortype == LCT_RGB) { out[i * 6 + 0] = (r >> 8) & 255; out[i * 6 + 1] = r & 255; out[i * 6 + 2] = (g >> 8) & 255; out[i * 6 + 3] = g & 255; out[i * 6 + 4] = (b >> 8) & 255; out[i * 6 + 5] = b & 255; - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/; - out[i * 4 + 0] = (grey >> 8) & 255; - out[i * 4 + 1] = grey & 255; + } else if(mode->colortype == LCT_GREY_ALPHA) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 4 + 0] = (gray >> 8) & 255; + out[i * 4 + 1] = gray & 255; out[i * 4 + 2] = (a >> 8) & 255; out[i * 4 + 3] = a & 255; - } - else if(mode->colortype == LCT_RGBA) - { + } else if(mode->colortype == LCT_RGBA) { out[i * 8 + 0] = (r >> 8) & 255; out[i * 8 + 1] = r & 255; out[i * 8 + 2] = (g >> 8) & 255; @@ -3181,24 +3233,17 @@ static void rgba16ToPixel(unsigned char* out, size_t i, static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a, const unsigned char* in, size_t i, - const LodePNGColorMode* mode) -{ - if(mode->colortype == LCT_GREY) - { - if(mode->bitdepth == 8) - { + const LodePNGColorMode* mode) { + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { *r = *g = *b = in[i]; if(mode->key_defined && *r == mode->key_r) *a = 0; else *a = 255; - } - else if(mode->bitdepth == 16) - { + } else if(mode->bitdepth == 16) { *r = *g = *b = in[i * 2 + 0]; if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; else *a = 255; - } - else - { + } else { unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ size_t j = i * mode->bitdepth; unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); @@ -3206,17 +3251,12 @@ static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, if(mode->key_defined && value == mode->key_r) *a = 0; else *a = 255; } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2]; if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0; else *a = 255; - } - else - { + } else { *r = in[i * 6 + 0]; *g = in[i * 6 + 2]; *b = in[i * 6 + 4]; @@ -3225,56 +3265,33 @@ static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; else *a = 255; } - } - else if(mode->colortype == LCT_PALETTE) - { + } else if(mode->colortype == LCT_PALETTE) { unsigned index; if(mode->bitdepth == 8) index = in[i]; - else - { + else { size_t j = i * mode->bitdepth; index = readBitsFromReversedStream(&j, in, mode->bitdepth); } - - if(index >= mode->palettesize) - { - /*This is an error according to the PNG spec, but common PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - *r = *g = *b = 0; - *a = 255; - } - else - { - *r = mode->palette[index * 4 + 0]; - *g = mode->palette[index * 4 + 1]; - *b = mode->palette[index * 4 + 2]; - *a = mode->palette[index * 4 + 3]; - } - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - if(mode->bitdepth == 8) - { + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + *r = mode->palette[index * 4 + 0]; + *g = mode->palette[index * 4 + 1]; + *b = mode->palette[index * 4 + 2]; + *a = mode->palette[index * 4 + 3]; + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { *r = *g = *b = in[i * 2 + 0]; *a = in[i * 2 + 1]; - } - else - { + } else { *r = *g = *b = in[i * 4 + 0]; *a = in[i * 4 + 2]; } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { *r = in[i * 4 + 0]; *g = in[i * 4 + 1]; *b = in[i * 4 + 2]; *a = in[i * 4 + 3]; - } - else - { + } else { *r = in[i * 8 + 0]; *g = in[i * 8 + 2]; *b = in[i * 8 + 4]; @@ -3285,136 +3302,171 @@ static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, /*Similar to getPixelColorRGBA8, but with all the for loops inside of the color mode test cases, optimized to convert the colors much faster, when converting -to RGBA or RGB with 8 bit per cannel. buffer must be RGBA or RGB output with -enough memory, if has_alpha is true the output is RGBA. mode has the color mode -of the input buffer.*/ -static void getPixelColorsRGBA8(unsigned char* buffer, size_t numpixels, - unsigned has_alpha, const unsigned char* in, - const LodePNGColorMode* mode) -{ - unsigned num_channels = has_alpha ? 4 : 3; +to the common case of RGBA with 8 bit per channel. buffer must be RGBA with +enough memory.*/ +static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char* LODEPNG_RESTRICT in, + const LodePNGColorMode* mode) { + unsigned num_channels = 4; size_t i; - if(mode->colortype == LCT_GREY) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = buffer[1] = buffer[2] = in[i]; - if(has_alpha) buffer[3] = mode->key_defined && in[i] == mode->key_r ? 0 : 255; + buffer[3] = 255; } - } - else if(mode->bitdepth == 16) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + if(mode->key_defined) { + buffer -= numpixels * num_channels; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + if(buffer[0] == mode->key_r) buffer[3] = 0; + } + } + } else if(mode->bitdepth == 16) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - if(has_alpha) buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; + buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; } - } - else - { + } else { unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - if(has_alpha) buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; + buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; } } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 3 + 0]; - buffer[1] = in[i * 3 + 1]; - buffer[2] = in[i * 3 + 2]; - if(has_alpha) buffer[3] = mode->key_defined && buffer[0] == mode->key_r - && buffer[1]== mode->key_g && buffer[2] == mode->key_b ? 0 : 255; + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 3], 3); + buffer[3] = 255; } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + if(mode->key_defined) { + buffer -= numpixels * num_channels; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + if(buffer[0] == mode->key_r && buffer[1]== mode->key_g && buffer[2] == mode->key_b) buffer[3] = 0; + } + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = in[i * 6 + 0]; buffer[1] = in[i * 6 + 2]; buffer[2] = in[i * 6 + 4]; - if(has_alpha) buffer[3] = mode->key_defined + buffer[3] = mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255; } } - } - else if(mode->colortype == LCT_PALETTE) - { - unsigned index; - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - if(mode->bitdepth == 8) index = in[i]; - else index = readBitsFromReversedStream(&j, in, mode->bitdepth); - - if(index >= mode->palettesize) - { - /*This is an error according to the PNG spec, but most PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - buffer[0] = buffer[1] = buffer[2] = 0; - if(has_alpha) buffer[3] = 255; + } else if(mode->colortype == LCT_PALETTE) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); } - else - { - buffer[0] = mode->palette[index * 4 + 0]; - buffer[1] = mode->palette[index * 4 + 1]; - buffer[2] = mode->palette[index * 4 + 2]; - if(has_alpha) buffer[3] = mode->palette[index * 4 + 3]; + } else { + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); } } - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - if(has_alpha) buffer[3] = in[i * 2 + 1]; + buffer[3] = in[i * 2 + 1]; } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - if(has_alpha) buffer[3] = in[i * 4 + 2]; + buffer[3] = in[i * 4 + 2]; } } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 4 + 0]; - buffer[1] = in[i * 4 + 1]; - buffer[2] = in[i * 4 + 2]; - if(has_alpha) buffer[3] = in[i * 4 + 3]; - } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 4); + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 8 + 0]; + buffer[1] = in[i * 8 + 2]; + buffer[2] = in[i * 8 + 4]; + buffer[3] = in[i * 8 + 6]; + } + } + } +} + +/*Similar to getPixelColorsRGBA8, but with 3-channel RGB output.*/ +static void getPixelColorsRGB8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char* LODEPNG_RESTRICT in, + const LodePNGColorMode* mode) { + const unsigned num_channels = 3; + size_t i; + if(mode->colortype == LCT_GREY) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i]; + } + } else if(mode->bitdepth == 16) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2]; + } + } else { + unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; + } + } + } else if(mode->colortype == LCT_RGB) { + if(mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 3); + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 6 + 0]; + buffer[1] = in[i * 6 + 2]; + buffer[2] = in[i * 6 + 4]; + } + } + } else if(mode->colortype == LCT_PALETTE) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } else { + size_t j = 0; + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } + } else if(mode->colortype == LCT_GREY_ALPHA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; + } + } + } else if(mode->colortype == LCT_RGBA) { + if(mode->bitdepth == 8) { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 4], 3); + } + } else { + for(i = 0; i != numpixels; ++i, buffer += num_channels) { buffer[0] = in[i * 8 + 0]; buffer[1] = in[i * 8 + 2]; buffer[2] = in[i * 8 + 4]; - if(has_alpha) buffer[3] = in[i * 8 + 6]; } } } @@ -3423,16 +3475,12 @@ static void getPixelColorsRGBA8(unsigned char* buffer, size_t numpixels, /*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with given color type, but the given color type must be 16-bit itself.*/ static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a, - const unsigned char* in, size_t i, const LodePNGColorMode* mode) -{ - if(mode->colortype == LCT_GREY) - { + const unsigned char* in, size_t i, const LodePNGColorMode* mode) { + if(mode->colortype == LCT_GREY) { *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; else *a = 65535; - } - else if(mode->colortype == LCT_RGB) - { + } else if(mode->colortype == LCT_RGB) { *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; @@ -3441,14 +3489,10 @@ static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned s && 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; else *a = 65535; - } - else if(mode->colortype == LCT_GREY_ALPHA) - { + } else if(mode->colortype == LCT_GREY_ALPHA) { *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; - } - else if(mode->colortype == LCT_RGBA) - { + } else if(mode->colortype == LCT_RGBA) { *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; @@ -3458,93 +3502,153 @@ static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned s unsigned lodepng_convert(unsigned char* out, const unsigned char* in, const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h) -{ + unsigned w, unsigned h) { size_t i; ColorTree tree; - size_t numpixels = w * h; + size_t numpixels = (size_t)w * (size_t)h; unsigned error = 0; - if(lodepng_color_mode_equal(mode_out, mode_in)) - { + if(mode_in->colortype == LCT_PALETTE && !mode_in->palette) { + return 107; /* error: must provide palette if input mode is palette */ + } + + if(lodepng_color_mode_equal(mode_out, mode_in)) { size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - for(i = 0; i != numbytes; ++i) out[i] = in[i]; + lodepng_memcpy(out, in, numbytes); return 0; } - if(mode_out->colortype == LCT_PALETTE) - { + if(mode_out->colortype == LCT_PALETTE) { size_t palettesize = mode_out->palettesize; const unsigned char* palette = mode_out->palette; - size_t palsize = 1u << mode_out->bitdepth; + size_t palsize = (size_t)1u << mode_out->bitdepth; /*if the user specified output palette but did not give the values, assume they want the values of the input color type (assuming that one is palette). Note that we never create a new palette ourselves.*/ - if(palettesize == 0) - { + if(palettesize == 0) { palettesize = mode_in->palettesize; palette = mode_in->palette; + /*if the input was also palette with same bitdepth, then the color types are also + equal, so copy literally. This to preserve the exact indices that were in the PNG + even in case there are duplicate colors in the palette.*/ + if(mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) { + size_t numbytes = lodepng_get_raw_size(w, h, mode_in); + lodepng_memcpy(out, in, numbytes); + return 0; + } } if(palettesize < palsize) palsize = palettesize; color_tree_init(&tree); - for(i = 0; i != palsize; ++i) - { + for(i = 0; i != palsize; ++i) { const unsigned char* p = &palette[i * 4]; - color_tree_add(&tree, p[0], p[1], p[2], p[3], i); + error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i); + if(error) break; } } - if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) - { - for(i = 0; i != numpixels; ++i) - { - unsigned short r = 0, g = 0, b = 0, a = 0; - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - rgba16ToPixel(out, i, mode_out, r, g, b, a); - } - } - else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) - { - getPixelColorsRGBA8(out, numpixels, 1, in, mode_in); - } - else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) - { - getPixelColorsRGBA8(out, numpixels, 0, in, mode_in); - } - else - { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); - if (error) break; + if(!error) { + if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { + for(i = 0; i != numpixels; ++i) { + unsigned short r = 0, g = 0, b = 0, a = 0; + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + rgba16ToPixel(out, i, mode_out, r, g, b, a); + } + } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { + getPixelColorsRGBA8(out, numpixels, in, mode_in); + } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { + getPixelColorsRGB8(out, numpixels, in, mode_in); + } else { + unsigned char r = 0, g = 0, b = 0, a = 0; + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); + if(error) break; + } } } - if(mode_out->colortype == LCT_PALETTE) - { + if(mode_out->colortype == LCT_PALETTE) { color_tree_cleanup(&tree); } return error; } + +/* Converts a single rgb color without alpha from one type to another, color bits truncated to +their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow +function, do not use to process all pixels of an image. Alpha channel not supported on purpose: +this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the +specification it looks like bKGD should ignore the alpha values of the palette since it can use +any palette index but doesn't have an alpha channel. Idem with ignoring color key. */ +unsigned lodepng_convert_rgb( + unsigned* r_out, unsigned* g_out, unsigned* b_out, + unsigned r_in, unsigned g_in, unsigned b_in, + const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in) { + unsigned r = 0, g = 0, b = 0; + unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ + unsigned shift = 16 - mode_out->bitdepth; + + if(mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) { + r = g = b = r_in * mul; + } else if(mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) { + r = r_in * mul; + g = g_in * mul; + b = b_in * mul; + } else if(mode_in->colortype == LCT_PALETTE) { + if(r_in >= mode_in->palettesize) return 82; + r = mode_in->palette[r_in * 4 + 0] * 257u; + g = mode_in->palette[r_in * 4 + 1] * 257u; + b = mode_in->palette[r_in * 4 + 2] * 257u; + } else { + return 31; + } + + /* now convert to output format */ + if(mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) { + *r_out = r >> shift ; + } else if(mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) { + *r_out = r >> shift ; + *g_out = g >> shift ; + *b_out = b >> shift ; + } else if(mode_out->colortype == LCT_PALETTE) { + unsigned i; + /* a 16-bit color cannot be in the palette */ + if((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) return 82; + for(i = 0; i < mode_out->palettesize; i++) { + unsigned j = i * 4; + if((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] && + (b >> 8) == mode_out->palette[j + 2]) { + *r_out = i; + return 0; + } + } + return 82; + } else { + return 31; + } + + return 0; +} + #ifdef LODEPNG_COMPILE_ENCODER -void lodepng_color_profile_init(LodePNGColorProfile* profile) -{ - profile->colored = 0; - profile->key = 0; - profile->key_r = profile->key_g = profile->key_b = 0; - profile->alpha = 0; - profile->numcolors = 0; - profile->bits = 1; +void lodepng_color_stats_init(LodePNGColorStats* stats) { + /*stats*/ + stats->colored = 0; + stats->key = 0; + stats->key_r = stats->key_g = stats->key_b = 0; + stats->alpha = 0; + stats->numcolors = 0; + stats->bits = 1; + stats->numpixels = 0; + /*settings*/ + stats->allow_palette = 1; + stats->allow_greyscale = 1; } /*function used for debug purposes with C++*/ -/*void printColorProfile(LodePNGColorProfile* p) -{ +/*void printColorStats(LodePNGColorStats* p) { std::cout << "colored: " << (int)p->colored << ", "; std::cout << "key: " << (int)p->key << ", "; std::cout << "key_r: " << (int)p->key_r << ", "; @@ -3556,243 +3660,260 @@ void lodepng_color_profile_init(LodePNGColorProfile* profile) }*/ /*Returns how many bits needed to represent given value (max 8 bit)*/ -static unsigned getValueRequiredBits(unsigned char value) -{ +static unsigned getValueRequiredBits(unsigned char value) { if(value == 0 || value == 255) return 1; /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ if(value % 17 == 0) return value % 85 == 0 ? 2 : 4; return 8; } -/*profile must already have been inited with mode. -It's ok to set some parameters of profile to done already.*/ -unsigned lodepng_get_color_profile(LodePNGColorProfile* profile, - const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* mode) -{ - unsigned error = 0; +/*stats must already have been inited. */ +unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, + const unsigned char* in, unsigned w, unsigned h, + const LodePNGColorMode* mode_in) { size_t i; ColorTree tree; - size_t numpixels = w * h; + size_t numpixels = (size_t)w * (size_t)h; + unsigned error = 0; - unsigned colored_done = lodepng_is_greyscale_type(mode) ? 1 : 0; - unsigned alpha_done = lodepng_can_have_alpha(mode) ? 0 : 1; + /* mark things as done already if it would be impossible to have a more expensive case */ + unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0; + unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1; unsigned numcolors_done = 0; - unsigned bpp = lodepng_get_bpp(mode); - unsigned bits_done = bpp == 1 ? 1 : 0; + unsigned bpp = lodepng_get_bpp(mode_in); + unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0; + unsigned sixteen = 0; /* whether the input image is 16 bit */ unsigned maxnumcolors = 257; - unsigned sixteen = 0; - if(bpp <= 8) maxnumcolors = bpp == 1 ? 2 : (bpp == 2 ? 4 : (bpp == 4 ? 16 : 256)); + if(bpp <= 8) maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp)); + + stats->numpixels += numpixels; + + /*if palette not allowed, no need to compute numcolors*/ + if(!stats->allow_palette) numcolors_done = 1; color_tree_init(&tree); + /*If the stats was already filled in from previous data, fill its palette in tree + and mark things as done already if we know they are the most expensive case already*/ + if(stats->alpha) alpha_done = 1; + if(stats->colored) colored_done = 1; + if(stats->bits == 16) numcolors_done = 1; + if(stats->bits >= bpp) bits_done = 1; + if(stats->numcolors >= maxnumcolors) numcolors_done = 1; + + if(!numcolors_done) { + for(i = 0; i < stats->numcolors; i++) { + const unsigned char* color = &stats->palette[i * 4]; + error = color_tree_add(&tree, color[0], color[1], color[2], color[3], i); + if(error) goto cleanup; + } + } + /*Check if the 16-bit input is truly 16-bit*/ - if(mode->bitdepth == 16) - { - unsigned short r, g, b, a; - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); + if(mode_in->bitdepth == 16 && !sixteen) { + unsigned short r = 0, g = 0, b = 0, a = 0; + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); if((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || - (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ - { + (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ { + stats->bits = 16; sixteen = 1; + bits_done = 1; + numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ break; } } } - if(sixteen) - { + if(sixteen) { unsigned short r = 0, g = 0, b = 0, a = 0; - profile->bits = 16; - bits_done = numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - if(!colored_done && (r != g || r != b)) - { - profile->colored = 1; + if(!colored_done && (r != g || r != b)) { + stats->colored = 1; colored_done = 1; } - if(!alpha_done) - { - unsigned matchkey = (r == profile->key_r && g == profile->key_g && b == profile->key_b); - if(a != 65535 && (a != 0 || (profile->key && !matchkey))) - { - profile->alpha = 1; - profile->key = 0; + if(!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if(a != 65535 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; alpha_done = 1; - } - else if(a == 0 && !profile->alpha && !profile->key) - { - profile->key = 1; - profile->key_r = r; - profile->key_g = g; - profile->key_b = b; - } - else if(a == 65535 && profile->key && matchkey) - { + } else if(a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if(a == 65535 && stats->key && matchkey) { /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - profile->key = 0; + stats->alpha = 1; + stats->key = 0; alpha_done = 1; } } if(alpha_done && numcolors_done && colored_done && bits_done) break; } - if(profile->key && !profile->alpha) - { - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode); - if(a != 0 && r == profile->key_r && g == profile->key_g && b == profile->key_b) - { + if(stats->key && !stats->alpha) { + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - profile->key = 0; + stats->alpha = 1; + stats->key = 0; alpha_done = 1; } } } - } - else /* < 16-bit */ - { + } else /* < 16-bit */ { unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode); + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - if(!bits_done && profile->bits < 8) - { - /*only r is checked, < 8 bits is only relevant for greyscale*/ + if(!bits_done && stats->bits < 8) { + /*only r is checked, < 8 bits is only relevant for grayscale*/ unsigned bits = getValueRequiredBits(r); - if(bits > profile->bits) profile->bits = bits; + if(bits > stats->bits) stats->bits = bits; } - bits_done = (profile->bits >= bpp); + bits_done = (stats->bits >= bpp); - if(!colored_done && (r != g || r != b)) - { - profile->colored = 1; + if(!colored_done && (r != g || r != b)) { + stats->colored = 1; colored_done = 1; - if(profile->bits < 8) profile->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ + if(stats->bits < 8) stats->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ } - if(!alpha_done) - { - unsigned matchkey = (r == profile->key_r && g == profile->key_g && b == profile->key_b); - if(a != 255 && (a != 0 || (profile->key && !matchkey))) - { - profile->alpha = 1; - profile->key = 0; + if(!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if(a != 255 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; alpha_done = 1; - if(profile->bits < 8) profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - else if(a == 0 && !profile->alpha && !profile->key) - { - profile->key = 1; - profile->key_r = r; - profile->key_g = g; - profile->key_b = b; - } - else if(a == 255 && profile->key && matchkey) - { + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + } else if(a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if(a == 255 && stats->key && matchkey) { /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - profile->key = 0; + stats->alpha = 1; + stats->key = 0; alpha_done = 1; - if(profile->bits < 8) profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ } } - if(!numcolors_done) - { - if(!color_tree_has(&tree, r, g, b, a)) - { - color_tree_add(&tree, r, g, b, a, profile->numcolors); - if(profile->numcolors < 256) - { - unsigned char* p = profile->palette; - unsigned n = profile->numcolors; + if(!numcolors_done) { + if(!color_tree_has(&tree, r, g, b, a)) { + error = color_tree_add(&tree, r, g, b, a, stats->numcolors); + if(error) goto cleanup; + if(stats->numcolors < 256) { + unsigned char* p = stats->palette; + unsigned n = stats->numcolors; p[n * 4 + 0] = r; p[n * 4 + 1] = g; p[n * 4 + 2] = b; p[n * 4 + 3] = a; } - ++profile->numcolors; - numcolors_done = profile->numcolors >= maxnumcolors; + ++stats->numcolors; + numcolors_done = stats->numcolors >= maxnumcolors; } } if(alpha_done && numcolors_done && colored_done && bits_done) break; } - if(profile->key && !profile->alpha) - { - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode); - if(a != 0 && r == profile->key_r && g == profile->key_g && b == profile->key_b) - { + if(stats->key && !stats->alpha) { + for(i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { /* Color key cannot be used if an opaque pixel also has that RGB color. */ - profile->alpha = 1; - profile->key = 0; + stats->alpha = 1; + stats->key = 0; alpha_done = 1; - if(profile->bits < 8) profile->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ } } } - /*make the profile's key always 16-bit for consistency - repeat each byte twice*/ - profile->key_r += (profile->key_r << 8); - profile->key_g += (profile->key_g << 8); - profile->key_b += (profile->key_b << 8); + /*make the stats's key always 16-bit for consistency - repeat each byte twice*/ + stats->key_r += (stats->key_r << 8); + stats->key_g += (stats->key_g << 8); + stats->key_b += (stats->key_b << 8); } +cleanup: color_tree_cleanup(&tree); return error; } -/*Automatically chooses color type that gives smallest amount of bits in the -output image, e.g. grey if there are only greyscale pixels, palette if there -are less than 256 colors, ... -Updates values of mode with a potentially smaller color model. mode_out should -contain the user chosen color model, but will be overwritten with the new chosen one.*/ -unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out, - const unsigned char* image, unsigned w, unsigned h, - const LodePNGColorMode* mode_in) -{ - LodePNGColorProfile prof; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +/*Adds a single color to the color stats. The stats must already have been inited. The color must be given as 16-bit +(with 2 bytes repeating for 8-bit and 65535 for opaque alpha channel). This function is expensive, do not call it for +all pixels of an image but only for a few additional values. */ +static unsigned lodepng_color_stats_add(LodePNGColorStats* stats, + unsigned r, unsigned g, unsigned b, unsigned a) { unsigned error = 0; - unsigned i, n, palettebits, palette_ok; + unsigned char image[8]; + LodePNGColorMode mode; + lodepng_color_mode_init(&mode); + image[0] = r >> 8; image[1] = r; image[2] = g >> 8; image[3] = g; + image[4] = b >> 8; image[5] = b; image[6] = a >> 8; image[7] = a; + mode.bitdepth = 16; + mode.colortype = LCT_RGBA; + error = lodepng_compute_color_stats(stats, image, 1, 1, &mode); + lodepng_color_mode_cleanup(&mode); + return error; +} +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + +/*Computes a minimal PNG color model that can contain all colors as indicated by the stats. +The stats should be computed with lodepng_compute_color_stats. +mode_in is raw color profile of the image the stats were computed on, to copy palette order from when relevant. +Minimal PNG color model means the color type and bit depth that gives smallest amount of bits in the output image, +e.g. gray if only grayscale pixels, palette if less than 256 colors, color key if only single transparent color, ... +This is used if auto_convert is enabled (it is by default). +*/ +static unsigned auto_choose_color(LodePNGColorMode* mode_out, + const LodePNGColorMode* mode_in, + const LodePNGColorStats* stats) { + unsigned error = 0; + unsigned palettebits; + size_t i, n; + size_t numpixels = stats->numpixels; + unsigned palette_ok, gray_ok; + + unsigned alpha = stats->alpha; + unsigned key = stats->key; + unsigned bits = stats->bits; - lodepng_color_profile_init(&prof); - error = lodepng_get_color_profile(&prof, image, w, h, mode_in); - if(error) return error; mode_out->key_defined = 0; - if(prof.key && w * h <= 16) - { - prof.alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ - prof.key = 0; - if(prof.bits < 8) prof.bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ + if(key && numpixels <= 16) { + alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ + key = 0; + if(bits < 8) bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ } - n = prof.numcolors; - palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); - palette_ok = n <= 256 && prof.bits <= 8; - if(w * h < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ - if(!prof.colored && prof.bits <= palettebits) palette_ok = 0; /*grey is less overhead*/ - if(palette_ok) - { - unsigned char* p = prof.palette; + gray_ok = !stats->colored; + if(!stats->allow_greyscale) gray_ok = 0; + if(!gray_ok && bits < 8) bits = 8; + + n = stats->numcolors; + palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); + palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/ + if(numpixels < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ + if(gray_ok && !alpha && bits <= palettebits) palette_ok = 0; /*gray is less overhead*/ + if(!stats->allow_palette) palette_ok = 0; + + if(palette_ok) { + const unsigned char* p = stats->palette; lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ - for(i = 0; i != prof.numcolors; ++i) - { + for(i = 0; i != stats->numcolors; ++i) { error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); if(error) break; } @@ -3801,25 +3922,20 @@ unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out, mode_out->bitdepth = palettebits; if(mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize - && mode_in->bitdepth == mode_out->bitdepth) - { + && mode_in->bitdepth == mode_out->bitdepth) { /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/ lodepng_color_mode_cleanup(mode_out); lodepng_color_mode_copy(mode_out, mode_in); } - } - else /*8-bit or 16-bit per channel*/ - { - mode_out->bitdepth = prof.bits; - mode_out->colortype = prof.alpha ? (prof.colored ? LCT_RGBA : LCT_GREY_ALPHA) - : (prof.colored ? LCT_RGB : LCT_GREY); - - if(prof.key) - { - unsigned mask = (1u << mode_out->bitdepth) - 1u; /*profile always uses 16-bit, mask converts it*/ - mode_out->key_r = prof.key_r & mask; - mode_out->key_g = prof.key_g & mask; - mode_out->key_b = prof.key_b & mask; + } else /*8-bit or 16-bit per channel*/ { + mode_out->bitdepth = bits; + mode_out->colortype = alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA) + : (gray_ok ? LCT_GREY : LCT_RGB); + if(key) { + unsigned mask = (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/ + mode_out->key_r = stats->key_r & mask; + mode_out->key_g = stats->key_g & mask; + mode_out->key_b = stats->key_b & mask; mode_out->key_defined = 1; } } @@ -3830,19 +3946,17 @@ unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out, #endif /* #ifdef LODEPNG_COMPILE_ENCODER */ /* -Paeth predicter, used by PNG filter type 4 +Paeth predictor, used by PNG filter type 4 The parameters are of type short, but should come from unsigned chars, the shorts are only needed to make the paeth calculation correct. */ -static unsigned char paethPredictor(short a, short b, short c) -{ - short pa = abs(b - c); - short pb = abs(a - c); - short pc = abs(a + b - c - c); - - if(pc < pa && pc < pb) return (unsigned char)c; - else if(pb < pa) return (unsigned char)b; - else return (unsigned char)a; +static unsigned char paethPredictor(short a, short b, short c) { + short pa = LODEPNG_ABS(b - c); + short pb = LODEPNG_ABS(a - c); + short pc = LODEPNG_ABS(a + b - c - c); + /* return input value associated with smallest of pa, pb, pc (with certain priority if equal) */ + if(pb < pa) { a = b; pa = pb; } + return (pc < pa) ? c : a; } /*shared values used by multiple Adam7 related functions*/ @@ -3868,14 +3982,12 @@ bpp: bits per pixel end at a full byte */ static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], - size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) -{ + size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) { /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ unsigned i; /*calculate width and height in pixels of each pass*/ - for(i = 0; i != 7; ++i) - { + for(i = 0; i != 7; ++i) { passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; if(passw[i] == 0) passh[i] = 0; @@ -3883,15 +3995,14 @@ static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t fil } filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; - for(i = 0; i != 7; ++i) - { + for(i = 0; i != 7; ++i) { /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ filter_passstart[i + 1] = filter_passstart[i] - + ((passw[i] && passh[i]) ? passh[i] * (1 + (passw[i] * bpp + 7) / 8) : 0); + + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0); /*bits padded if needed to fill full byte at end of each scanline*/ - padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7) / 8); + padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u); /*only padded at end of reduced image*/ - passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7) / 8; + passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u; } } @@ -3903,60 +4014,51 @@ static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t fil /*read the information from the header and store it in the LodePNGInfo. return value is error*/ unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) -{ + const unsigned char* in, size_t insize) { + unsigned width, height; LodePNGInfo* info = &state->info_png; - if(insize == 0 || in == 0) - { + if(insize == 0 || in == 0) { CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ } - if(insize < 33) - { + if(insize < 33) { CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ } /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ + /* TODO: remove this. One should use a new LodePNGState for new sessions */ lodepng_info_cleanup(info); lodepng_info_init(info); if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 - || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) - { + || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) { CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ } - if(lodepng_chunk_length(in + 8) != 13) - { + if(lodepng_chunk_length(in + 8) != 13) { CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ } - if(!lodepng_chunk_type_equals(in + 8, "IHDR")) - { + if(!lodepng_chunk_type_equals(in + 8, "IHDR")) { CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ } /*read the values given in the header*/ - *w = lodepng_read32bitInt(&in[16]); - *h = lodepng_read32bitInt(&in[20]); + width = lodepng_read32bitInt(&in[16]); + height = lodepng_read32bitInt(&in[20]); + /*TODO: remove the undocumented feature that allows to give null pointers to width or height*/ + if(w) *w = width; + if(h) *h = height; info->color.bitdepth = in[24]; info->color.colortype = (LodePNGColorType)in[25]; info->compression_method = in[26]; info->filter_method = in[27]; info->interlace_method = in[28]; - if(*w == 0 || *h == 0) - { - CERROR_RETURN_ERROR(state->error, 93); - } - - if(!state->decoder.ignore_crc) - { - unsigned CRC = lodepng_read32bitInt(&in[29]); - unsigned checksum = lodepng_crc32(&in[12], 17); - if(CRC != checksum) - { - CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ - } - } + /*errors returned only after the parsing so other values are still output*/ + /*error: invalid image size*/ + if(width == 0 || height == 0) CERROR_RETURN_ERROR(state->error, 93); + /*error: invalid colortype or bitdepth combination*/ + state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); + if(state->error) return state->error; /*error: only compression method 0 is allowed in the specification*/ if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32); /*error: only filter method 0 is allowed in the specification*/ @@ -3964,13 +4066,19 @@ unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, /*error: only interlace methods 0 and 1 exist in the specification*/ if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34); - state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); + if(!state->decoder.ignore_crc) { + unsigned CRC = lodepng_read32bitInt(&in[29]); + unsigned checksum = lodepng_crc32(&in[12], 17); + if(CRC != checksum) { + CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ + } + } + return state->error; } static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, - size_t bytewidth, unsigned char filterType, size_t length) -{ + size_t bytewidth, unsigned char filterType, size_t length) { /* For PNG filter method 0 unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, @@ -3981,8 +4089,7 @@ static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scan */ size_t i; - switch(filterType) - { + switch(filterType) { case 0: for(i = 0; i != length; ++i) recon[i] = scanline[i]; break; @@ -3991,59 +4098,83 @@ static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scan for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth]; break; case 2: - if(precon) - { + if(precon) { for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; - } - else - { + } else { for(i = 0; i != length; ++i) recon[i] = scanline[i]; } break; case 3: - if(precon) - { - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1); - for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1); - } - else - { + if(precon) { + for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u); + for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1u); + } else { for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1); + for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1u); } break; case 4: - if(precon) - { - for(i = 0; i != bytewidth; ++i) - { + if(precon) { + for(i = 0; i != bytewidth; ++i) { recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ } - for(i = bytewidth; i < length; ++i) - { + + /* Unroll independent paths of the paeth predictor. A 6x and 8x version would also be possible but that + adds too much code. Whether this actually speeds anything up at all depends on compiler and settings. */ + if(bytewidth >= 4) { + for(; i + 3 < length; i += 4) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], s3 = scanline[i + 3]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], r3 = recon[j + 3]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], p3 = precon[i + 3]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2], q3 = precon[j + 3]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + recon[i + 2] = s2 + paethPredictor(r2, p2, q2); + recon[i + 3] = s3 + paethPredictor(r3, p3, q3); + } + } else if(bytewidth >= 3) { + for(; i + 2 < length; i += 3) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + recon[i + 2] = s2 + paethPredictor(r2, p2, q2); + } + } else if(bytewidth >= 2) { + for(; i + 1 < length; i += 2) { + size_t j = i - bytewidth; + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1]; + unsigned char q0 = precon[j + 0], q1 = precon[j + 1]; + recon[i + 0] = s0 + paethPredictor(r0, p0, q0); + recon[i + 1] = s1 + paethPredictor(r1, p1, q1); + } + } + + for(; i != length; ++i) { recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); } - } - else - { - for(i = 0; i != bytewidth; ++i) - { + } else { + for(i = 0; i != bytewidth; ++i) { recon[i] = scanline[i]; } - for(i = bytewidth; i < length; ++i) - { + for(i = bytewidth; i < length; ++i) { /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/ recon[i] = (scanline[i] + recon[i - bytewidth]); } } break; - default: return 36; /*error: unexisting filter type given*/ + default: return 36; /*error: invalid filter type given*/ } return 0; } -static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) -{ +static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { /* For PNG filter method 0 this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) @@ -4056,11 +4187,11 @@ static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w unsigned char* prevline = 0; /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7) / 8; - size_t linebytes = (w * bpp + 7) / 8; + size_t bytewidth = (bpp + 7u) / 8u; + /*the width of a scanline in bytes, not including the filter type*/ + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; - for(y = 0; y < h; ++y) - { + for(y = 0; y < h; ++y) { size_t outindex = linebytes * y; size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ unsigned char filterType = in[inindex]; @@ -4084,50 +4215,40 @@ out must be big enough AND must be 0 everywhere if bpp < 8 in the current implem (because that's likely a little bit faster) NOTE: comments about padding bits are only relevant if bpp < 8 */ -static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) -{ +static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; unsigned i; Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - if(bpp >= 8) - { - for(i = 0; i != 7; ++i) - { + if(bpp >= 8) { + for(i = 0; i != 7; ++i) { unsigned x, y, b; - size_t bytewidth = bpp / 8; + size_t bytewidth = bpp / 8u; for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { + for(x = 0; x < passw[i]; ++x) { size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; - size_t pixeloutstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - for(b = 0; b < bytewidth; ++b) - { + size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w + + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bytewidth; + for(b = 0; b < bytewidth; ++b) { out[pixeloutstart + b] = in[pixelinstart + b]; } } } - } - else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ - { - for(i = 0; i != 7; ++i) - { + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { + for(i = 0; i != 7; ++i) { unsigned x, y, b; unsigned ilinebits = bpp * passw[i]; unsigned olinebits = bpp * w; size_t obp, ibp; /*bit pointers (for out and in buffer)*/ for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { + for(x = 0; x < passw[i]; ++x) { ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - obp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - for(b = 0; b < bpp; ++b) - { + obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp; + for(b = 0; b < bpp; ++b) { unsigned char bit = readBitFromReversedStream(&ibp, in); - /*note that this function assumes the out buffer is completely 0, use setBitOfReversedStream otherwise*/ - setBitOfReversedStream0(&obp, out, bit); + setBitOfReversedStream(&obp, out, bit); } } } @@ -4135,8 +4256,7 @@ static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsig } static void removePaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) -{ + size_t olinebits, size_t ilinebits, unsigned h) { /* After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers @@ -4149,11 +4269,9 @@ static void removePaddingBits(unsigned char* out, const unsigned char* in, unsigned y; size_t diff = ilinebits - olinebits; size_t ibp = 0, obp = 0; /*input and output bit pointers*/ - for(y = 0; y < h; ++y) - { + for(y = 0; y < h; ++y) { size_t x; - for(x = 0; x < olinebits; ++x) - { + for(x = 0; x < olinebits; ++x) { unsigned char bit = readBitFromReversedStream(&ibp, in); setBitOfReversedStream(&obp, out, bit); } @@ -4165,46 +4283,39 @@ static void removePaddingBits(unsigned char* out, const unsigned char* in, the IDAT chunks (with filter index bytes and possible padding bits) return value is error*/ static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, - unsigned w, unsigned h, const LodePNGInfo* info_png) -{ + unsigned w, unsigned h, const LodePNGInfo* info_png) { /* This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= posible extra bits per scanline if bpp < 8) + *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8) *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace NOTE: the in buffer will be overwritten with intermediate data! */ unsigned bpp = lodepng_get_bpp(&info_png->color); if(bpp == 0) return 31; /*error: invalid colortype*/ - if(info_png->interlace_method == 0) - { - if(bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8) - { + if(info_png->interlace_method == 0) { + if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); - removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h); + removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h); } /*we can immediately filter into the out buffer, no other steps needed*/ else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); - } - else /*interlace_method is 1 (Adam7)*/ - { + } else /*interlace_method is 1 (Adam7)*/ { unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; unsigned i; Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - for(i = 0; i != 7; ++i) - { + for(i = 0; i != 7; ++i) { CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, move bytes instead of bits or move not at all*/ - if(bpp < 8) - { + if(bpp < 8) { /*remove padding bits in scanlines; after this there still may be padding bits between the different reduced images: each reduced image still starts nicely at a byte*/ removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, - ((passw[i] * bpp + 7) / 8) * 8, passh[i]); + ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]); } } @@ -4214,21 +4325,17 @@ static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, return 0; } -static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) -{ +static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { unsigned pos = 0, i; - if(color->palette) lodepng_free(color->palette); - color->palettesize = chunkLength / 3; - color->palette = (unsigned char*)lodepng_malloc(4 * color->palettesize); - if(!color->palette && color->palettesize) - { + color->palettesize = chunkLength / 3u; + if(color->palettesize == 0 || color->palettesize > 256) return 38; /*error: palette too small or big*/ + lodepng_color_mode_alloc_palette(color); + if(!color->palette && color->palettesize) { color->palettesize = 0; return 83; /*alloc fail*/ } - if(color->palettesize > 256) return 38; /*error: palette too big*/ - for(i = 0; i != color->palettesize; ++i) - { + for(i = 0; i != color->palettesize; ++i) { color->palette[4 * i + 0] = data[pos++]; /*R*/ color->palette[4 * i + 1] = data[pos++]; /*G*/ color->palette[4 * i + 2] = data[pos++]; /*B*/ @@ -4238,26 +4345,20 @@ static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* dat return 0; /* OK */ } -static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) -{ +static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { unsigned i; - if(color->colortype == LCT_PALETTE) - { + if(color->colortype == LCT_PALETTE) { /*error: more alpha values given than there are palette entries*/ - if(chunkLength > color->palettesize) return 38; + if(chunkLength > color->palettesize) return 39; for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i]; - } - else if(color->colortype == LCT_GREY) - { - /*error: this chunk must be 2 bytes for greyscale image*/ + } else if(color->colortype == LCT_GREY) { + /*error: this chunk must be 2 bytes for grayscale image*/ if(chunkLength != 2) return 30; color->key_defined = 1; color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; - } - else if(color->colortype == LCT_RGB) - { + } else if(color->colortype == LCT_RGB) { /*error: this chunk must be 6 bytes for RGB image*/ if(chunkLength != 6) return 41; @@ -4274,29 +4375,28 @@ static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* dat #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*background color chunk (bKGD)*/ -static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ - if(info->color.colortype == LCT_PALETTE) - { +static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(info->color.colortype == LCT_PALETTE) { /*error: this chunk must be 1 byte for indexed color image*/ if(chunkLength != 1) return 43; + /*error: invalid palette index, or maybe this chunk appeared before PLTE*/ + if(data[0] >= info->color.palettesize) return 103; + info->background_defined = 1; info->background_r = info->background_g = info->background_b = data[0]; - } - else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) - { - /*error: this chunk must be 2 bytes for greyscale image*/ + } else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + /*error: this chunk must be 2 bytes for grayscale image*/ if(chunkLength != 2) return 44; + /*the values are truncated to bitdepth in the PNG file*/ info->background_defined = 1; info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; - } - else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) - { - /*error: this chunk must be 6 bytes for greyscale image*/ + } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + /*error: this chunk must be 6 bytes for grayscale image*/ if(chunkLength != 6) return 45; + /*the values are truncated to bitdepth in the PNG file*/ info->background_defined = 1; info->background_r = 256u * data[0] + data[1]; info->background_g = 256u * data[2] + data[3]; @@ -4307,14 +4407,11 @@ static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, siz } /*text chunk (tEXt)*/ -static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ +static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { unsigned error = 0; char *key = 0, *str = 0; - unsigned i; - while(!error) /*not really a while loop, only used to break on error*/ - { + while(!error) /*not really a while loop, only used to break on error*/ { unsigned length, string2_begin; length = 0; @@ -4326,17 +4423,17 @@ static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, siz key = (char*)lodepng_malloc(length + 1); if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(key, data, length); key[length] = 0; - for(i = 0; i != length; ++i) key[i] = (char)data[i]; string2_begin = length + 1; /*skip keyword null terminator*/ - length = chunkLength < string2_begin ? 0 : chunkLength - string2_begin; + length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin); str = (char*)lodepng_malloc(length + 1); if(!str) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(str, data + string2_begin, length); str[length] = 0; - for(i = 0; i != length; ++i) str[i] = (char)data[string2_begin + i]; error = lodepng_add_text(info, key, str); @@ -4351,19 +4448,15 @@ static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, siz /*compressed text chunk (zTXt)*/ static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings, - const unsigned char* data, size_t chunkLength) -{ + const unsigned char* data, size_t chunkLength) { unsigned error = 0; - unsigned i; unsigned length, string2_begin; char *key = 0; - ucvector decoded; + unsigned char* str = 0; + size_t size = 0; - ucvector_init(&decoded); - - while(!error) /*not really a while loop, only used to break on error*/ - { + while(!error) /*not really a while loop, only used to break on error*/ { for(length = 0; length < chunkLength && data[length] != 0; ++length) ; if(length + 2 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ @@ -4371,47 +4464,40 @@ static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecompressSetting key = (char*)lodepng_malloc(length + 1); if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(key, data, length); key[length] = 0; - for(i = 0; i != length; ++i) key[i] = (char)data[i]; if(data[length + 1] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ string2_begin = length + 2; if(string2_begin > chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - length = chunkLength - string2_begin; + length = (unsigned)chunkLength - string2_begin; /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&decoded.data, &decoded.size, - (unsigned char*)(&data[string2_begin]), + error = zlib_decompress(&str, &size, 0, &data[string2_begin], length, zlibsettings); if(error) break; - ucvector_push_back(&decoded, 0); - - error = lodepng_add_text(info, key, (char*)decoded.data); + error = lodepng_add_text_sized(info, key, (char*)str, size); break; } lodepng_free(key); - ucvector_cleanup(&decoded); + lodepng_free(str); return error; } /*international text chunk (iTXt)*/ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings, - const unsigned char* data, size_t chunkLength) -{ + const unsigned char* data, size_t chunkLength) { unsigned error = 0; unsigned i; unsigned length, begin, compressed; char *key = 0, *langtag = 0, *transkey = 0; - ucvector decoded; - ucvector_init(&decoded); - while(!error) /*not really a while loop, only used to break on error*/ - { + while(!error) /*not really a while loop, only used to break on error*/ { /*Quick check if the chunk length isn't too small. Even without check it'd still fail with other error checks below if it's too short. This just gives a different error code.*/ if(chunkLength < 5) CERROR_BREAK(error, 30); /*iTXt chunk too short*/ @@ -4424,8 +4510,8 @@ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSetting key = (char*)lodepng_malloc(length + 1); if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(key, data, length); key[length] = 0; - for(i = 0; i != length; ++i) key[i] = (char)data[i]; /*read the compression method*/ compressed = data[length + 1]; @@ -4442,8 +4528,8 @@ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSetting langtag = (char*)lodepng_malloc(length + 1); if(!langtag) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(langtag, data + begin, length); langtag[length] = 0; - for(i = 0; i != length; ++i) langtag[i] = (char)data[begin + i]; /*read the transkey*/ begin += length + 1; @@ -4453,33 +4539,25 @@ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSetting transkey = (char*)lodepng_malloc(length + 1); if(!transkey) CERROR_BREAK(error, 83); /*alloc fail*/ + lodepng_memcpy(transkey, data + begin, length); transkey[length] = 0; - for(i = 0; i != length; ++i) transkey[i] = (char)data[begin + i]; /*read the actual text*/ begin += length + 1; - length = chunkLength < begin ? 0 : chunkLength - begin; + length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin; - if(compressed) - { + if(compressed) { + unsigned char* str = 0; + size_t size = 0; /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&decoded.data, &decoded.size, - (unsigned char*)(&data[begin]), + error = zlib_decompress(&str, &size, 0, &data[begin], length, zlibsettings); - if(error) break; - if(decoded.allocsize < decoded.size) decoded.allocsize = decoded.size; - ucvector_push_back(&decoded, 0); + if(!error) error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)str, size); + lodepng_free(str); + } else { + error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)(data + begin), length); } - else - { - if(!ucvector_resize(&decoded, length + 1)) CERROR_BREAK(error, 83 /*alloc fail*/); - - decoded.data[length] = 0; - for(i = 0; i != length; ++i) decoded.data[i] = data[begin + i]; - } - - error = lodepng_add_itext(info, key, langtag, transkey, (char*)decoded.data); break; } @@ -4487,13 +4565,11 @@ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSetting lodepng_free(key); lodepng_free(langtag); lodepng_free(transkey); - ucvector_cleanup(&decoded); return error; } -static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ +static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { if(chunkLength != 7) return 73; /*invalid tIME chunk size*/ info->time_defined = 1; @@ -4507,8 +4583,7 @@ static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, siz return 0; /* OK */ } -static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ +static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/ info->phys_defined = 1; @@ -4518,20 +4593,139 @@ static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, siz return 0; /* OK */ } + +static unsigned readChunk_gAMA(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 4) return 96; /*invalid gAMA chunk size*/ + + info->gama_defined = 1; + info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + + return 0; /* OK */ +} + +static unsigned readChunk_cHRM(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 32) return 97; /*invalid cHRM chunk size*/ + + info->chrm_defined = 1; + info->chrm_white_x = 16777216u * data[ 0] + 65536u * data[ 1] + 256u * data[ 2] + data[ 3]; + info->chrm_white_y = 16777216u * data[ 4] + 65536u * data[ 5] + 256u * data[ 6] + data[ 7]; + info->chrm_red_x = 16777216u * data[ 8] + 65536u * data[ 9] + 256u * data[10] + data[11]; + info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15]; + info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19]; + info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23]; + info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27]; + info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31]; + + return 0; /* OK */ +} + +static unsigned readChunk_sRGB(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { + if(chunkLength != 1) return 98; /*invalid sRGB chunk size (this one is never ignored)*/ + + info->srgb_defined = 1; + info->srgb_intent = data[0]; + + return 0; /* OK */ +} + +static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings, + const unsigned char* data, size_t chunkLength) { + unsigned error = 0; + unsigned i; + size_t size = 0; + + unsigned length, string2_begin; + + info->iccp_defined = 1; + if(info->iccp_name) lodepng_clear_icc(info); + + for(length = 0; length < chunkLength && data[length] != 0; ++length) ; + if(length + 2 >= chunkLength) return 75; /*no null termination, corrupt?*/ + if(length < 1 || length > 79) return 89; /*keyword too short or long*/ + + info->iccp_name = (char*)lodepng_malloc(length + 1); + if(!info->iccp_name) return 83; /*alloc fail*/ + + info->iccp_name[length] = 0; + for(i = 0; i != length; ++i) info->iccp_name[i] = (char)data[i]; + + if(data[length + 1] != 0) return 72; /*the 0 byte indicating compression must be 0*/ + + string2_begin = length + 2; + if(string2_begin > chunkLength) return 75; /*no null termination, corrupt?*/ + + length = (unsigned)chunkLength - string2_begin; + error = zlib_decompress(&info->iccp_profile, &size, 0, + &data[string2_begin], + length, zlibsettings); + info->iccp_profile_size = size; + if(!error && !info->iccp_profile_size) error = 100; /*invalid ICC profile size*/ + return error; +} #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, + const unsigned char* in, size_t insize) { + const unsigned char* chunk = in + pos; + unsigned chunkLength; + const unsigned char* data; + unsigned unhandled = 0; + unsigned error = 0; + + if(pos + 4 > insize) return 30; + chunkLength = lodepng_chunk_length(chunk); + if(chunkLength > 2147483647) return 63; + data = lodepng_chunk_data_const(chunk); + if(data + chunkLength + 4 > in + insize) return 30; + + if(lodepng_chunk_type_equals(chunk, "PLTE")) { + error = readChunk_PLTE(&state->info_png.color, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { + error = readChunk_tRNS(&state->info_png.color, data, chunkLength); +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { + error = readChunk_bKGD(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { + error = readChunk_tEXt(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { + error = readChunk_zTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { + error = readChunk_iTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "tIME")) { + error = readChunk_tIME(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { + error = readChunk_pHYs(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { + error = readChunk_gAMA(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { + error = readChunk_cHRM(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { + error = readChunk_sRGB(&state->info_png, data, chunkLength); + } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { + error = readChunk_iCCP(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else { + /* unhandled chunk is ok (is not an error) */ + unhandled = 1; + } + + if(!error && !unhandled && !state->decoder.ignore_crc) { + if(lodepng_chunk_check_crc(chunk)) return 57; /*invalid CRC*/ + } + + return error; +} + /*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) -{ + const unsigned char* in, size_t insize) { unsigned char IEND = 0; const unsigned char* chunk; - size_t i; - ucvector idat; /*the data from idat chunks*/ - ucvector scanlines; - size_t predict; - size_t numpixels; + unsigned char* idat; /*the data from idat chunks, zlib compressed*/ + size_t idatsize = 0; + unsigned char* scanlines = 0; + size_t scanlines_size = 0, expected_size = 0; size_t outsize = 0; /*for unknown chunk order*/ @@ -4540,129 +4734,129 @@ static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*provide some proper output values if error will happen*/ + + /* safe output values in case error happens */ *out = 0; + *w = *h = 0; state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ if(state->error) return; - numpixels = *w * *h; + if(lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) { + CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/ + } - /*multiplication overflow*/ - if(*h != 0 && numpixels / *h != *w) CERROR_RETURN(state->error, 92); - /*multiplication overflow possible further below. Allows up to 2^31-1 pixel - bytes with 16-bit RGBA, the rest is room for filter bytes.*/ - if(numpixels > 268435455) CERROR_RETURN(state->error, 92); + /*the input filesize is a safe upper bound for the sum of idat chunks size*/ + idat = (unsigned char*)lodepng_malloc(insize); + if(!idat) CERROR_RETURN(state->error, 83); /*alloc fail*/ - ucvector_init(&idat); chunk = &in[33]; /*first byte of the first chunk after the header*/ /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. IDAT data is put at the start of the in buffer*/ - while(!IEND && !state->error) - { + while(!IEND && !state->error) { unsigned chunkLength; const unsigned char* data; /*the data in the chunk*/ /*error: size of the in buffer too small to contain next chunk*/ - if((size_t)((chunk - in) + 12) > insize || chunk < in) CERROR_BREAK(state->error, 30); + if((size_t)((chunk - in) + 12) > insize || chunk < in) { + if(state->decoder.ignore_end) break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 30); + } /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/ chunkLength = lodepng_chunk_length(chunk); /*error: chunk length larger than the max PNG chunk size*/ - if(chunkLength > 2147483647) CERROR_BREAK(state->error, 63); + if(chunkLength > 2147483647) { + if(state->decoder.ignore_end) break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 63); + } - if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) - { + if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) { CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/ } data = lodepng_chunk_data_const(chunk); + unknown = 0; + /*IDAT chunk, containing compressed image data*/ - if(lodepng_chunk_type_equals(chunk, "IDAT")) - { - size_t oldsize = idat.size; - if(!ucvector_resize(&idat, oldsize + chunkLength)) CERROR_BREAK(state->error, 83 /*alloc fail*/); - for(i = 0; i != chunkLength; ++i) idat.data[oldsize + i] = data[i]; + if(lodepng_chunk_type_equals(chunk, "IDAT")) { + size_t newsize; + if(lodepng_addofl(idatsize, chunkLength, &newsize)) CERROR_BREAK(state->error, 95); + if(newsize > insize) CERROR_BREAK(state->error, 95); + lodepng_memcpy(idat + idatsize, data, chunkLength); + idatsize += chunkLength; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS critical_pos = 3; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*IEND chunk*/ - else if(lodepng_chunk_type_equals(chunk, "IEND")) - { + } else if(lodepng_chunk_type_equals(chunk, "IEND")) { + /*IEND chunk*/ IEND = 1; - } - /*palette chunk (PLTE)*/ - else if(lodepng_chunk_type_equals(chunk, "PLTE")) - { + } else if(lodepng_chunk_type_equals(chunk, "PLTE")) { + /*palette chunk (PLTE)*/ state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); if(state->error) break; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS critical_pos = 2; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*palette transparency chunk (tRNS)*/ - else if(lodepng_chunk_type_equals(chunk, "tRNS")) - { + } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { + /*palette transparency chunk (tRNS). Even though this one is an ancillary chunk , it is still compiled + in without 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential color information that + affects the alpha channel of pixels. */ state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); if(state->error) break; - } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*background color chunk (bKGD)*/ - else if(lodepng_chunk_type_equals(chunk, "bKGD")) - { + /*background color chunk (bKGD)*/ + } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { state->error = readChunk_bKGD(&state->info_png, data, chunkLength); if(state->error) break; - } - /*text chunk (tEXt)*/ - else if(lodepng_chunk_type_equals(chunk, "tEXt")) - { - if(state->decoder.read_text_chunks) - { + } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { + /*text chunk (tEXt)*/ + if(state->decoder.read_text_chunks) { state->error = readChunk_tEXt(&state->info_png, data, chunkLength); if(state->error) break; } - } - /*compressed text chunk (zTXt)*/ - else if(lodepng_chunk_type_equals(chunk, "zTXt")) - { - if(state->decoder.read_text_chunks) - { + } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { + /*compressed text chunk (zTXt)*/ + if(state->decoder.read_text_chunks) { state->error = readChunk_zTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); if(state->error) break; } - } - /*international text chunk (iTXt)*/ - else if(lodepng_chunk_type_equals(chunk, "iTXt")) - { - if(state->decoder.read_text_chunks) - { + } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { + /*international text chunk (iTXt)*/ + if(state->decoder.read_text_chunks) { state->error = readChunk_iTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); if(state->error) break; } - } - else if(lodepng_chunk_type_equals(chunk, "tIME")) - { + } else if(lodepng_chunk_type_equals(chunk, "tIME")) { state->error = readChunk_tIME(&state->info_png, data, chunkLength); if(state->error) break; - } - else if(lodepng_chunk_type_equals(chunk, "pHYs")) - { + } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { state->error = readChunk_pHYs(&state->info_png, data, chunkLength); if(state->error) break; - } + } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { + state->error = readChunk_gAMA(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { + state->error = readChunk_cHRM(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { + state->error = readChunk_sRGB(&state->info_png, data, chunkLength); + if(state->error) break; + } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { + state->error = readChunk_iCCP(&state->info_png, &state->decoder.zlibsettings, data, chunkLength); + if(state->error) break; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - else /*it's not an implemented chunk type, so ignore it: skip over the data*/ - { + } else /*it's not an implemented chunk type, so ignore it: skip over the data*/ { /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ - if(!lodepng_chunk_ancillary(chunk)) CERROR_BREAK(state->error, 69); + if(!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) { + CERROR_BREAK(state->error, 69); + } unknown = 1; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(state->decoder.remember_unknown_chunks) - { + if(state->decoder.remember_unknown_chunks) { state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); if(state->error) break; @@ -4670,94 +4864,81 @@ static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } - if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ - { + if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ { if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/ } - if(!IEND) chunk = lodepng_chunk_next_const(chunk); + if(!IEND) chunk = lodepng_chunk_next_const(chunk, in + insize); } - ucvector_init(&scanlines); - /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. - If the decompressed size does not match the prediction, the image must be corrupt.*/ - if(state->info_png.interlace_method == 0) - { - /*The extra *h is added because this are the filter bytes every scanline starts with*/ - predict = lodepng_get_raw_size_idat(*w, *h, &state->info_png.color) + *h; + if(state->info_png.color.colortype == LCT_PALETTE && !state->info_png.color.palette) { + state->error = 106; /* error: PNG file must have PLTE chunk if color type is palette */ } - else - { - /*Adam-7 interlaced: predicted size is the sum of the 7 sub-images sizes*/ - const LodePNGColorMode* color = &state->info_png.color; - predict = 0; - predict += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, color) + ((*h + 7) >> 3); - if(*w > 4) predict += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, color) + ((*h + 7) >> 3); - predict += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, color) + ((*h + 3) >> 3); - if(*w > 2) predict += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, color) + ((*h + 3) >> 2); - predict += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, color) + ((*h + 1) >> 2); - if(*w > 1) predict += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, color) + ((*h + 1) >> 1); - predict += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, color) + ((*h + 0) >> 1); - } - if(!state->error && !ucvector_reserve(&scanlines, predict)) state->error = 83; /*alloc fail*/ - if(!state->error) - { - state->error = zlib_decompress(&scanlines.data, &scanlines.size, idat.data, - idat.size, &state->decoder.zlibsettings); - if(!state->error && scanlines.size != predict) state->error = 91; /*decompressed size doesn't match prediction*/ - } - ucvector_cleanup(&idat); - if(!state->error) - { + if(!state->error) { + /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. + If the decompressed size does not match the prediction, the image must be corrupt.*/ + if(state->info_png.interlace_method == 0) { + size_t bpp = lodepng_get_bpp(&state->info_png.color); + expected_size = lodepng_get_raw_size_idat(*w, *h, bpp); + } else { + size_t bpp = lodepng_get_bpp(&state->info_png.color); + /*Adam-7 interlaced: expected size is the sum of the 7 sub-images sizes*/ + expected_size = 0; + expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp); + if(*w > 4) expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp); + if(*w > 2) expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp); + if(*w > 1) expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp); + } + + state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, &state->decoder.zlibsettings); + } + if(!state->error && scanlines_size != expected_size) state->error = 91; /*decompressed size doesn't match prediction*/ + lodepng_free(idat); + + if(!state->error) { outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); *out = (unsigned char*)lodepng_malloc(outsize); if(!*out) state->error = 83; /*alloc fail*/ } - if(!state->error) - { - for(i = 0; i < outsize; i++) (*out)[i] = 0; - state->error = postProcessScanlines(*out, scanlines.data, *w, *h, &state->info_png); + if(!state->error) { + lodepng_memset(*out, 0, outsize); + state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png); } - ucvector_cleanup(&scanlines); + lodepng_free(scanlines); } unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) -{ + const unsigned char* in, size_t insize) { *out = 0; decodeGeneric(out, w, h, state, in, insize); if(state->error) return state->error; - if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) - { + if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { /*same color type, no copying or converting of data needed*/ /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype the raw image has to the end user*/ - if(!state->decoder.color_convert) - { + if(!state->decoder.color_convert) { state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); if(state->error) return state->error; } - } - else - { - /*color conversion needed; sort of copy of the data*/ + } else { /*color conversion needed*/ unsigned char* data = *out; size_t outsize; /*TODO: check if this works according to the statement in the documentation: "The converter can convert - from greyscale input color type, to 8-bit greyscale or greyscale with alpha"*/ + from grayscale input color type, to 8-bit grayscale or grayscale with alpha"*/ if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) - && !(state->info_raw.bitdepth == 8)) - { + && !(state->info_raw.bitdepth == 8)) { return 56; /*unsupported color mode conversion*/ } outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); *out = (unsigned char*)lodepng_malloc(outsize); - if(!(*out)) - { + if(!(*out)) { state->error = 83; /*alloc fail*/ } else state->error = lodepng_convert(*out, data, &state->info_raw, @@ -4768,8 +4949,7 @@ unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, } unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) -{ + size_t insize, LodePNGColorType colortype, unsigned bitdepth) { unsigned error; LodePNGState state; lodepng_state_init(&state); @@ -4780,48 +4960,47 @@ unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, co return error; } -unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) -{ +unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); } -unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) -{ +unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); } #ifdef LODEPNG_COMPILE_DISK unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { unsigned char* buffer = 0; size_t buffersize; unsigned error; + /* safe output values in case error happens */ + *out = 0; + *w = *h = 0; error = lodepng_load_file(&buffer, &buffersize, filename); if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); lodepng_free(buffer); return error; } -unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) -{ +unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); } -unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) -{ +unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); } #endif /*LODEPNG_COMPILE_DISK*/ -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) -{ +void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) { settings->color_convert = 1; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS settings->read_text_chunks = 1; settings->remember_unknown_chunks = 0; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ settings->ignore_crc = 0; + settings->ignore_critical = 0; + settings->ignore_end = 0; lodepng_decompress_settings_init(&settings->zlibsettings); } @@ -4829,8 +5008,7 @@ void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) -void lodepng_state_init(LodePNGState* state) -{ +void lodepng_state_init(LodePNGState* state) { #ifdef LODEPNG_COMPILE_DECODER lodepng_decoder_settings_init(&state->decoder); #endif /*LODEPNG_COMPILE_DECODER*/ @@ -4842,14 +5020,12 @@ void lodepng_state_init(LodePNGState* state) state->error = 1; } -void lodepng_state_cleanup(LodePNGState* state) -{ +void lodepng_state_cleanup(LodePNGState* state) { lodepng_color_mode_cleanup(&state->info_raw); lodepng_info_cleanup(&state->info_png); } -void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) -{ +void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) { lodepng_state_cleanup(dest); *dest = *source; lodepng_color_mode_init(&dest->info_raw); @@ -4866,289 +5042,300 @@ void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) /* / PNG Encoder / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*chunkName must be string of 4 characters*/ -static unsigned addChunk(ucvector* out, const char* chunkName, const unsigned char* data, size_t length) -{ - CERROR_TRY_RETURN(lodepng_chunk_create(&out->data, &out->size, (unsigned)length, chunkName, data)); - out->allocsize = out->size; /*fix the allocsize again*/ + +static unsigned writeSignature(ucvector* out) { + size_t pos = out->size; + const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10}; + /*8 bytes PNG signature, aka the magic bytes*/ + if(!ucvector_resize(out, out->size + 8)) return 83; /*alloc fail*/ + lodepng_memcpy(out->data + pos, signature, 8); return 0; } -static void writeSignature(ucvector* out) -{ - /*8 bytes PNG signature, aka the magic bytes*/ - ucvector_push_back(out, 137); - ucvector_push_back(out, 80); - ucvector_push_back(out, 78); - ucvector_push_back(out, 71); - ucvector_push_back(out, 13); - ucvector_push_back(out, 10); - ucvector_push_back(out, 26); - ucvector_push_back(out, 10); -} - static unsigned addChunk_IHDR(ucvector* out, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) -{ - unsigned error = 0; - ucvector header; - ucvector_init(&header); + LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) { + unsigned char *chunk, *data; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR")); + data = chunk + 8; - lodepng_add32bitInt(&header, w); /*width*/ - lodepng_add32bitInt(&header, h); /*height*/ - ucvector_push_back(&header, (unsigned char)bitdepth); /*bit depth*/ - ucvector_push_back(&header, (unsigned char)colortype); /*color type*/ - ucvector_push_back(&header, 0); /*compression method*/ - ucvector_push_back(&header, 0); /*filter method*/ - ucvector_push_back(&header, interlace_method); /*interlace method*/ + lodepng_set32bitInt(data + 0, w); /*width*/ + lodepng_set32bitInt(data + 4, h); /*height*/ + data[8] = (unsigned char)bitdepth; /*bit depth*/ + data[9] = (unsigned char)colortype; /*color type*/ + data[10] = 0; /*compression method*/ + data[11] = 0; /*filter method*/ + data[12] = interlace_method; /*interlace method*/ - error = addChunk(out, "IHDR", header.data, header.size); - ucvector_cleanup(&header); - - return error; + lodepng_chunk_generate_crc(chunk); + return 0; } -static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) -{ - unsigned error = 0; - size_t i; - ucvector PLTE; - ucvector_init(&PLTE); - for(i = 0; i != info->palettesize * 4; ++i) - { +/* only adds the chunk if needed (there is a key or palette with alpha) */ +static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) { + unsigned char* chunk; + size_t i, j = 8; + + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE")); + + for(i = 0; i != info->palettesize; ++i) { /*add all channels except alpha channel*/ - if(i % 4 != 3) ucvector_push_back(&PLTE, info->palette[i]); + chunk[j++] = info->palette[i * 4 + 0]; + chunk[j++] = info->palette[i * 4 + 1]; + chunk[j++] = info->palette[i * 4 + 2]; } - error = addChunk(out, "PLTE", PLTE.data, PLTE.size); - ucvector_cleanup(&PLTE); - return error; + lodepng_chunk_generate_crc(chunk); + return 0; } -static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) -{ - unsigned error = 0; - size_t i; - ucvector tRNS; - ucvector_init(&tRNS); - if(info->colortype == LCT_PALETTE) - { - size_t amount = info->palettesize; +static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) { + unsigned char* chunk = 0; + + if(info->colortype == LCT_PALETTE) { + size_t i, amount = info->palettesize; /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/ - for(i = info->palettesize; i != 0; --i) - { - if(info->palette[4 * (i - 1) + 3] == 255) --amount; - else break; + for(i = info->palettesize; i != 0; --i) { + if(info->palette[4 * (i - 1) + 3] != 255) break; + --amount; } - /*add only alpha channel*/ - for(i = 0; i != amount; ++i) ucvector_push_back(&tRNS, info->palette[4 * i + 3]); - } - else if(info->colortype == LCT_GREY) - { - if(info->key_defined) - { - ucvector_push_back(&tRNS, (unsigned char)(info->key_r >> 8)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_r & 255)); + if(amount) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS")); + /*add the alpha channel values from the palette*/ + for(i = 0; i != amount; ++i) chunk[8 + i] = info->palette[4 * i + 3]; } - } - else if(info->colortype == LCT_RGB) - { - if(info->key_defined) - { - ucvector_push_back(&tRNS, (unsigned char)(info->key_r >> 8)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_r & 255)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_g >> 8)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_g & 255)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_b >> 8)); - ucvector_push_back(&tRNS, (unsigned char)(info->key_b & 255)); + } else if(info->colortype == LCT_GREY) { + if(info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + } + } else if(info->colortype == LCT_RGB) { + if(info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + chunk[10] = (unsigned char)(info->key_g >> 8); + chunk[11] = (unsigned char)(info->key_g & 255); + chunk[12] = (unsigned char)(info->key_b >> 8); + chunk[13] = (unsigned char)(info->key_b & 255); } } - error = addChunk(out, "tRNS", tRNS.data, tRNS.size); - ucvector_cleanup(&tRNS); - - return error; + if(chunk) lodepng_chunk_generate_crc(chunk); + return 0; } static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t datasize, - LodePNGCompressSettings* zlibsettings) -{ - ucvector zlibdata; + LodePNGCompressSettings* zlibsettings) { unsigned error = 0; + unsigned char* zlib = 0; + size_t zlibsize = 0; - /*compress with the Zlib compressor*/ - ucvector_init(&zlibdata); - error = zlib_compress(&zlibdata.data, &zlibdata.size, data, datasize, zlibsettings); - if(!error) error = addChunk(out, "IDAT", zlibdata.data, zlibdata.size); - ucvector_cleanup(&zlibdata); - + error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings); + if(!error) { + error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib); + } + lodepng_free(zlib); return error; } -static unsigned addChunk_IEND(ucvector* out) -{ - unsigned error = 0; - error = addChunk(out, "IEND", 0, 0); - return error; +static unsigned addChunk_IEND(ucvector* out) { + return lodepng_chunk_createv(out, 0, "IEND", 0); } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) -{ - unsigned error = 0; - size_t i; - ucvector text; - ucvector_init(&text); - for(i = 0; keyword[i] != 0; ++i) ucvector_push_back(&text, (unsigned char)keyword[i]); - if(i < 1 || i > 79) return 89; /*error: invalid keyword size*/ - ucvector_push_back(&text, 0); /*0 termination char*/ - for(i = 0; textstring[i] != 0; ++i) ucvector_push_back(&text, (unsigned char)textstring[i]); - error = addChunk(out, "tEXt", text.data, text.size); - ucvector_cleanup(&text); - - return error; +static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) { + unsigned char* chunk = 0; + size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring); + size_t size = keysize + 1 + textsize; + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt")); + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + lodepng_memcpy(chunk + 9 + keysize, textstring, textsize); + lodepng_chunk_generate_crc(chunk); + return 0; } static unsigned addChunk_zTXt(ucvector* out, const char* keyword, const char* textstring, - LodePNGCompressSettings* zlibsettings) -{ + LodePNGCompressSettings* zlibsettings) { unsigned error = 0; - ucvector data, compressed; - size_t i, textsize = strlen(textstring); + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword); + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - ucvector_init(&data); - ucvector_init(&compressed); - for(i = 0; keyword[i] != 0; ++i) ucvector_push_back(&data, (unsigned char)keyword[i]); - if(i < 1 || i > 79) return 89; /*error: invalid keyword size*/ - ucvector_push_back(&data, 0); /*0 termination char*/ - ucvector_push_back(&data, 0); /*compression method: 0*/ - - error = zlib_compress(&compressed.data, &compressed.size, - (unsigned char*)textstring, textsize, zlibsettings); - if(!error) - { - for(i = 0; i != compressed.size; ++i) ucvector_push_back(&data, compressed.data[i]); - error = addChunk(out, "zTXt", data.data, data.size); + error = zlib_compress(&compressed, &compressedsize, + (const unsigned char*)textstring, textsize, zlibsettings); + if(!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "zTXt"); + } + if(!error) { + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); } - ucvector_cleanup(&compressed); - ucvector_cleanup(&data); + lodepng_free(compressed); return error; } -static unsigned addChunk_iTXt(ucvector* out, unsigned compressed, const char* keyword, const char* langtag, - const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) -{ +static unsigned addChunk_iTXt(ucvector* out, unsigned compress, const char* keyword, const char* langtag, + const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) { unsigned error = 0; - ucvector data; - size_t i, textsize = strlen(textstring); + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), transsize = lodepng_strlen(transkey); - ucvector_init(&data); + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - for(i = 0; keyword[i] != 0; ++i) ucvector_push_back(&data, (unsigned char)keyword[i]); - if(i < 1 || i > 79) return 89; /*error: invalid keyword size*/ - ucvector_push_back(&data, 0); /*null termination char*/ - ucvector_push_back(&data, compressed ? 1 : 0); /*compression flag*/ - ucvector_push_back(&data, 0); /*compression method*/ - for(i = 0; langtag[i] != 0; ++i) ucvector_push_back(&data, (unsigned char)langtag[i]); - ucvector_push_back(&data, 0); /*null termination char*/ - for(i = 0; transkey[i] != 0; ++i) ucvector_push_back(&data, (unsigned char)transkey[i]); - ucvector_push_back(&data, 0); /*null termination char*/ - - if(compressed) - { - ucvector compressed_data; - ucvector_init(&compressed_data); - error = zlib_compress(&compressed_data.data, &compressed_data.size, - (unsigned char*)textstring, textsize, zlibsettings); - if(!error) - { - for(i = 0; i != compressed_data.size; ++i) ucvector_push_back(&data, compressed_data.data[i]); + if(compress) { + error = zlib_compress(&compressed, &compressedsize, + (const unsigned char*)textstring, textsize, zlibsettings); + } + if(!error) { + size_t size = keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize); + error = lodepng_chunk_init(&chunk, out, size, "iTXt"); + } + if(!error) { + size_t pos = 8; + lodepng_memcpy(chunk + pos, keyword, keysize); + pos += keysize; + chunk[pos++] = 0; /*null termination char*/ + chunk[pos++] = (compress ? 1 : 0); /*compression flag*/ + chunk[pos++] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + pos, langtag, langsize); + pos += langsize; + chunk[pos++] = 0; /*null termination char*/ + lodepng_memcpy(chunk + pos, transkey, transsize); + pos += transsize; + chunk[pos++] = 0; /*null termination char*/ + if(compress) { + lodepng_memcpy(chunk + pos, compressed, compressedsize); + } else { + lodepng_memcpy(chunk + pos, textstring, textsize); } - ucvector_cleanup(&compressed_data); - } - else /*not compressed*/ - { - for(i = 0; textstring[i] != 0; ++i) ucvector_push_back(&data, (unsigned char)textstring[i]); + lodepng_chunk_generate_crc(chunk); } - if(!error) error = addChunk(out, "iTXt", data.data, data.size); - ucvector_cleanup(&data); + lodepng_free(compressed); return error; } -static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) -{ - unsigned error = 0; - ucvector bKGD; - ucvector_init(&bKGD); - if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) - { - ucvector_push_back(&bKGD, (unsigned char)(info->background_r >> 8)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_r & 255)); +static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk = 0; + if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + chunk[10] = (unsigned char)(info->background_g >> 8); + chunk[11] = (unsigned char)(info->background_g & 255); + chunk[12] = (unsigned char)(info->background_b >> 8); + chunk[13] = (unsigned char)(info->background_b & 255); + } else if(info->color.colortype == LCT_PALETTE) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD")); + chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/ } - else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) - { - ucvector_push_back(&bKGD, (unsigned char)(info->background_r >> 8)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_r & 255)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_g >> 8)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_g & 255)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_b >> 8)); - ucvector_push_back(&bKGD, (unsigned char)(info->background_b & 255)); - } - else if(info->color.colortype == LCT_PALETTE) - { - ucvector_push_back(&bKGD, (unsigned char)(info->background_r & 255)); /*palette index*/ - } - - error = addChunk(out, "bKGD", bKGD.data, bKGD.size); - ucvector_cleanup(&bKGD); - - return error; + if(chunk) lodepng_chunk_generate_crc(chunk); + return 0; } -static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) -{ - unsigned error = 0; - unsigned char* data = (unsigned char*)lodepng_malloc(7); - if(!data) return 83; /*alloc fail*/ - data[0] = (unsigned char)(time->year >> 8); - data[1] = (unsigned char)(time->year & 255); - data[2] = (unsigned char)time->month; - data[3] = (unsigned char)time->day; - data[4] = (unsigned char)time->hour; - data[5] = (unsigned char)time->minute; - data[6] = (unsigned char)time->second; - error = addChunk(out, "tIME", data, 7); - lodepng_free(data); - return error; +static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME")); + chunk[8] = (unsigned char)(time->year >> 8); + chunk[9] = (unsigned char)(time->year & 255); + chunk[10] = (unsigned char)time->month; + chunk[11] = (unsigned char)time->day; + chunk[12] = (unsigned char)time->hour; + chunk[13] = (unsigned char)time->minute; + chunk[14] = (unsigned char)time->second; + lodepng_chunk_generate_crc(chunk); + return 0; } -static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) -{ +static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs")); + lodepng_set32bitInt(chunk + 8, info->phys_x); + lodepng_set32bitInt(chunk + 12, info->phys_y); + chunk[16] = info->phys_unit; + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_gAMA(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA")); + lodepng_set32bitInt(chunk + 8, info->gama_gamma); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_cHRM(ucvector* out, const LodePNGInfo* info) { + unsigned char* chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM")); + lodepng_set32bitInt(chunk + 8, info->chrm_white_x); + lodepng_set32bitInt(chunk + 12, info->chrm_white_y); + lodepng_set32bitInt(chunk + 16, info->chrm_red_x); + lodepng_set32bitInt(chunk + 20, info->chrm_red_y); + lodepng_set32bitInt(chunk + 24, info->chrm_green_x); + lodepng_set32bitInt(chunk + 28, info->chrm_green_y); + lodepng_set32bitInt(chunk + 32, info->chrm_blue_x); + lodepng_set32bitInt(chunk + 36, info->chrm_blue_y); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_sRGB(ucvector* out, const LodePNGInfo* info) { + unsigned char data = info->srgb_intent; + return lodepng_chunk_createv(out, 1, "sRGB", &data); +} + +static unsigned addChunk_iCCP(ucvector* out, const LodePNGInfo* info, LodePNGCompressSettings* zlibsettings) { unsigned error = 0; - ucvector data; - ucvector_init(&data); + unsigned char* chunk = 0; + unsigned char* compressed = 0; + size_t compressedsize = 0; + size_t keysize = lodepng_strlen(info->iccp_name); - lodepng_add32bitInt(&data, info->phys_x); - lodepng_add32bitInt(&data, info->phys_y); - ucvector_push_back(&data, info->phys_unit); - - error = addChunk(out, "pHYs", data.data, data.size); - ucvector_cleanup(&data); + if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ + error = zlib_compress(&compressed, &compressedsize, + info->iccp_profile, info->iccp_profile_size, zlibsettings); + if(!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "iCCP"); + } + if(!error) { + lodepng_memcpy(chunk + 8, info->iccp_name, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); + } + lodepng_free(compressed); return error; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ static void filterScanline(unsigned char* out, const unsigned char* scanline, const unsigned char* prevline, - size_t length, size_t bytewidth, unsigned char filterType) -{ + size_t length, size_t bytewidth, unsigned char filterType) { size_t i; - switch(filterType) - { + switch(filterType) { case 0: /*None*/ for(i = 0; i != length; ++i) out[i] = scanline[i]; break; @@ -5157,71 +5344,73 @@ static void filterScanline(unsigned char* out, const unsigned char* scanline, co for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - scanline[i - bytewidth]; break; case 2: /*Up*/ - if(prevline) - { + if(prevline) { for(i = 0; i != length; ++i) out[i] = scanline[i] - prevline[i]; - } - else - { + } else { for(i = 0; i != length; ++i) out[i] = scanline[i]; } break; case 3: /*Average*/ - if(prevline) - { + if(prevline) { for(i = 0; i != bytewidth; ++i) out[i] = scanline[i] - (prevline[i] >> 1); for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); - } - else - { + } else { for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); } break; case 4: /*Paeth*/ - if(prevline) - { + if(prevline) { /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ for(i = 0; i != bytewidth; ++i) out[i] = (scanline[i] - prevline[i]); - for(i = bytewidth; i < length; ++i) - { + for(i = bytewidth; i < length; ++i) { out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth])); } - } - else - { + } else { for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/ for(i = bytewidth; i < length; ++i) out[i] = (scanline[i] - scanline[i - bytewidth]); } break; - default: return; /*unexisting filter type given*/ + default: return; /*invalid filter type given*/ } } -/* log2 approximation. A slight bit faster than std::log. */ -static float flog2(float f) -{ - float result = 0; - while(f > 32) { result += 4; f /= 16; } - while(f > 2) { ++result; f /= 2; } - return result + 1.442695f * (f * f * f / 3 - 3 * f * f / 2 + 3 * f - 1.83333f); +/* integer binary logarithm, max return value is 31 */ +static size_t ilog2(size_t i) { + size_t result = 0; + if(i >= 65536) { result += 16; i >>= 16; } + if(i >= 256) { result += 8; i >>= 8; } + if(i >= 16) { result += 4; i >>= 4; } + if(i >= 4) { result += 2; i >>= 2; } + if(i >= 2) { result += 1; /*i >>= 1;*/ } + return result; +} + +/* integer approximation for i * log2(i), helper function for LFS_ENTROPY */ +static size_t ilog2i(size_t i) { + size_t l; + if(i == 0) return 0; + l = ilog2(i); + /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u) + linearly approximates the missing fractional part multiplied by i */ + return i * l + ((i - (1u << l)) << 1u); } static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* info, const LodePNGEncoderSettings* settings) -{ + const LodePNGColorMode* color, const LodePNGEncoderSettings* settings) { /* For PNG filter method 0 - out must be a buffer with as size: h + (w * h * bpp + 7) / 8, because there are + out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because there are the scanlines with 1 extra byte per scanline */ - unsigned bpp = lodepng_get_bpp(info); + unsigned bpp = lodepng_get_bpp(color); /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = (w * bpp + 7) / 8; + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; + /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7) / 8; + size_t bytewidth = (bpp + 7u) / 8u; const unsigned char* prevline = 0; unsigned x, y; unsigned error = 0; @@ -5241,67 +5430,54 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, heuristic is used. */ if(settings->filter_palette_zero && - (info->colortype == LCT_PALETTE || info->bitdepth < 8)) strategy = LFS_ZERO; + (color->colortype == LCT_PALETTE || color->bitdepth < 8)) strategy = LFS_ZERO; if(bpp == 0) return 31; /*error: invalid color type*/ - if(strategy == LFS_ZERO) - { - for(y = 0; y != h; ++y) - { + if(strategy >= LFS_ZERO && strategy <= LFS_FOUR) { + unsigned char type = (unsigned char)strategy; + for(y = 0; y != h; ++y) { size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ size_t inindex = linebytes * y; - out[outindex] = 0; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, 0); + out[outindex] = type; /*filter type byte*/ + filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); prevline = &in[inindex]; } - } - else if(strategy == LFS_MINSUM) - { + } else if(strategy == LFS_MINSUM) { /*adaptive filtering*/ - size_t sum[5]; unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ size_t smallest = 0; unsigned char type, bestType = 0; - for(type = 0; type != 5; ++type) - { + for(type = 0; type != 5; ++type) { attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) return 83; /*alloc fail*/ + if(!attempt[type]) error = 83; /*alloc fail*/ } - if(!error) - { - for(y = 0; y != h; ++y) - { + if(!error) { + for(y = 0; y != h; ++y) { /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) - { + for(type = 0; type != 5; ++type) { + size_t sum = 0; filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); /*calculate the sum of the result*/ - sum[type] = 0; - if(type == 0) - { - for(x = 0; x != linebytes; ++x) sum[type] += (unsigned char)(attempt[type][x]); - } - else - { - for(x = 0; x != linebytes; ++x) - { + if(type == 0) { + for(x = 0; x != linebytes; ++x) sum += (unsigned char)(attempt[type][x]); + } else { + for(x = 0; x != linebytes; ++x) { /*For differences, each byte should be treated as signed, values above 127 are negative (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there. This means filtertype 0 is almost never chosen, but that is justified.*/ unsigned char s = attempt[type][x]; - sum[type] += s < 128 ? s : (255U - s); + sum += s < 128 ? s : (255U - s); } } /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum[type] < smallest) - { + if(type == 0 || sum < smallest) { bestType = type; - smallest = sum[type]; + smallest = sum; } } @@ -5314,57 +5490,47 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, } for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } - else if(strategy == LFS_ENTROPY) - { - float sum[5]; + } else if(strategy == LFS_ENTROPY) { unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - float smallest = 0; + size_t bestSum = 0; unsigned type, bestType = 0; unsigned count[256]; - for(type = 0; type != 5; ++type) - { + for(type = 0; type != 5; ++type) { attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) return 83; /*alloc fail*/ + if(!attempt[type]) error = 83; /*alloc fail*/ } - for(y = 0; y != h; ++y) - { - /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) - { - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - for(x = 0; x != 256; ++x) count[x] = 0; - for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]]; - ++count[type]; /*the filter type itself is part of the scanline*/ - sum[type] = 0; - for(x = 0; x != 256; ++x) - { - float p = count[x] / (float)(linebytes + 1); - sum[type] += count[x] == 0 ? 0 : flog2(1 / p) * p; - } - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum[type] < smallest) - { - bestType = type; - smallest = sum[type]; + if(!error) { + for(y = 0; y != h; ++y) { + /*try the 5 filter types*/ + for(type = 0; type != 5; ++type) { + size_t sum = 0; + filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + lodepng_memset(count, 0, 256 * sizeof(*count)); + for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]]; + ++count[type]; /*the filter type itself is part of the scanline*/ + for(x = 0; x != 256; ++x) { + sum += ilog2i(count[x]); + } + /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ + if(type == 0 || sum > bestSum) { + bestType = type; + bestSum = sum; + } } + + prevline = &in[y * linebytes]; + + /*now fill the out values*/ + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ + for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; } for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } - else if(strategy == LFS_PREDEFINED) - { - for(y = 0; y != h; ++y) - { + } else if(strategy == LFS_PREDEFINED) { + for(y = 0; y != h; ++y) { size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ size_t inindex = linebytes * y; unsigned char type = settings->predefined_filters[y]; @@ -5372,9 +5538,7 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); prevline = &in[inindex]; } - } - else if(strategy == LFS_BRUTE_FORCE) - { + } else if(strategy == LFS_BRUTE_FORCE) { /*brute force filter chooser. deflate the scanline after every filter attempt to see which one deflates best. This is very slow and gives only slightly smaller, sometimes even larger, result*/ @@ -5383,7 +5547,8 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, size_t smallest = 0; unsigned type = 0, bestType = 0; unsigned char* dummy; - LodePNGCompressSettings zlibsettings = settings->zlibsettings; + LodePNGCompressSettings zlibsettings; + lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings)); /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose, to simulate the true case where the tree is the same for the whole image. Sometimes it gives better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare @@ -5393,33 +5558,31 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, images only, so disable it*/ zlibsettings.custom_zlib = 0; zlibsettings.custom_deflate = 0; - for(type = 0; type != 5; ++type) - { + for(type = 0; type != 5; ++type) { attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) return 83; /*alloc fail*/ + if(!attempt[type]) error = 83; /*alloc fail*/ } - for(y = 0; y != h; ++y) /*try the 5 filter types*/ - { - for(type = 0; type != 5; ++type) - { - unsigned testsize = linebytes; - /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ + if(!error) { + for(y = 0; y != h; ++y) /*try the 5 filter types*/ { + for(type = 0; type != 5; ++type) { + unsigned testsize = (unsigned)linebytes; + /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - size[type] = 0; - dummy = 0; - zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); - lodepng_free(dummy); - /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || size[type] < smallest) - { - bestType = type; - smallest = size[type]; + filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + size[type] = 0; + dummy = 0; + zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); + lodepng_free(dummy); + /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ + if(type == 0 || size[type] < smallest) { + bestType = type; + smallest = size[type]; + } } + prevline = &in[y * linebytes]; + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ + for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; } - prevline = &in[y * linebytes]; - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; } for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); } @@ -5429,18 +5592,15 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, } static void addPaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) -{ + size_t olinebits, size_t ilinebits, unsigned h) { /*The opposite of the removePaddingBits function olinebits must be >= ilinebits*/ unsigned y; size_t diff = olinebits - ilinebits; size_t obp = 0, ibp = 0; /*bit pointers*/ - for(y = 0; y != h; ++y) - { + for(y = 0; y != h; ++y) { size_t x; - for(x = 0; x < ilinebits; ++x) - { + for(x = 0; x < ilinebits; ++x) { unsigned char bit = readBitFromReversedStream(&ibp, in); setBitOfReversedStream(&obp, out, bit); } @@ -5461,47 +5621,37 @@ in has the following size in bits: w * h * bpp. out is possibly bigger due to padding bits between reduced images NOTE: comments about padding bits are only relevant if bpp < 8 */ -static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) -{ +static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; unsigned i; Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - if(bpp >= 8) - { - for(i = 0; i != 7; ++i) - { + if(bpp >= 8) { + for(i = 0; i != 7; ++i) { unsigned x, y, b; - size_t bytewidth = bpp / 8; + size_t bytewidth = bpp / 8u; for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { + for(x = 0; x < passw[i]; ++x) { size_t pixelinstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; - for(b = 0; b < bytewidth; ++b) - { + for(b = 0; b < bytewidth; ++b) { out[pixeloutstart + b] = in[pixelinstart + b]; } } } - } - else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ - { - for(i = 0; i != 7; ++i) - { + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { + for(i = 0; i != 7; ++i) { unsigned x, y, b; unsigned ilinebits = bpp * passw[i]; unsigned olinebits = bpp * w; size_t obp, ibp; /*bit pointers (for out and in buffer)*/ for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { + for(x = 0; x < passw[i]; ++x) { ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - for(b = 0; b < bpp; ++b) - { + for(b = 0; b < bpp; ++b) { unsigned char bit = readBitFromReversedStream(&ibp, in); setBitOfReversedStream(&obp, out, bit); } @@ -5514,45 +5664,36 @@ static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigne return value is error**/ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const unsigned char* in, unsigned w, unsigned h, - const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) -{ + const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) { /* This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: - *) if no Adam7: 1) add padding bits (= posible extra bits per scanline if bpp < 8) 2) filter + *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter */ unsigned bpp = lodepng_get_bpp(&info_png->color); unsigned error = 0; - if(info_png->interlace_method == 0) - { - *outsize = h + (h * ((w * bpp + 7) / 8)); /*image size plus an extra byte per scanline + possible padding bits*/ + if(info_png->interlace_method == 0) { + *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per scanline + possible padding bits*/ *out = (unsigned char*)lodepng_malloc(*outsize); if(!(*out) && (*outsize)) error = 83; /*alloc fail*/ - if(!error) - { + if(!error) { /*non multiple of 8 bits per scanline, padding bits needed per scanline*/ - if(bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8) - { - unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7) / 8)); + if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { + unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7u) / 8u)); if(!padded) error = 83; /*alloc fail*/ - if(!error) - { - addPaddingBits(padded, in, ((w * bpp + 7) / 8) * 8, w * bpp, h); + if(!error) { + addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h); error = filter(*out, padded, w, h, &info_png->color, settings); } lodepng_free(padded); - } - else - { + } else { /*we can immediately filter into the out buffer, no other steps needed*/ error = filter(*out, in, w, h, &info_png->color, settings); } } - } - else /*interlace_method is 1 (Adam7)*/ - { + } else /*interlace_method is 1 (Adam7)*/ { unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; unsigned char* adam7; @@ -5566,25 +5707,20 @@ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const adam7 = (unsigned char*)lodepng_malloc(passstart[7]); if(!adam7 && passstart[7]) error = 83; /*alloc fail*/ - if(!error) - { + if(!error) { unsigned i; Adam7_interlace(adam7, in, w, h, bpp); - for(i = 0; i != 7; ++i) - { - if(bpp < 8) - { + for(i = 0; i != 7; ++i) { + if(bpp < 8) { unsigned char* padded = (unsigned char*)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]); if(!padded) ERROR_BREAK(83); /*alloc fail*/ addPaddingBits(padded, &adam7[passstart[i]], - ((passw[i] * bpp + 7) / 8) * 8, passw[i] * bpp, passh[i]); + ((passw[i] * bpp + 7u) / 8u) * 8u, passw[i] * bpp, passh[i]); error = filter(&(*out)[filter_passstart[i]], padded, passw[i], passh[i], &info_png->color, settings); lodepng_free(padded); - } - else - { + } else { error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]], passw[i], passh[i], &info_png->color, settings); } @@ -5599,54 +5735,48 @@ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const return error; } -/* -palette must have 4 * palettesize bytes allocated, and given in format RGBARGBARGBARGBA... -returns 0 if the palette is opaque, -returns 1 if the palette has a single color with alpha 0 ==> color key -returns 2 if the palette is semi-translucent. -*/ -static unsigned getPaletteTranslucency(const unsigned char* palette, size_t palettesize) -{ - size_t i; - unsigned key = 0; - unsigned r = 0, g = 0, b = 0; /*the value of the color with alpha 0, so long as color keying is possible*/ - for(i = 0; i != palettesize; ++i) - { - if(!key && palette[4 * i + 3] == 0) - { - r = palette[4 * i + 0]; g = palette[4 * i + 1]; b = palette[4 * i + 2]; - key = 1; - i = (size_t)(-1); /*restart from beginning, to detect earlier opaque colors with key's value*/ - } - else if(palette[4 * i + 3] != 255) return 2; - /*when key, no opaque RGB may have key's RGB*/ - else if(key && r == palette[i * 4 + 0] && g == palette[i * 4 + 1] && b == palette[i * 4 + 2]) return 2; - } - return key; -} - #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) -{ +static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) { unsigned char* inchunk = data; - while((size_t)(inchunk - data) < datasize) - { + while((size_t)(inchunk - data) < datasize) { CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); out->allocsize = out->size; /*fix the allocsize again*/ - inchunk = lodepng_chunk_next(inchunk); + inchunk = lodepng_chunk_next(inchunk, data + datasize); } return 0; } + +static unsigned isGrayICCProfile(const unsigned char* profile, unsigned size) { + /* + It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19 + are "RGB ". We do not perform any full parsing of the ICC profile here, other + than check those 4 bytes to grayscale profile. Other than that, validity of + the profile is not checked. This is needed only because the PNG specification + requires using a non-gray color model if there is an ICC profile with "RGB " + (sadly limiting compression opportunities if the input data is grayscale RGB + data), and requires using a gray color model if it is "GRAY". + */ + if(size < 20) return 0; + return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y'; +} + +static unsigned isRGBICCProfile(const unsigned char* profile, unsigned size) { + /* See comment in isGrayICCProfile*/ + if(size < 20) return 0; + return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' '; +} #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ unsigned lodepng_encode(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h, - LodePNGState* state) -{ - LodePNGInfo info; - ucvector outv; + LodePNGState* state) { unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/ size_t datasize = 0; + ucvector outv = ucvector_init(NULL, 0); + LodePNGInfo info; + const LodePNGInfo* info_png = &state->info_png; + + lodepng_info_init(&info); /*provide some proper output values if error will happen*/ *out = 0; @@ -5654,177 +5784,243 @@ unsigned lodepng_encode(unsigned char** out, size_t* outsize, state->error = 0; /*check input values validity*/ - if((state->info_png.color.colortype == LCT_PALETTE || state->encoder.force_palette) - && (state->info_png.color.palettesize == 0 || state->info_png.color.palettesize > 256)) - { - CERROR_RETURN_ERROR(state->error, 68); /*invalid palette size, it is only allowed to be 1-256*/ + if((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette) + && (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) { + state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ + goto cleanup; } - if(state->encoder.zlibsettings.btype > 2) - { - CERROR_RETURN_ERROR(state->error, 61); /*error: unexisting btype*/ + if(state->encoder.zlibsettings.btype > 2) { + state->error = 61; /*error: invalid btype*/ + goto cleanup; } - if(state->info_png.interlace_method > 1) - { - CERROR_RETURN_ERROR(state->error, 71); /*error: unexisting interlace mode*/ + if(info_png->interlace_method > 1) { + state->error = 71; /*error: invalid interlace mode*/ + goto cleanup; } - state->error = checkColorValidity(state->info_png.color.colortype, state->info_png.color.bitdepth); - if(state->error) return state->error; /*error: unexisting color type given*/ + state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth); + if(state->error) goto cleanup; /*error: invalid color type given*/ state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); - if(state->error) return state->error; /*error: unexisting color type given*/ + if(state->error) goto cleanup; /*error: invalid color type given*/ /* color convert and compute scanline filter types */ - lodepng_info_init(&info); lodepng_info_copy(&info, &state->info_png); - if(state->encoder.auto_convert) - { - state->error = lodepng_auto_choose_color(&info.color, image, w, h, &state->info_raw); - } - if (!state->error) - { - if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) - { - unsigned char* converted; - size_t size = (w * h * (size_t)lodepng_get_bpp(&info.color) + 7) / 8; - - converted = (unsigned char*)lodepng_malloc(size); - if(!converted && size) state->error = 83; /*alloc fail*/ - if(!state->error) - { - state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); - } - if(!state->error) preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); - lodepng_free(converted); + if(state->encoder.auto_convert) { + LodePNGColorStats stats; + lodepng_color_stats_init(&stats); +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->iccp_defined && + isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use palette with a GRAY ICC profile, even + if the palette has only gray colors, so disallow it.*/ + stats.allow_palette = 0; } - else preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); + if(info_png->iccp_defined && + isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use grayscale color with RGB ICC profile, so disallow gray.*/ + stats.allow_greyscale = 0; + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->background_defined) { + /*the background chunk's color must be taken into account as well*/ + unsigned r = 0, g = 0, b = 0; + LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16); + lodepng_convert_rgb(&r, &g, &b, info_png->background_r, info_png->background_g, info_png->background_b, &mode16, &info_png->color); + state->error = lodepng_color_stats_add(&stats, r, g, b, 65535); + if(state->error) goto cleanup; + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + state->error = auto_choose_color(&info.color, &state->info_raw, &stats); + if(state->error) goto cleanup; +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + /*also convert the background chunk*/ + if(info_png->background_defined) { + if(lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b, + info_png->background_r, info_png->background_g, info_png->background_b, &info.color, &info_png->color)) { + state->error = 104; + goto cleanup; + } + } +#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ + } +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS + if(info_png->iccp_defined) { + unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned gray_png = info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA; + if(!gray_icc && !rgb_icc) { + state->error = 100; /* Disallowed profile color type for PNG */ + goto cleanup; + } + if(gray_icc != gray_png) { + /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice versa, + or in case of auto_convert, it wasn't possible to find appropriate model*/ + state->error = state->encoder.auto_convert ? 102 : 101; + goto cleanup; + } + } +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) { + unsigned char* converted; + size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u; + + converted = (unsigned char*)lodepng_malloc(size); + if(!converted && size) state->error = 83; /*alloc fail*/ + if(!state->error) { + state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); + } + if(!state->error) { + state->error = preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); + } + lodepng_free(converted); + if(state->error) goto cleanup; + } else { + state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); + if(state->error) goto cleanup; } - /* output all PNG chunks */ - ucvector_init(&outv); - while(!state->error) /*while only executed once, to break on error*/ - { + /* output all PNG chunks */ { #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS size_t i; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*write signature and chunks*/ - writeSignature(&outv); + state->error = writeSignature(&outv); + if(state->error) goto cleanup; /*IHDR*/ - addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); + state->error = addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); + if(state->error) goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*unknown chunks between IHDR and PLTE*/ - if(info.unknown_chunks_data[0]) - { + if(info.unknown_chunks_data[0]) { state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); - if(state->error) break; + if(state->error) goto cleanup; + } + /*color profile chunks must come before PLTE */ + if(info.iccp_defined) { + state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings); + if(state->error) goto cleanup; + } + if(info.srgb_defined) { + state->error = addChunk_sRGB(&outv, &info); + if(state->error) goto cleanup; + } + if(info.gama_defined) { + state->error = addChunk_gAMA(&outv, &info); + if(state->error) goto cleanup; + } + if(info.chrm_defined) { + state->error = addChunk_cHRM(&outv, &info); + if(state->error) goto cleanup; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*PLTE*/ - if(info.color.colortype == LCT_PALETTE) - { - addChunk_PLTE(&outv, &info.color); + if(info.color.colortype == LCT_PALETTE) { + state->error = addChunk_PLTE(&outv, &info.color); + if(state->error) goto cleanup; } - if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) - { - addChunk_PLTE(&outv, &info.color); - } - /*tRNS*/ - if(info.color.colortype == LCT_PALETTE && getPaletteTranslucency(info.color.palette, info.color.palettesize) != 0) - { - addChunk_tRNS(&outv, &info.color); - } - if((info.color.colortype == LCT_GREY || info.color.colortype == LCT_RGB) && info.color.key_defined) - { - addChunk_tRNS(&outv, &info.color); + if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { + /*force_palette means: write suggested palette for truecolor in PLTE chunk*/ + state->error = addChunk_PLTE(&outv, &info.color); + if(state->error) goto cleanup; } + /*tRNS (this will only add if when necessary) */ + state->error = addChunk_tRNS(&outv, &info.color); + if(state->error) goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*bKGD (must come between PLTE and the IDAt chunks*/ - if(info.background_defined) addChunk_bKGD(&outv, &info); + if(info.background_defined) { + state->error = addChunk_bKGD(&outv, &info); + if(state->error) goto cleanup; + } /*pHYs (must come before the IDAT chunks)*/ - if(info.phys_defined) addChunk_pHYs(&outv, &info); + if(info.phys_defined) { + state->error = addChunk_pHYs(&outv, &info); + if(state->error) goto cleanup; + } /*unknown chunks between PLTE and IDAT*/ - if(info.unknown_chunks_data[1]) - { + if(info.unknown_chunks_data[1]) { state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); - if(state->error) break; + if(state->error) goto cleanup; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*IDAT (multiple IDAT chunks must be consecutive)*/ state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); - if(state->error) break; + if(state->error) goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*tIME*/ - if(info.time_defined) addChunk_tIME(&outv, &info.time); + if(info.time_defined) { + state->error = addChunk_tIME(&outv, &info.time); + if(state->error) goto cleanup; + } /*tEXt and/or zTXt*/ - for(i = 0; i != info.text_num; ++i) - { - if(strlen(info.text_keys[i]) > 79) - { + for(i = 0; i != info.text_num; ++i) { + if(lodepng_strlen(info.text_keys[i]) > 79) { state->error = 66; /*text chunk too large*/ - break; + goto cleanup; } - if(strlen(info.text_keys[i]) < 1) - { + if(lodepng_strlen(info.text_keys[i]) < 1) { state->error = 67; /*text chunk too small*/ - break; + goto cleanup; } - if(state->encoder.text_compression) - { - addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); - } - else - { - addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); + if(state->encoder.text_compression) { + state->error = addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); + if(state->error) goto cleanup; + } else { + state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); + if(state->error) goto cleanup; } } /*LodePNG version id in text chunk*/ - if(state->encoder.add_id) - { - unsigned alread_added_id_text = 0; - for(i = 0; i != info.text_num; ++i) - { - if(!strcmp(info.text_keys[i], "LodePNG")) - { - alread_added_id_text = 1; + if(state->encoder.add_id) { + unsigned already_added_id_text = 0; + for(i = 0; i != info.text_num; ++i) { + const char* k = info.text_keys[i]; + /* Could use strcmp, but we're not calling or reimplementing this C library function for this use only */ + if(k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' && + k[4] == 'P' && k[5] == 'N' && k[6] == 'G' && k[7] == '\0') { + already_added_id_text = 1; break; } } - if(alread_added_id_text == 0) - { - addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ + if(already_added_id_text == 0) { + state->error = addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ + if(state->error) goto cleanup; } } /*iTXt*/ - for(i = 0; i != info.itext_num; ++i) - { - if(strlen(info.itext_keys[i]) > 79) - { + for(i = 0; i != info.itext_num; ++i) { + if(lodepng_strlen(info.itext_keys[i]) > 79) { state->error = 66; /*text chunk too large*/ - break; + goto cleanup; } - if(strlen(info.itext_keys[i]) < 1) - { + if(lodepng_strlen(info.itext_keys[i]) < 1) { state->error = 67; /*text chunk too small*/ - break; + goto cleanup; } - addChunk_iTXt(&outv, state->encoder.text_compression, - info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], - &state->encoder.zlibsettings); + state->error = addChunk_iTXt( + &outv, state->encoder.text_compression, + info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], + &state->encoder.zlibsettings); + if(state->error) goto cleanup; } /*unknown chunks between IDAT and IEND*/ - if(info.unknown_chunks_data[2]) - { + if(info.unknown_chunks_data[2]) { state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); - if(state->error) break; + if(state->error) goto cleanup; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - addChunk_IEND(&outv); - - break; /*this isn't really a while loop; no error happened so break out now!*/ + state->error = addChunk_IEND(&outv); + if(state->error) goto cleanup; } +cleanup: lodepng_info_cleanup(&info); lodepng_free(data); + /*instead of cleaning the vector up, give it to the output*/ *out = outv.data; *outsize = outv.size; @@ -5833,8 +6029,7 @@ unsigned lodepng_encode(unsigned char** out, size_t* outsize, } unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsigned char* image, - unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) -{ + unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { unsigned error; LodePNGState state; lodepng_state_init(&state); @@ -5848,20 +6043,17 @@ unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsig return error; } -unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) -{ +unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); } -unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) -{ +unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); } #ifdef LODEPNG_COMPILE_DISK unsigned lodepng_encode_file(const char* filename, const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { unsigned char* buffer; size_t buffersize; unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); @@ -5870,19 +6062,16 @@ unsigned lodepng_encode_file(const char* filename, const unsigned char* image, u return error; } -unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) -{ +unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); } -unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) -{ +unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); } #endif /*LODEPNG_COMPILE_DISK*/ -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) -{ +void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) { lodepng_compress_settings_init(&settings->zlibsettings); settings->filter_palette_zero = 1; settings->filter_strategy = LFS_MINSUM; @@ -5903,10 +6092,8 @@ void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) This returns the description of a numerical error code in English. This is also the documentation of all the error codes. */ -const char* lodepng_error_text(unsigned code) -{ - switch(code) - { +const char* lodepng_error_text(unsigned code) { + switch(code) { case 0: return "no error, everything went ok"; case 1: return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/ case 10: return "end of input memory reached without huffman end code"; /*while huffman decoding*/ @@ -5914,16 +6101,18 @@ const char* lodepng_error_text(unsigned code) case 13: return "problem while processing dynamic deflate block"; case 14: return "problem while processing dynamic deflate block"; case 15: return "problem while processing dynamic deflate block"; - case 16: return "unexisting code while processing dynamic deflate block"; + /*this error could happen if there are only 0 or 1 symbols present in the huffman code:*/ + case 16: return "invalid code while processing dynamic deflate block"; case 17: return "end of out buffer memory reached while inflating"; case 18: return "invalid distance code while inflating"; case 19: return "end of out buffer memory reached while inflating"; case 20: return "invalid deflate block BTYPE encountered while decoding"; case 21: return "NLEN is not ones complement of LEN in a deflate block"; - /*end of out buffer memory reached while inflating: - This can happen if the inflated deflate data is longer than the amount of bytes required to fill up - all the pixels of the image, given the color depth and image dimensions. Something that doesn't - happen in a normal, well encoded, PNG image.*/ + + /*end of out buffer memory reached while inflating: + This can happen if the inflated deflate data is longer than the amount of bytes required to fill up + all the pixels of the image, given the color depth and image dimensions. Something that doesn't + happen in a normal, well encoded, PNG image.*/ case 22: return "end of out buffer memory reached while inflating"; case 23: return "end of in buffer memory reached while inflating"; case 24: return "invalid FCHECK in zlib header"; @@ -5941,13 +6130,13 @@ const char* lodepng_error_text(unsigned code) case 35: return "chunk length of a chunk is too large or the chunk too small"; case 36: return "illegal PNG filter type encountered"; case 37: return "illegal bit depth for this color type given"; - case 38: return "the palette is too big"; /*more than 256 colors*/ - case 39: return "more palette alpha values given in tRNS chunk than there are colors in the palette"; - case 40: return "tRNS chunk has wrong size for greyscale image"; + case 38: return "the palette is too small or too big"; /*0, or more than 256 colors*/ + case 39: return "tRNS chunk before PLTE or has more entries than palette size"; + case 40: return "tRNS chunk has wrong size for grayscale image"; case 41: return "tRNS chunk has wrong size for RGB image"; case 42: return "tRNS chunk appeared while it was not allowed for this color type"; case 43: return "bKGD chunk has wrong size for palette image"; - case 44: return "bKGD chunk has wrong size for greyscale image"; + case 44: return "bKGD chunk has wrong size for grayscale image"; case 45: return "bKGD chunk has wrong size for RGB image"; case 48: return "empty input buffer given to decoder. Maybe caused by non-existing file?"; case 49: return "jumped past memory while generating dynamic huffman tree"; @@ -5958,7 +6147,7 @@ const char* lodepng_error_text(unsigned code) case 54: return "repeat symbol in tree while there was no value symbol yet"; /*jumped past tree while generating huffman tree, this could be when the tree will have more leaves than symbols after generating it out of the - given lenghts. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ + given lengths. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ case 55: return "jumped past tree while generating huffman tree"; case 56: return "given output image colortype or bitdepth not supported for color conversion"; case 57: return "invalid CRC encountered (checking CRC can be disabled)"; @@ -5966,17 +6155,18 @@ const char* lodepng_error_text(unsigned code) case 59: return "requested color conversion not supported"; case 60: return "invalid window size given in the settings of the encoder (must be 0-32768)"; case 61: return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)"; - /*LodePNG leaves the choice of RGB to greyscale conversion formula to the user.*/ - case 62: return "conversion from color to greyscale not supported"; - case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; /*(2^31-1)*/ + /*LodePNG leaves the choice of RGB to grayscale conversion formula to the user.*/ + case 62: return "conversion from color to grayscale not supported"; + /*(2^31-1)*/ + case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/ case 64: return "the length of the END symbol 256 in the Huffman tree is 0"; case 66: return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes"; case 67: return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte"; case 68: return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors"; case 69: return "unknown chunk type with 'critical' flag encountered by the decoder"; - case 71: return "unexisting interlace mode given to encoder (must be 0 or 1)"; - case 72: return "while decoding, unexisting compression method encountering in zTXt or iTXt chunk (it must be 0)"; + case 71: return "invalid interlace mode given to encoder (must be 0 or 1)"; + case 72: return "while decoding, invalid compression method encountering in zTXt or iTXt chunk (it must be 0)"; case 73: return "invalid tIME chunk size"; case 74: return "invalid pHYs chunk size"; /*length could be wrong, or data chopped off*/ @@ -5987,7 +6177,7 @@ const char* lodepng_error_text(unsigned code) case 79: return "failed to open file for writing"; case 80: return "tried creating a tree of 0 symbols"; case 81: return "lazy matching at pos 0 is impossible"; - case 82: return "color conversion to palette requested while a color isn't in palette"; + case 82: return "color conversion to palette requested while a color isn't in palette, or index out of bounds"; case 83: return "memory allocation failed"; case 84: return "given image too small to contain all pixels to be encoded"; case 86: return "impossible offset in lz77 encoding (internal bug)"; @@ -5997,9 +6187,23 @@ const char* lodepng_error_text(unsigned code) /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/ case 90: return "windowsize must be a power of two"; case 91: return "invalid decompressed idat size"; - case 92: return "too many pixels, not supported"; + case 92: return "integer overflow due to too many pixels"; case 93: return "zero width or height is invalid"; case 94: return "header chunk must have a size of 13 bytes"; + case 95: return "integer overflow with combined idat chunk size"; + case 96: return "invalid gAMA chunk size"; + case 97: return "invalid cHRM chunk size"; + case 98: return "invalid sRGB chunk size"; + case 99: return "invalid sRGB rendering intent"; + case 100: return "invalid ICC profile color type, the PNG specification only allows RGB or GRAY"; + case 101: return "PNG specification does not allow RGB ICC profile on gray color types and vice versa"; + case 102: return "not allowed to set grayscale ICC profile with colored pixels by PNG specification"; + case 103: return "invalid palette index in bKGD chunk. Maybe it came before PLTE chunk?"; + case 104: return "invalid bKGD color while encoding (e.g. palette index out of range)"; + case 105: return "integer overflow of bitsize"; + case 106: return "PNG file must have PLTE chunk if color type is palette"; + case 107: return "color convert from palette mode requested without setting the palette data in it"; + case 108: return "tried to add more than 256 values to a palette"; } return "unknown error code"; } @@ -6012,12 +6216,10 @@ const char* lodepng_error_text(unsigned code) /* ////////////////////////////////////////////////////////////////////////// */ #ifdef LODEPNG_COMPILE_CPP -namespace lodepng -{ +namespace lodepng { #ifdef LODEPNG_COMPILE_DISK -unsigned load_file(std::vector& buffer, const std::string& filename) -{ +unsigned load_file(std::vector& buffer, const std::string& filename) { long size = lodepng_filesize(filename.c_str()); if(size < 0) return 78; buffer.resize((size_t)size); @@ -6025,8 +6227,7 @@ unsigned load_file(std::vector& buffer, const std::string& filena } /*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned save_file(const std::vector& buffer, const std::string& filename) -{ +unsigned save_file(const std::vector& buffer, const std::string& filename) { return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); } #endif /* LODEPNG_COMPILE_DISK */ @@ -6034,13 +6235,11 @@ unsigned save_file(const std::vector& buffer, const std::string& #ifdef LODEPNG_COMPILE_ZLIB #ifdef LODEPNG_COMPILE_DECODER unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings& settings) -{ + const LodePNGDecompressSettings& settings) { unsigned char* buffer = 0; size_t buffersize = 0; - unsigned error = zlib_decompress(&buffer, &buffersize, in, insize, &settings); - if(buffer) - { + unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings); + if(buffer) { out.insert(out.end(), &buffer[0], &buffer[buffersize]); lodepng_free(buffer); } @@ -6048,21 +6247,18 @@ unsigned decompress(std::vector& out, const unsigned char* in, si } unsigned decompress(std::vector& out, const std::vector& in, - const LodePNGDecompressSettings& settings) -{ + const LodePNGDecompressSettings& settings) { return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); } #endif /* LODEPNG_COMPILE_DECODER */ #ifdef LODEPNG_COMPILE_ENCODER unsigned compress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings& settings) -{ + const LodePNGCompressSettings& settings) { unsigned char* buffer = 0; size_t buffersize = 0; unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); - if(buffer) - { + if(buffer) { out.insert(out.end(), &buffer[0], &buffer[buffersize]); lodepng_free(buffer); } @@ -6070,8 +6266,7 @@ unsigned compress(std::vector& out, const unsigned char* in, size } unsigned compress(std::vector& out, const std::vector& in, - const LodePNGCompressSettings& settings) -{ + const LodePNGCompressSettings& settings) { return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); } #endif /* LODEPNG_COMPILE_ENCODER */ @@ -6080,24 +6275,20 @@ unsigned compress(std::vector& out, const std::vector& out, unsigned& w, unsigned& h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) -{ - unsigned char* buffer; + size_t insize, LodePNGColorType colortype, unsigned bitdepth) { + unsigned char* buffer = 0; unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); - if(buffer && !error) - { + if(buffer && !error) { State state; state.info_raw.colortype = colortype; state.info_raw.bitdepth = bitdepth; size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); } + lodepng_free(buffer); return error; } unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) -{ + const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) { return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); } unsigned decode(std::vector& out, unsigned& w, unsigned& h, State& state, - const unsigned char* in, size_t insize) -{ + const unsigned char* in, size_t insize) { unsigned char* buffer = NULL; unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); - if(buffer && !error) - { + if(buffer && !error) { size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); out.insert(out.end(), &buffer[0], &buffer[buffersize]); } @@ -6144,16 +6330,16 @@ unsigned decode(std::vector& out, unsigned& w, unsigned& h, unsigned decode(std::vector& out, unsigned& w, unsigned& h, State& state, - const std::vector& in) -{ + const std::vector& in) { return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); } #ifdef LODEPNG_COMPILE_DISK unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { std::vector buffer; + /* safe output values in case error happens */ + w = h = 0; unsigned error = load_file(buffer, filename); if(error) return error; return decode(out, w, h, buffer, colortype, bitdepth); @@ -6163,13 +6349,11 @@ unsigned decode(std::vector& out, unsigned& w, unsigned& h, const #ifdef LODEPNG_COMPILE_ENCODER unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { unsigned char* buffer; size_t buffersize; unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); - if(buffer) - { + if(buffer) { out.insert(out.end(), &buffer[0], &buffer[buffersize]); lodepng_free(buffer); } @@ -6178,21 +6362,18 @@ unsigned encode(std::vector& out, const unsigned char* in, unsign unsigned encode(std::vector& out, const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); } unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h, - State& state) -{ + State& state) { unsigned char* buffer; size_t buffersize; unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); - if(buffer) - { + if(buffer) { out.insert(out.end(), &buffer[0], &buffer[buffersize]); lodepng_free(buffer); } @@ -6201,8 +6382,7 @@ unsigned encode(std::vector& out, unsigned encode(std::vector& out, const std::vector& in, unsigned w, unsigned h, - State& state) -{ + State& state) { if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84; return encode(out, in.empty() ? 0 : &in[0], w, h, state); } @@ -6210,8 +6390,7 @@ unsigned encode(std::vector& out, #ifdef LODEPNG_COMPILE_DISK unsigned encode(const std::string& filename, const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { std::vector buffer; unsigned error = encode(buffer, in, w, h, colortype, bitdepth); if(!error) error = save_file(buffer, filename); @@ -6220,8 +6399,7 @@ unsigned encode(const std::string& filename, unsigned encode(const std::string& filename, const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) -{ + LodePNGColorType colortype, unsigned bitdepth) { if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); } diff --git a/src/libraries/lodepng/lodepng.h b/src/libraries/lodepng/lodepng.h index d633bfae5..a386459f9 100644 --- a/src/libraries/lodepng/lodepng.h +++ b/src/libraries/lodepng/lodepng.h @@ -1,7 +1,7 @@ /* -LodePNG version 20170917 +LodePNG version 20200306 -Copyright (c) 2005-2017 Lode Vandevenne +Copyright (c) 2005-2020 Lode Vandevenne This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,36 +44,44 @@ the custom_zlib field of the compress and decompress settings*/ #ifndef LODEPNG_NO_COMPILE_ZLIB #define LODEPNG_COMPILE_ZLIB #endif + /*png encoder and png decoder*/ #ifndef LODEPNG_NO_COMPILE_PNG #define LODEPNG_COMPILE_PNG #endif + /*deflate&zlib decoder and png decoder*/ #ifndef LODEPNG_NO_COMPILE_DECODER #define LODEPNG_COMPILE_DECODER #endif + /*deflate&zlib encoder and png encoder*/ #ifndef LODEPNG_NO_COMPILE_ENCODER #define LODEPNG_COMPILE_ENCODER #endif + /*the optional built in harddisk file loading and saving functions*/ #ifndef LODEPNG_NO_COMPILE_DISK #define LODEPNG_COMPILE_DISK #endif + /*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ #ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS #define LODEPNG_COMPILE_ANCILLARY_CHUNKS #endif + /*ability to convert error numerical codes to English text string*/ #ifndef LODEPNG_NO_COMPILE_ERROR_TEXT #define LODEPNG_COMPILE_ERROR_TEXT #endif + /*Compile the default allocators (C's free, malloc and realloc). If you disable this, you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your source files with custom allocators.*/ #ifndef LODEPNG_NO_COMPILE_ALLOCATORS #define LODEPNG_COMPILE_ALLOCATORS #endif + /*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ #ifdef __cplusplus #ifndef LODEPNG_NO_COMPILE_CPP @@ -87,14 +95,19 @@ source files with custom allocators.*/ #endif /*LODEPNG_COMPILE_CPP*/ #ifdef LODEPNG_COMPILE_PNG -/*The PNG color types (also used for raw).*/ -typedef enum LodePNGColorType -{ - LCT_GREY = 0, /*greyscale: 1,2,4,8,16 bit*/ +/*The PNG color types (also used for raw image).*/ +typedef enum LodePNGColorType { + LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/ LCT_RGB = 2, /*RGB: 8,16 bit*/ LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ - LCT_GREY_ALPHA = 4, /*greyscale with alpha: 8,16 bit*/ - LCT_RGBA = 6 /*RGB with alpha: 8,16 bit*/ + LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/ + LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/ + /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any invalid + byte value from 0 to 255 that could be present in an invalid PNG file header. Do + not use, compare with or set the name LCT_MAX_OCTET_VALUE, instead either use + the valid color type names above, or numeric values like 1 or 7 when checking for + particular disallowed color type byte values, or cast to integer to print it.*/ + LCT_MAX_OCTET_VALUE = 255 } LodePNGColorType; #ifdef LODEPNG_COMPILE_DECODER @@ -196,8 +209,7 @@ unsigned lodepng_encode24_file(const char* filename, #ifdef LODEPNG_COMPILE_CPP -namespace lodepng -{ +namespace lodepng { #ifdef LODEPNG_COMPILE_DECODER /*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ @@ -253,17 +265,17 @@ const char* lodepng_error_text(unsigned code); #ifdef LODEPNG_COMPILE_DECODER /*Settings for zlib decompression*/ typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; -struct LodePNGDecompressSettings -{ +struct LodePNGDecompressSettings { + /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc */ unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ + unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed blocks*/ /*use custom zlib decoder instead of built in one (default: null)*/ unsigned (*custom_zlib)(unsigned char**, size_t*, const unsigned char*, size_t, const LodePNGDecompressSettings*); /*use custom deflate decoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ + if custom_zlib is not null, custom_inflate is ignored (the zlib format uses deflate)*/ unsigned (*custom_inflate)(unsigned char**, size_t*, const unsigned char*, size_t, const LodePNGDecompressSettings*); @@ -281,13 +293,12 @@ Settings for zlib compression. Tweaking these settings tweaks the balance between speed and compression ratio. */ typedef struct LodePNGCompressSettings LodePNGCompressSettings; -struct LodePNGCompressSettings /*deflate = compress*/ -{ +struct LodePNGCompressSettings /*deflate = compress*/ { /*LZ77 related settings*/ unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ - unsigned minmatch; /*mininum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ + unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ @@ -315,8 +326,7 @@ Color mode of an image. Contains all information required to decode the pixel bits to RGBA colors. This information is the same as used in the PNG file format, and is used both for PNG and raw image data in LodePNG. */ -typedef struct LodePNGColorMode -{ +typedef struct LodePNGColorMode { /*header (IHDR)*/ LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ @@ -325,23 +335,25 @@ typedef struct LodePNGColorMode palette (PLTE and tRNS) Dynamically allocated with the colors of the palette, including alpha. - When encoding a PNG, to store your colors in the palette of the LodePNGColorMode, first use - lodepng_palette_clear, then for each color use lodepng_palette_add. - If you encode an image without alpha with palette, don't forget to put value 255 in each A byte of the palette. + This field may not be allocated directly, use lodepng_color_mode_init first, + then lodepng_palette_add per color to correctly initialize it (to ensure size + of exactly 1024 bytes). + + The alpha channels must be set as well, set them to 255 for opaque images. When decoding, by default you can ignore this palette, since LodePNG already fills the palette colors in the pixels of the raw RGBA output. The palette is only supported for color type 3. */ - unsigned char* palette; /*palette in RGBARGBA... order. When allocated, must be either 0, or have size 1024*/ - size_t palettesize; /*palette size in number of colors (amount of bytes is 4 * palettesize)*/ + unsigned char* palette; /*palette in RGBARGBA... order. Must be either 0, or when allocated must have 1024 bytes*/ + size_t palettesize; /*palette size in number of colors (amount of used bytes is 4 * palettesize)*/ /* transparent color key (tRNS) This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. - For greyscale PNGs, r, g and b will all 3 be set to the same. + For grayscale PNGs, r, g and b will all 3 be set to the same. When decoding, by default you can ignore this information, since LodePNG sets pixels with this key to transparent already in the raw RGBA output. @@ -349,7 +361,7 @@ typedef struct LodePNGColorMode The color key is only supported for color types 0 and 2. */ unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ - unsigned key_r; /*red/greyscale component of color key*/ + unsigned key_r; /*red/grayscale component of color key*/ unsigned key_g; /*green component of color key*/ unsigned key_b; /*blue component of color key*/ } LodePNGColorMode; @@ -359,6 +371,8 @@ void lodepng_color_mode_init(LodePNGColorMode* info); void lodepng_color_mode_cleanup(LodePNGColorMode* info); /*return value is error code (0 means no error)*/ unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source); +/* Makes a temporary LodePNGColorMode that does not need cleanup (no palette) */ +LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth); void lodepng_palette_clear(LodePNGColorMode* info); /*add 1 color to the palette*/ @@ -370,7 +384,7 @@ unsigned lodepng_get_bpp(const LodePNGColorMode* info); /*get the amount of color channels used, based on colortype in the struct. If a palette is used, it counts as 1 channel.*/ unsigned lodepng_get_channels(const LodePNGColorMode* info); -/*is it a greyscale type? (only colortype 0 or 4)*/ +/*is it a grayscale type? (only colortype 0 or 4)*/ unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info); /*has it got an alpha channel? (only colortype 2 or 6)*/ unsigned lodepng_is_alpha_type(const LodePNGColorMode* info); @@ -392,8 +406,7 @@ size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* colo #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*The information of a Time chunk in PNG.*/ -typedef struct LodePNGTime -{ +typedef struct LodePNGTime { unsigned year; /*2 bytes used (0-65535)*/ unsigned month; /*1-12*/ unsigned day; /*1-31*/ @@ -404,28 +417,39 @@ typedef struct LodePNGTime #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*Information about the PNG image, except pixels, width and height.*/ -typedef struct LodePNGInfo -{ +typedef struct LodePNGInfo { /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ unsigned compression_method;/*compression method of the original file. Always 0.*/ unsigned filter_method; /*filter method of the original file*/ - unsigned interlace_method; /*interlace method of the original file*/ + unsigned interlace_method; /*interlace method of the original file: 0=none, 1=Adam7*/ LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /* - suggested background color chunk (bKGD) - This color uses the same color mode as the PNG (except alpha channel), which can be 1-bit to 16-bit. + Suggested background color chunk (bKGD) - For greyscale PNGs, r, g and b will all 3 be set to the same. When encoding - the encoder writes the red one. For palette PNGs: When decoding, the RGB value - will be stored, not a palette index. But when encoding, specify the index of - the palette in background_r, the other two are then ignored. + This uses the same color mode and bit depth as the PNG (except no alpha channel), + with values truncated to the bit depth in the unsigned integer. - The decoder does not use this background color to edit the color of pixels. + For grayscale and palette PNGs, the value is stored in background_r. The values + in background_g and background_b are then unused. + + So when decoding, you may get these in a different color mode than the one you requested + for the raw pixels. + + When encoding with auto_convert, you must use the color model defined in info_png.color for + these values. The encoder normally ignores info_png.color when auto_convert is on, but will + use it to interpret these values (and convert copies of them to its chosen color model). + + When encoding, avoid setting this to an expensive color, such as a non-gray value + when the image is gray, or the compression will be worse since it will be forced to + write the PNG with a more expensive color mode (when auto_convert is on). + + The decoder does not use this background color to edit the color of pixels. This is a + completely optional metadata feature. */ unsigned background_defined; /*is a suggested background color given?*/ - unsigned background_r; /*red component of suggested background color*/ + unsigned background_r; /*red/gray/palette component of suggested background color*/ unsigned background_g; /*green component of suggested background color*/ unsigned background_b; /*blue component of suggested background color*/ @@ -436,6 +460,10 @@ typedef struct LodePNGInfo text_strings, while text_keys are keywords that give a short description what the actual text represents, e.g. Title, Author, Description, or anything else. + All the string fields below including keys, names and language tags are null terminated. + The PNG specification uses null characters for the keys, names and tags, and forbids null + characters to appear in the main text which is why we can use null termination everywhere here. + A keyword is minimum 1 character and maximum 79 characters long. It's discouraged to use a single line length longer than 79 characters for texts. @@ -468,11 +496,86 @@ typedef struct LodePNGInfo unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ /* - unknown chunks - There are 3 buffers, one for each position in the PNG where unknown chunks can appear - each buffer contains all unknown chunks for that position consecutively - The 3 buffers are the unknown chunks between certain critical chunks: - 0: IHDR-PLTE, 1: PLTE-IDAT, 2: IDAT-IEND + Color profile related chunks: gAMA, cHRM, sRGB, iCPP + + LodePNG does not apply any color conversions on pixels in the encoder or decoder and does not interpret these color + profile values. It merely passes on the information. If you wish to use color profiles and convert colors, please + use these values with a color management library. + + See the PNG, ICC and sRGB specifications for more information about the meaning of these values. + */ + + /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, 1 = present). */ + unsigned gama_gamma; /* Gamma exponent times 100000 */ + + /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, 1 = present). */ + unsigned chrm_white_x; /* White Point x times 100000 */ + unsigned chrm_white_y; /* White Point y times 100000 */ + unsigned chrm_red_x; /* Red x times 100000 */ + unsigned chrm_red_y; /* Red y times 100000 */ + unsigned chrm_green_x; /* Green x times 100000 */ + unsigned chrm_green_y; /* Green y times 100000 */ + unsigned chrm_blue_x; /* Blue x times 100000 */ + unsigned chrm_blue_y; /* Blue y times 100000 */ + + /* + sRGB chunk: optional. May not appear at the same time as iCCP. + If gAMA is also present gAMA must contain value 45455. + If cHRM is also present cHRM must contain respectively 31270,32900,64000,33000,30000,60000,15000,6000. + */ + unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, 1 = present). */ + unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. colorimetric, 2=saturation, 3=abs. colorimetric */ + + /* + iCCP chunk: optional. May not appear at the same time as sRGB. + + LodePNG does not parse or use the ICC profile (except its color space header field for an edge case), a + separate library to handle the ICC data (not included in LodePNG) format is needed to use it for color + management and conversions. + + For encoding, if iCCP is present, gAMA and cHRM are recommended to be added as well with values that match the ICC + profile as closely as possible, if you wish to do this you should provide the correct values for gAMA and cHRM and + enable their '_defined' flags since LodePNG will not automatically compute them from the ICC profile. + + For encoding, the ICC profile is required by the PNG specification to be an "RGB" profile for non-gray + PNG color types and a "GRAY" profile for gray PNG color types. If you disable auto_convert, you must ensure + the ICC profile type matches your requested color type, else the encoder gives an error. If auto_convert is + enabled (the default), and the ICC profile is not a good match for the pixel data, this will result in an encoder + error if the pixel data has non-gray pixels for a GRAY profile, or a silent less-optimal compression of the pixel + data if the pixels could be encoded as grayscale but the ICC profile is RGB. + + To avoid this do not set an ICC profile in the image unless there is a good reason for it, and when doing so + make sure you compute it carefully to avoid the above problems. + */ + unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, 1 = present). */ + char* iccp_name; /* Null terminated string with profile name, 1-79 bytes */ + /* + The ICC profile in iccp_profile_size bytes. + Don't allocate this buffer yourself. Use the init/cleanup functions + correctly and use lodepng_set_icc and lodepng_clear_icc. + */ + unsigned char* iccp_profile; + unsigned iccp_profile_size; /* The size of iccp_profile in bytes */ + + /* End of color profile related chunks */ + + + /* + unknown chunks: chunks not known by LodePNG, passed on byte for byte. + + There are 3 buffers, one for each position in the PNG where unknown chunks can appear. + Each buffer contains all unknown chunks for that position consecutively. + The 3 positions are: + 0: between IHDR and PLTE, 1: between PLTE and IDAT, 2: between IDAT and IEND. + + For encoding, do not store critical chunks or known chunks that are enabled with a "_defined" flag + above in here, since the encoder will blindly follow this and could then encode an invalid PNG file + (such as one with two IHDR chunks or the disallowed combination of sRGB with iCCP). But do use + this if you wish to store an ancillary chunk that is not supported by LodePNG (such as sPLT or hIST), + or any non-standard PNG chunk. + Do not allocate or traverse this data yourself. Use the chunk traversing functions declared later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. */ @@ -488,12 +591,16 @@ void lodepng_info_cleanup(LodePNGInfo* info); unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/ +void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ -void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/ unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/ +void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/ + +/*replaces if exists*/ +unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size); +void lodepng_clear_icc(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /* @@ -516,11 +623,17 @@ unsigned lodepng_convert(unsigned char* out, const unsigned char* in, Settings for the decoder. This contains settings for the PNG and the Zlib decoder, but not the Info settings from the Info structs. */ -typedef struct LodePNGDecoderSettings -{ +typedef struct LodePNGDecoderSettings { LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ + /* Check LodePNGDecompressSettings for more ignorable errors such as ignore_adler32 */ unsigned ignore_crc; /*ignore CRC checksums*/ + unsigned ignore_critical; /*ignore unknown critical chunks*/ + unsigned ignore_end; /*ignore issues at end of file if possible (missing IEND chunk, too large chunk, ...)*/ + /* TODO: make a system involving warnings with levels and a strict mode instead. Other potentially recoverable + errors: srgb rendering intent value, size of content of ancillary chunks, more than 79 characters for some + strings, placement/combination rules for ancillary chunks, crc of unknown chunks, allowed characters + in string keys, etc... */ unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ @@ -536,10 +649,14 @@ void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); #ifdef LODEPNG_COMPILE_ENCODER /*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ -typedef enum LodePNGFilterStrategy -{ +typedef enum LodePNGFilterStrategy { /*every filter at zero*/ - LFS_ZERO, + LFS_ZERO = 0, + /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, but for testing*/ + LFS_ONE = 1, + LFS_TWO = 2, + LFS_THREE = 3, + LFS_FOUR = 4, /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/ LFS_MINSUM, /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending @@ -554,36 +671,36 @@ typedef enum LodePNGFilterStrategy LFS_PREDEFINED } LodePNGFilterStrategy; -/*Gives characteristics about the colors of the image, which helps decide which color model to use for encoding. +/*Gives characteristics about the integer RGBA colors of the image (count, alpha channel usage, bit depth, ...), +which helps decide which color model to use for encoding. Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ -typedef struct LodePNGColorProfile -{ - unsigned colored; /*not greyscale*/ +typedef struct LodePNGColorStats { + unsigned colored; /*not grayscale*/ unsigned key; /*image is not opaque and color key is possible instead of full alpha*/ unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte is duplicated, e.g. 65535 means 255*/ unsigned short key_g; unsigned short key_b; unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/ - unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16.*/ - unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order*/ - unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for greyscale only. 16 if 16-bit per channel required.*/ -} LodePNGColorProfile; + unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/ + unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/ + unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/ + size_t numpixels; -void lodepng_color_profile_init(LodePNGColorProfile* profile); + /*user settings for computing/using the stats*/ + unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype in auto_choose_color, and don't count numcolors*/ + unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the image only has gray colors*/ +} LodePNGColorStats; -/*Get a LodePNGColorProfile of the image.*/ -unsigned lodepng_get_color_profile(LodePNGColorProfile* profile, - const unsigned char* image, unsigned w, unsigned h, - const LodePNGColorMode* mode_in); -/*The function LodePNG uses internally to decide the PNG color with auto_convert. -Chooses an optimal color model, e.g. grey if only grey pixels, palette if < 256 colors, ...*/ -unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out, - const unsigned char* image, unsigned w, unsigned h, - const LodePNGColorMode* mode_in); +void lodepng_color_stats_init(LodePNGColorStats* stats); + +/*Get a LodePNGColorStats of the image. The stats must already have been inited. +Returns error code (e.g. alloc fail) or 0 if ok.*/ +unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, + const unsigned char* image, unsigned w, unsigned h, + const LodePNGColorMode* mode_in); /*Settings for the encoder.*/ -typedef struct LodePNGEncoderSettings -{ +typedef struct LodePNGEncoderSettings { LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ @@ -619,8 +736,7 @@ void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) /*The settings, state and information for extended encoding and decoding.*/ -typedef struct LodePNGState -{ +typedef struct LodePNGState { #ifdef LODEPNG_COMPILE_DECODER LodePNGDecoderSettings decoder; /*the decoding settings*/ #endif /*LODEPNG_COMPILE_DECODER*/ @@ -630,10 +746,6 @@ typedef struct LodePNGState LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ unsigned error; -#ifdef LODEPNG_COMPILE_CPP - /* For the lodepng::State subclass. */ - virtual ~LodePNGState(){} -#endif } LodePNGState; /*init, cleanup and copy functions to use with this struct*/ @@ -653,7 +765,7 @@ unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, /* Read the PNG header, but not the actual data. This returns only the information -that is in the header chunk of the PNG, such as width, height and color type. The +that is in the IHDR chunk of the PNG, such as width, height and color type. The information is placed in the info_png field of the LodePNGState. */ unsigned lodepng_inspect(unsigned* w, unsigned* h, @@ -661,6 +773,20 @@ unsigned lodepng_inspect(unsigned* w, unsigned* h, const unsigned char* in, size_t insize); #endif /*LODEPNG_COMPILE_DECODER*/ +/* +Reads one metadata chunk (other than IHDR) of the PNG file and outputs what it +read in the state. Returns error code on failure. +Use lodepng_inspect first with a new state, then e.g. lodepng_chunk_find_const +to find the desired chunk type, and if non null use lodepng_inspect_chunk (with +chunk_pointer - start_of_file as pos). +Supports most metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...). +Ignores unsupported, unknown, non-metadata or IHDR chunks (without error). +Requirements: &in[pos] must point to start of a chunk, must use regular +lodepng_inspect first since format of most other chunks depends on IHDR, and if +there is a PLTE chunk, that one must be inspected before tRNS or bKGD. +*/ +unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, + const unsigned char* in, size_t insize); #ifdef LODEPNG_COMPILE_ENCODER /*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/ @@ -674,11 +800,23 @@ The lodepng_chunk functions are normally not needed, except to traverse the unknown chunks stored in the LodePNGInfo struct, or add new ones to it. It also allows traversing the chunks of an encoded PNG file yourself. -PNG standard chunk naming conventions: -First byte: uppercase = critical, lowercase = ancillary -Second byte: uppercase = public, lowercase = private -Third byte: must be uppercase -Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy +The chunk pointer always points to the beginning of the chunk itself, that is +the first byte of the 4 length bytes. + +In the PNG file format, chunks have the following format: +-4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 bytes longer) +-4 bytes chunk type (ASCII a-z,A-Z only, see below) +-length bytes of data (may be 0 bytes if length was 0) +-4 bytes of CRC, computed on chunk name + data + +The first chunk starts at the 8th byte of the PNG file, the entire rest of the file +exists out of concatenated chunks with the above format. + +PNG standard chunk ASCII naming conventions: +-First byte: uppercase = critical, lowercase = ancillary +-Second byte: uppercase = public, lowercase = private +-Third byte: must be uppercase +-Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy */ /* @@ -713,24 +851,38 @@ unsigned lodepng_chunk_check_crc(const unsigned char* chunk); /*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/ void lodepng_chunk_generate_crc(unsigned char* chunk); -/*iterate to next chunks. don't use on IEND chunk, as there is no next chunk then*/ -unsigned char* lodepng_chunk_next(unsigned char* chunk); -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk); +/* +Iterate to next chunks, allows iterating through all chunks of the PNG file. +Input must be at the beginning of a chunk (result of a previous lodepng_chunk_next call, +or the 8th byte of a PNG file which always has the first chunk), or alternatively may +point to the first byte of the PNG file (which is not a chunk but the magic header, the +function will then skip over it and return the first real chunk). +Will output pointer to the start of the next chunk, or at or beyond end of the file if there +is no more chunk after this or possibly if the chunk is corrupt. +Start this process at the 8th byte of the PNG file. +In a non-corrupt PNG file, the last chunk should have name "IEND". +*/ +unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end); +const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end); + +/*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/ +unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]); +const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]); /* Appends chunk to the data in out. The given chunk should already have its chunk header. -The out variable and outlength are updated to reflect the new reallocated buffer. +The out variable and outsize are updated to reflect the new reallocated buffer. Returns error code (0 if it went ok) */ -unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsigned char* chunk); +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk); /* Appends new chunk to out. The chunk to append is given by giving its length, type and data separately. The type is a 4-letter string. -The out variable and outlength are updated to reflect the new reallocated buffer. +The out variable and outsize are updated to reflect the new reallocated buffer. Returne error code (0 if it went ok) */ -unsigned lodepng_chunk_create(unsigned char** out, size_t* outlength, unsigned length, +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, const char* type, const unsigned char* data); @@ -814,15 +966,13 @@ unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const #ifdef LODEPNG_COMPILE_CPP /* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ -namespace lodepng -{ +namespace lodepng { #ifdef LODEPNG_COMPILE_PNG -class State : public LodePNGState -{ +class State : public LodePNGState { public: State(); State(const State& other); - virtual ~State(); + ~State(); State& operator=(const State& other); }; @@ -890,16 +1040,21 @@ TODO: [.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often [.] check compatibility with various compilers - done but needs to be redone for every newer version [X] converting color to 16-bit per channel types -[ ] read all public PNG chunk types (but never let the color profile and gamma ones touch RGB values) +[X] support color profile chunk types (but never let them touch RGB values by default) +[ ] support all public PNG chunk types (almost done except sBIT, sPLT and hIST) [ ] make sure encoder generates no chunks with size > (2^31)-1 [ ] partial decoding (stream processing) [X] let the "isFullyOpaque" function check color keys and transparent palettes too [X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" -[ ] don't stop decoding on errors like 69, 57, 58 (make warnings) +[ ] allow treating some errors like warnings, when image is recoverable (e.g. 69, 57, 58) [ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ... +[ ] error messages with line numbers (and version) +[ ] errors in state instead of as return code? +[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk [ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes [ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... [ ] allow user to give data (void*) to custom allocator +[X] provide alternatives for C library functions not present on some platforms (memcpy, ...) */ #endif /*LODEPNG_H inclusion guard*/ @@ -994,8 +1149,10 @@ The following features are supported by the decoder: *) zlib decompression (inflate) *) zlib compression (deflate) *) CRC32 and ADLER32 checksums +*) colorimetric color profile conversions: currently experimentally available in lodepng_util.cpp only, + plus alternatively ability to pass on chroma/gamma/ICC profile information to other color management system. *) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. -*) the following chunks are supported (generated/interpreted) by both encoder and decoder: +*) the following chunks are supported by both encoder and decoder: IHDR: header information PLTE: color palette IDAT: pixel data @@ -1007,6 +1164,10 @@ The following features are supported by the decoder: bKGD: suggested background color pHYs: physical dimensions tIME: modification time + cHRM: RGB chromaticities + gAMA: RGB gamma correction + iCCP: ICC color profile + sRGB: rendering intent 1.2. features not supported --------------------------- @@ -1015,10 +1176,10 @@ The following features are _not_ supported: *) some features needed to make a conformant PNG-Editor might be still missing. *) partial loading/stream processing. All data must be available and is processed in one call. -*) The following public chunks are not supported but treated as unknown chunks by LodePNG - cHRM, gAMA, iCCP, sRGB, sBIT, hIST, sPLT - Some of these are not supported on purpose: LodePNG wants to provide the RGB values - stored in the pixels, not values modified by system dependent gamma or color models. +*) The following public chunks are not (yet) supported but treated as unknown chunks by LodePNG: + sBIT + hIST + sPLT 2. C and C++ version @@ -1092,7 +1253,7 @@ LodePNGColorMode info_raw When decoding, here you can specify which color type you want the resulting raw image to be. If this is different from the colortype of the PNG, then the decoder will automatically convert the result. This conversion -always works, except if you want it to convert a color PNG to greyscale or to +always works, except if you want it to convert a color PNG to grayscale or to a palette with missing colors. By default, 32-bit color is used for the result. @@ -1188,7 +1349,7 @@ can encode the colors of all pixels without information loss. An important thing to note about LodePNG, is that the color type of the PNG, and the color type of the raw image, are completely independent. By default, when you decode a PNG, you get the result as a raw image in the color type you want, -no matter whether the PNG was encoded with a palette, greyscale or RGBA color. +no matter whether the PNG was encoded with a palette, grayscale or RGBA color. And if you encode an image, by default LodePNG will automatically choose the PNG color type that gives good compression based on the values of colors and amount of colors in the image. It can be configured to let you control it instead as @@ -1196,10 +1357,10 @@ well, though. To be able to do this, LodePNG does conversions from one color mode to another. It can convert from almost any color type to any other color type, except the -following conversions: RGB to greyscale is not supported, and converting to a +following conversions: RGB to grayscale is not supported, and converting to a palette when the palette doesn't have a required color is not supported. This is not supported on purpose: this is information loss which requires a color -reduction algorithm that is beyong the scope of a PNG encoder (yes, RGB to grey +reduction algorithm that is beyond the scope of a PNG encoder (yes, RGB to gray is easy, but there are multiple ways if you want to give some channels more weight). @@ -1220,10 +1381,10 @@ decoding to have another color type, a conversion is done by LodePNG. The PNG specification gives the following color types: -0: greyscale, bit depths 1, 2, 4, 8, 16 +0: grayscale, bit depths 1, 2, 4, 8, 16 2: RGB, bit depths 8 and 16 3: palette, bit depths 1, 2, 4 and 8 -4: greyscale with alpha, bit depths 8 and 16 +4: grayscale with alpha, bit depths 8 and 16 6: RGBA, bit depths 8 and 16 Bit depth is the amount of bits per pixel per color channel. So the total amount @@ -1272,15 +1433,22 @@ To avoid some confusion: the raw image correctly before encoding. -both encoder and decoder use the same color converter. +The function lodepng_convert does the color conversion. It is available in the +interface but normally isn't needed since the encoder and decoder already call +it. + Non supported color conversions: --color to greyscale: no error is thrown, but the result will look ugly because -only the red channel is taken --anything to palette when that palette does not have that color in it: in this -case an error is thrown +-color to grayscale when non-gray pixels are present: no error is thrown, but +the result will look ugly because only the red channel is taken (it assumes all +three channels are the same in this case so ignores green and blue). The reason +no error is given is to allow converting from three-channel grayscale images to +one-channel even if there are numerical imprecisions. +-anything to palette when the palette does not have an exact match for a from-color +in it: in this case an error is thrown Supported color conversions: -anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA --any grey or grey+alpha, to grey or grey+alpha +-any gray or gray+alpha, to gray or gray+alpha -anything to a palette, as long as the palette has the requested colors in it -removing alpha channel -higher to smaller bitdepth, and vice versa @@ -1293,10 +1461,6 @@ false. as the PNG has, by setting the color_convert setting to false. Settings in info_raw are then ignored. -The function lodepng_convert does the color conversion. It is available in the -interface but normally isn't needed since the encoder and decoder already call -it. - 6.3. padding bits ----------------- @@ -1305,7 +1469,7 @@ have a bit amount that isn't a multiple of 8, then padding bits are used so that scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. The raw input image you give to the encoder, and the raw output image you get from the decoder will NOT have these padding bits, e.g. in the case of a 1-bit image with a width -of 7 pixels, the first pixel of the second scanline will the the 8th bit of the first byte, +of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte, not the first bit of a new byte. 6.4. A note about 16-bits per channel and endianness @@ -1406,12 +1570,12 @@ Iterate to the next chunk. This works if you have a buffer with consecutive chun functions do no boundary checking of the allocated data whatsoever, so make sure there is enough data available in the buffer to be able to go to the next chunk. -unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsigned char* chunk): -unsigned lodepng_chunk_create(unsigned char** out, size_t* outlength, unsigned length, +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk): +unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, const char* type, const unsigned char* data): These functions are used to create new chunks that are appended to the data in *out that has -length *outlength. The append function appends an existing chunk to the new data. The create +length *outsize. The append function appends an existing chunk to the new data. The create function creates a new chunk with the given parameters and appends it. Type is the 4-letter name of the chunk. @@ -1422,7 +1586,7 @@ The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3 buffers (each with size) to contain 3 types of unknown chunks: the ones that come before the PLTE chunk, the ones that come between the PLTE and the IDAT chunks, and the ones that come after the IDAT chunks. -It's necessary to make the distionction between these 3 cases because the PNG +It's necessary to make the distinction between these 3 cases because the PNG standard forces to keep the ordering of unknown chunks compared to the critical chunks, but does not force any other ordering rules. @@ -1505,7 +1669,7 @@ C and C++. *) Other Compilers If you encounter problems on any compilers, feel free to let me know and I may -try to fix it if the compiler is modern and standards complient. +try to fix it if the compiler is modern and standards compliant. 10. examples @@ -1520,8 +1684,7 @@ examples can be found on the LodePNG website. #include "lodepng.h" #include -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { const char* filename = argc > 1 ? argv[1] : "test.png"; //load and decode @@ -1540,8 +1703,7 @@ int main(int argc, char *argv[]) #include "lodepng.h" -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { unsigned error; unsigned char* image; size_t width, height; @@ -1567,6 +1729,8 @@ For decoding: state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums state.decoder.zlibsettings.custom_...: use custom inflate function state.decoder.ignore_crc: ignore CRC checksums +state.decoder.ignore_critical: ignore unknown critical chunks +state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption causes other errors state.decoder.color_convert: convert internal PNG color to chosen one state.decoder.read_text_chunks: whether to read in text metadata chunks state.decoder.remember_unknown_chunks: whether to read in unknown chunks @@ -1608,6 +1772,24 @@ yyyymmdd. Some changes aren't backwards compatible. Those are indicated with a (!) symbol. +Not all changes are listed here, the commit history in github lists more: +https://github.com/lvandeve/lodepng + +*) 06 mar 2020: simplified some of the dynamic memory allocations. +*) 12 jan 2020: (!) added 'end' argument to lodepng_chunk_next to allow correct + overflow checks. +*) 14 aug 2019: around 25% faster decoding thanks to huffman lookup tables. +*) 15 jun 2019: (!) auto_choose_color API changed (for bugfix: don't use palette + if gray ICC profile) and non-ICC LodePNGColorProfile renamed to + LodePNGColorStats. +*) 30 dec 2018: code style changes only: removed newlines before opening braces. +*) 10 sep 2018: added way to inspect metadata chunks without full decoding. +*) 19 aug 2018: (!) fixed color mode bKGD is encoded with and made it use + palette index in case of palette. +*) 10 aug 2018: (!) added support for gAMA, cHRM, sRGB and iCCP chunks. This + change is backwards compatible unless you relied on unknown_chunks for those. +*) 11 jun 2018: less restrictive check for pixel size integer overflow +*) 14 jan 2018: allow optionally ignoring a few more recoverable errors *) 17 sep 2017: fix memory leak for some encoder input error cases *) 27 nov 2016: grey+alpha auto color model detection bugfix *) 18 apr 2016: Changed qsort to custom stable sort (for platforms w/o qsort). @@ -1616,6 +1798,7 @@ symbol. *) 08 dec 2015: Made load_file function return error if file can't be opened. *) 24 okt 2015: Bugfix with decoding to palette output. *) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding. +*) 24 aug 2014: Moved to github *) 23 aug 2014: Reduced needless memory usage of decoder. *) 28 jun 2014: Removed fix_png setting, always support palette OOB for simplicity. Made ColorProfile public. @@ -1623,25 +1806,25 @@ symbol. *) 22 dec 2013: Power of two windowsize required for optimization. *) 15 apr 2013: Fixed bug with LAC_ALPHA and color key. *) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png). -*) 11 mar 2013 (!): Bugfix with custom free. Changed from "my" to "lodepng_" +*) 11 mar 2013: (!) Bugfix with custom free. Changed from "my" to "lodepng_" prefix for the custom allocators and made it possible with a new #define to use custom ones in your project without needing to change lodepng's code. *) 28 jan 2013: Bugfix with color key. *) 27 okt 2012: Tweaks in text chunk keyword length error handling. -*) 8 okt 2012 (!): Added new filter strategy (entropy) and new auto color mode. +*) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode. (no palette). Better deflate tree encoding. New compression tweak settings. Faster color conversions while decoding. Some internal cleanups. *) 23 sep 2012: Reduced warnings in Visual Studio a little bit. -*) 1 sep 2012 (!): Removed #define's for giving custom (de)compression functions +*) 1 sep 2012: (!) Removed #define's for giving custom (de)compression functions and made it work with function pointers instead. *) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc and free functions and toggle #defines from compiler flags. Small fixes. -*) 6 may 2012 (!): Made plugging in custom zlib/deflate functions more flexible. -*) 22 apr 2012 (!): Made interface more consistent, renaming a lot. Removed +*) 6 may 2012: (!) Made plugging in custom zlib/deflate functions more flexible. +*) 22 apr 2012: (!) Made interface more consistent, renaming a lot. Removed redundant C++ codec classes. Reduced amount of structs. Everything changed, but it is cleaner now imho and functionality remains the same. Also fixed several bugs and shrunk the implementation code. Made new samples. -*) 6 nov 2011 (!): By default, the encoder now automatically chooses the best +*) 6 nov 2011: (!) By default, the encoder now automatically chooses the best PNG color model and bit depth, based on the amount and type of colors of the raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. *) 9 okt 2011: simpler hash chain implementation for the encoder. @@ -1650,7 +1833,7 @@ symbol. A bug with the PNG filtertype heuristic was fixed, so that it chooses much better ones (it's quite significant). A setting to do an experimental, slow, brute force search for PNG filter types is added. -*) 17 aug 2011 (!): changed some C zlib related function names. +*) 17 aug 2011: (!) changed some C zlib related function names. *) 16 aug 2011: made the code less wide (max 120 characters per line). *) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors. *) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled. @@ -1758,5 +1941,5 @@ Domain: gmail dot com. Account: lode dot vandevenne. -Copyright (c) 2005-2017 Lode Vandevenne +Copyright (c) 2005-2020 Lode Vandevenne */ From 4191351f5595ca51b9c5f0545d9691462d13eaa2 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Mon, 15 Jun 2020 13:23:53 +0800 Subject: [PATCH 35/54] Update stb_image to 2.25 --- src/libraries/stb/stb_image.h | 285 +++++++++++++++++++++++----------- 1 file changed, 197 insertions(+), 88 deletions(-) diff --git a/src/libraries/stb/stb_image.h b/src/libraries/stb/stb_image.h index a6202a31f..2857f05d3 100644 --- a/src/libraries/stb/stb_image.h +++ b/src/libraries/stb/stb_image.h @@ -1,4 +1,4 @@ -/* stb_image - v2.22 - public domain image loader - http://nothings.org/stb +/* stb_image - v2.25 - public domain image loader - http://nothings.org/stb no warranty implied; use at your own risk Do this: @@ -48,9 +48,12 @@ LICENSE RECENT REVISION HISTORY: + 2.25 (2020-02-02) fix warnings + 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically + 2.23 (2019-08-11) fix clang static analysis warning 2.22 (2019-03-04) gif fixes, fix warnings 2.21 (2019-02-25) fix typo in comment - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs 2.19 (2018-02-11) fix warning 2.18 (2018-01-30) fix warnings 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings @@ -104,7 +107,8 @@ RECENT REVISION HISTORY: Oriol Ferrer Mesia Josh Tobin Matthew Gregan github:phprus Julian Raschke Gregory Mullen Baldur Karlsson github:poppolopoppo Christian Floisand Kevin Schmidt JR Smith github:darealshinji - Blazej Dariusz Roszkowski github:Michaelangel007 + Brad Weinberger Matvey Cherevko github:Michaelangel007 + Blazej Dariusz Roszkowski Alexander Veselov */ #ifndef STBI_INCLUDE_STB_IMAGE_H @@ -433,7 +437,7 @@ STBIDEF int stbi_is_hdr_from_file(FILE *f); // get a VERY brief reason for failure -// NOT THREADSAFE +// on most compilers (and ALL modern mainstream compilers) this is threadsafe STBIDEF const char *stbi_failure_reason (void); // free the loaded image -- this is just free() @@ -466,6 +470,11 @@ STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); // flip the image vertically, so the first pixel in the output array is the bottom left STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); +// as above, but only applies to images loaded on the thread that calls the function +// this function is only available if your compiler supports thread-local variables; +// calling it will fail to link if your compiler doesn't +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); + // ZLIB client - used by PNG, available for other purposes STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); @@ -562,6 +571,17 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch #define stbi_inline __forceinline #endif +#ifndef STBI_NO_THREAD_LOCALS + #if defined(__cplusplus) && __cplusplus >= 201103L + #define STBI_THREAD_LOCAL thread_local + #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define STBI_THREAD_LOCAL _Thread_local + #elif defined(__GNUC__) + #define STBI_THREAD_LOCAL __thread + #elif defined(_MSC_VER) + #define STBI_THREAD_LOCAL __declspec(thread) +#endif +#endif #ifdef _MSC_VER typedef unsigned short stbi__uint16; @@ -872,19 +892,24 @@ static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); #endif -// this is not threadsafe -static const char *stbi__g_failure_reason; +static +#ifdef STBI_THREAD_LOCAL +STBI_THREAD_LOCAL +#endif +const char *stbi__g_failure_reason; STBIDEF const char *stbi_failure_reason(void) { return stbi__g_failure_reason; } +#ifndef STBI_NO_FAILURE_STRINGS static int stbi__err(const char *str) { stbi__g_failure_reason = str; return 0; } +#endif static void *stbi__malloc(size_t size) { @@ -923,11 +948,13 @@ static int stbi__mul2sizes_valid(int a, int b) return a <= INT_MAX/b; } +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) // returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow static int stbi__mad2sizes_valid(int a, int b, int add) { return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); } +#endif // returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow static int stbi__mad3sizes_valid(int a, int b, int c, int add) @@ -945,12 +972,14 @@ static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) } #endif +#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) // mallocs with size overflow checking static void *stbi__malloc_mad2(int a, int b, int add) { if (!stbi__mad2sizes_valid(a, b, add)) return NULL; return stbi__malloc(a*b + add); } +#endif static void *stbi__malloc_mad3(int a, int b, int c, int add) { @@ -994,13 +1023,29 @@ static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); #endif -static int stbi__vertically_flip_on_load = 0; +static int stbi__vertically_flip_on_load_global = 0; STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) { - stbi__vertically_flip_on_load = flag_true_if_should_flip; + stbi__vertically_flip_on_load_global = flag_true_if_should_flip; } +#ifndef STBI_THREAD_LOCAL +#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global +#else +static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; + +STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load_local = flag_true_if_should_flip; + stbi__vertically_flip_on_load_set = 1; +} + +#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ + ? stbi__vertically_flip_on_load_local \ + : stbi__vertically_flip_on_load_global) +#endif // STBI_THREAD_LOCAL + static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) { memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields @@ -1022,6 +1067,8 @@ static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int re #endif #ifndef STBI_NO_PSD if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); + #else + STBI_NOTUSED(bpc); #endif #ifndef STBI_NO_PIC if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); @@ -1110,8 +1157,8 @@ static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int byt stbi_uc *bytes = (stbi_uc *)image; for (slice = 0; slice < z; ++slice) { - stbi__vertical_flip(bytes, w, h, bytes_per_pixel); - bytes += slice_size; + stbi__vertical_flip(bytes, w, h, bytes_per_pixel); + bytes += slice_size; } } #endif @@ -1197,7 +1244,7 @@ static FILE *stbi__fopen(char const *filename, char const *mode) wchar_t wFilename[1024]; if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename))) return 0; - + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode))) return 0; @@ -1299,15 +1346,15 @@ STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *u STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) { unsigned char *result; - stbi__context s; - stbi__start_mem(&s,buffer,len); - + stbi__context s; + stbi__start_mem(&s,buffer,len); + result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); if (stbi__vertically_flip_on_load) { - stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); + stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); } - return result; + return result; } #endif @@ -1476,6 +1523,9 @@ stbi_inline static stbi_uc stbi__get8(stbi__context *s) return 0; } +#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else stbi_inline static int stbi__at_eof(stbi__context *s) { if (s->io.read) { @@ -1487,7 +1537,11 @@ stbi_inline static int stbi__at_eof(stbi__context *s) return s->img_buffer >= s->img_buffer_end; } +#endif +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) +// nothing +#else static void stbi__skip(stbi__context *s, int n) { if (n < 0) { @@ -1504,7 +1558,11 @@ static void stbi__skip(stbi__context *s, int n) } s->img_buffer += n; } +#endif +#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) +// nothing +#else static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) { if (s->io.read) { @@ -1528,18 +1586,27 @@ static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) } else return 0; } +#endif +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else static int stbi__get16be(stbi__context *s) { int z = stbi__get8(s); return (z << 8) + stbi__get8(s); } +#endif +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) +// nothing +#else static stbi__uint32 stbi__get32be(stbi__context *s) { stbi__uint32 z = stbi__get16be(s); return (z << 16) + stbi__get16be(s); } +#endif #if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) // nothing @@ -1561,7 +1628,9 @@ static stbi__uint32 stbi__get32le(stbi__context *s) #define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings - +#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else ////////////////////////////////////////////////////////////////////////////// // // generic converter from built-in img_n to req_comp @@ -1577,7 +1646,11 @@ static stbi_uc stbi__compute_y(int r, int g, int b) { return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); } +#endif +#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) +// nothing +#else static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) { int i,j; @@ -1621,12 +1694,20 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r STBI_FREE(data); return good; } +#endif +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else static stbi__uint16 stbi__compute_y_16(int r, int g, int b) { return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); } +#endif +#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) +// nothing +#else static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) { int i,j; @@ -1670,6 +1751,7 @@ static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int r STBI_FREE(data); return good; } +#endif #ifndef STBI_NO_LINEAR static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) @@ -4941,6 +5023,8 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) ++s->img_n; } STBI_FREE(z->expanded); z->expanded = NULL; + // end of PNG chunk, read and skip CRC + stbi__get32be(s); return 1; } @@ -5079,7 +5163,7 @@ static int stbi__high_bit(unsigned int z) if (z >= 0x00100) { n += 8; z >>= 8; } if (z >= 0x00010) { n += 4; z >>= 4; } if (z >= 0x00004) { n += 2; z >>= 2; } - if (z >= 0x00002) { n += 1; z >>= 1; } + if (z >= 0x00002) { n += 1;/* >>= 1;*/ } return n; } @@ -5110,7 +5194,7 @@ static int stbi__shiftsigned(unsigned int v, int shift, int bits) v <<= -shift; else v >>= shift; - STBI_ASSERT(v >= 0 && v < 256); + STBI_ASSERT(v < 256); v >>= (8-bits); STBI_ASSERT(bits >= 0 && bits <= 8); return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; @@ -5120,6 +5204,7 @@ typedef struct { int bpp, offset, hsz; unsigned int mr,mg,mb,ma, all_a; + int extra_read; } stbi__bmp_data; static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) @@ -5132,6 +5217,7 @@ static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) info->offset = stbi__get32le(s); info->hsz = hsz = stbi__get32le(s); info->mr = info->mg = info->mb = info->ma = 0; + info->extra_read = 14; if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); if (hsz == 12) { @@ -5175,6 +5261,7 @@ static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) info->mr = stbi__get32le(s); info->mg = stbi__get32le(s); info->mb = stbi__get32le(s); + info->extra_read += 12; // not documented, but generated by photoshop and handled by mspaint if (info->mr == info->mg && info->mg == info->mb) { // ?!?!? @@ -5231,13 +5318,19 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req if (info.hsz == 12) { if (info.bpp < 24) - psize = (info.offset - 14 - 24) / 3; + psize = (info.offset - info.extra_read - 24) / 3; } else { if (info.bpp < 16) - psize = (info.offset - 14 - info.hsz) >> 2; + psize = (info.offset - info.extra_read - info.hsz) >> 2; + } + if (psize == 0) { + STBI_ASSERT(info.offset == (s->img_buffer - s->buffer_start)); } - s->img_n = ma ? 4 : 3; + if (info.bpp == 24 && ma == 0xff000000) + s->img_n = 3; + else + s->img_n = ma ? 4 : 3; if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 target = req_comp; else @@ -5259,7 +5352,7 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req if (info.hsz != 12) stbi__get8(s); pal[i][3] = 255; } - stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); + stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); if (info.bpp == 1) width = (s->img_x + 7) >> 3; else if (info.bpp == 4) width = (s->img_x + 1) >> 1; else if (info.bpp == 8) width = s->img_x; @@ -5308,7 +5401,7 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; int z = 0; int easy=0; - stbi__skip(s, info.offset - 14 - info.hsz); + stbi__skip(s, info.offset - info.extra_read - info.hsz); if (info.bpp == 24) width = 3 * s->img_x; else if (info.bpp == 16) width = 2*s->img_x; else /* bpp = 32 and pad = 0 */ width=0; @@ -5547,6 +5640,8 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req int RLE_repeating = 0; int read_next_pixel = 1; STBI_NOTUSED(ri); + STBI_NOTUSED(tga_x_origin); // @TODO + STBI_NOTUSED(tga_y_origin); // @TODO // do a tiny bit of precessing if ( tga_image_type >= 8 ) @@ -5710,6 +5805,7 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req // Microsoft's C compilers happy... [8^( tga_palette_start = tga_palette_len = tga_palette_bits = tga_x_origin = tga_y_origin = 0; + STBI_NOTUSED(tga_palette_start); // OK, done return tga_data; } @@ -6195,7 +6291,7 @@ typedef struct int w,h; stbi_uc *out; // output buffer (always 4 components) stbi_uc *background; // The current "background" as far as a gif is concerned - stbi_uc *history; + stbi_uc *history; int flags, bgindex, ratio, transparent, eflags; stbi_uc pal[256][4]; stbi_uc lpal[256][4]; @@ -6283,7 +6379,7 @@ static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) { stbi_uc *p, *c; - int idx; + int idx; // recurse to decode the prefixes, since the linked-list is backwards, // and working backwards through an interleaved image would be nasty @@ -6292,12 +6388,12 @@ static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) if (g->cur_y >= g->max_y) return; - idx = g->cur_x + g->cur_y; + idx = g->cur_x + g->cur_y; p = &g->out[idx]; - g->history[idx / 4] = 1; + g->history[idx / 4] = 1; c = &g->color_table[g->codes[code].suffix * 4]; - if (c[3] > 128) { // don't render transparent pixels; + if (c[3] > 128) { // don't render transparent pixels; p[0] = c[2]; p[1] = c[1]; p[2] = c[0]; @@ -6406,14 +6502,14 @@ static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) // two back is the image from two frames ago, used for a very specific disposal format static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) { - int dispose; - int first_frame; - int pi; - int pcount; + int dispose; + int first_frame; + int pi; + int pcount; STBI_NOTUSED(req_comp); // on first frame, any non-written pixels get the background colour (non-transparent) - first_frame = 0; + first_frame = 0; if (g->out == 0) { if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) @@ -6425,17 +6521,17 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i if (!g->out || !g->background || !g->history) return stbi__errpuc("outofmem", "Out of memory"); - // image is treated as "transparent" at the start - ie, nothing overwrites the current background; + // image is treated as "transparent" at the start - ie, nothing overwrites the current background; // background colour is only used for pixels that are not rendered first frame, after that "background" - // color refers to the color that was there the previous frame. + // color refers to the color that was there the previous frame. memset(g->out, 0x00, 4 * pcount); memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) memset(g->history, 0x00, pcount); // pixels that were affected previous frame - first_frame = 1; + first_frame = 1; } else { // second frame - how do we dispoase of the previous one? - dispose = (g->eflags & 0x1C) >> 2; - pcount = g->w * g->h; + dispose = (g->eflags & 0x1C) >> 2; + pcount = g->w * g->h; if ((dispose == 3) && (two_back == 0)) { dispose = 2; // if I don't have an image to revert back to, default to the old background @@ -6444,32 +6540,32 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i if (dispose == 3) { // use previous graphic for (pi = 0; pi < pcount; ++pi) { if (g->history[pi]) { - memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); + memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); } } - } else if (dispose == 2) { - // restore what was changed last frame to background before that frame; + } else if (dispose == 2) { + // restore what was changed last frame to background before that frame; for (pi = 0; pi < pcount; ++pi) { if (g->history[pi]) { - memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); + memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); } } } else { - // This is a non-disposal case eithe way, so just + // This is a non-disposal case eithe way, so just // leave the pixels as is, and they will become the new background // 1: do not dispose // 0: not specified. } - // background is what out is after the undoing of the previou frame; - memcpy( g->background, g->out, 4 * g->w * g->h ); + // background is what out is after the undoing of the previou frame; + memcpy( g->background, g->out, 4 * g->w * g->h ); } - // clear my history; + // clear my history; memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame for (;;) { - int tag = stbi__get8(s); + int tag = stbi__get8(s); switch (tag) { case 0x2C: /* Image Descriptor */ { @@ -6514,19 +6610,19 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i } else if (g->flags & 0x80) { g->color_table = (stbi_uc *) g->pal; } else - return stbi__errpuc("missing color table", "Corrupt GIF"); - + return stbi__errpuc("missing color table", "Corrupt GIF"); + o = stbi__process_gif_raster(s, g); if (!o) return NULL; - // if this was the first frame, - pcount = g->w * g->h; + // if this was the first frame, + pcount = g->w * g->h; if (first_frame && (g->bgindex > 0)) { // if first frame, any pixel not drawn to gets the background color for (pi = 0; pi < pcount; ++pi) { if (g->history[pi] == 0) { - g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; - memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); + g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; + memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); } } } @@ -6537,7 +6633,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i case 0x21: // Comment Extension. { int len; - int ext = stbi__get8(s); + int ext = stbi__get8(s); if (ext == 0xF9) { // Graphic Control Extension. len = stbi__get8(s); if (len == 4) { @@ -6546,23 +6642,23 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i // unset old transparent if (g->transparent >= 0) { - g->pal[g->transparent][3] = 255; - } + g->pal[g->transparent][3] = 255; + } if (g->eflags & 0x01) { g->transparent = stbi__get8(s); if (g->transparent >= 0) { - g->pal[g->transparent][3] = 0; + g->pal[g->transparent][3] = 0; } } else { // don't need transparent - stbi__skip(s, 1); - g->transparent = -1; + stbi__skip(s, 1); + g->transparent = -1; } } else { stbi__skip(s, len); break; } - } + } while ((len = stbi__get8(s)) != 0) { stbi__skip(s, len); } @@ -6581,15 +6677,15 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) { if (stbi__gif_test(s)) { - int layers = 0; + int layers = 0; stbi_uc *u = 0; stbi_uc *out = 0; - stbi_uc *two_back = 0; + stbi_uc *two_back = 0; stbi__gif g; - int stride; + int stride; memset(&g, 0, sizeof(g)); if (delays) { - *delays = 0; + *delays = 0; } do { @@ -6599,44 +6695,52 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, if (u) { *x = g.w; *y = g.h; - ++layers; - stride = g.w * g.h * 4; - + ++layers; + stride = g.w * g.h * 4; + if (out) { - out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); + void *tmp = (stbi_uc*) STBI_REALLOC( out, layers * stride ); + if (NULL == tmp) { + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); + return stbi__errpuc("outofmem", "Out of memory"); + } + else + out = (stbi_uc*) tmp; if (delays) { - *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); + *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); } } else { - out = (stbi_uc*)stbi__malloc( layers * stride ); + out = (stbi_uc*)stbi__malloc( layers * stride ); if (delays) { - *delays = (int*) stbi__malloc( layers * sizeof(int) ); + *delays = (int*) stbi__malloc( layers * sizeof(int) ); } } - memcpy( out + ((layers - 1) * stride), u, stride ); + memcpy( out + ((layers - 1) * stride), u, stride ); if (layers >= 2) { - two_back = out - 2 * stride; + two_back = out - 2 * stride; } if (delays) { - (*delays)[layers - 1U] = g.delay; + (*delays)[layers - 1U] = g.delay; } } - } while (u != 0); + } while (u != 0); - // free temp buffer; - STBI_FREE(g.out); - STBI_FREE(g.history); - STBI_FREE(g.background); + // free temp buffer; + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); - // do the final conversion after loading everything; + // do the final conversion after loading everything; if (req_comp && req_comp != 4) out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); - *z = layers; + *z = layers; return out; } else { - return stbi__errpuc("not GIF", "Image was not as a gif type."); + return stbi__errpuc("not GIF", "Image was not as a gif type."); } } @@ -6654,7 +6758,7 @@ static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req *y = g.h; // moved conversion to after successful load so that the same - // can be done for multiple frames. + // can be done for multiple frames. if (req_comp && req_comp != 4) u = stbi__convert_format(u, 4, req_comp, g.w, g.h); } else if (g.out) { @@ -6662,9 +6766,9 @@ static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req STBI_FREE(g.out); } - // free buffers needed for multiple frame loading; + // free buffers needed for multiple frame loading; STBI_FREE(g.history); - STBI_FREE(g.background); + STBI_FREE(g.background); return u; } @@ -6936,7 +7040,12 @@ static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) return 0; if (x) *x = s->img_x; if (y) *y = s->img_y; - if (comp) *comp = info.ma ? 4 : 3; + if (comp) { + if (info.bpp == 24 && info.ma == 0xff000000) + *comp = 3; + else + *comp = info.ma ? 4 : 3; + } return 1; } #endif @@ -7322,7 +7431,7 @@ STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user /* revision history: - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs + 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs 2.19 (2018-02-11) fix warning 2.18 (2018-01-30) fix warnings 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug From 74ceb08dceb4a8009f65b2a172d495b7cb5e3b44 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Mon, 15 Jun 2020 13:43:36 +0800 Subject: [PATCH 36/54] Add LodePNG and stb_image to license --- license.txt | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/license.txt b/license.txt index bf1731725..0404fe7d1 100644 --- a/license.txt +++ b/license.txt @@ -57,6 +57,12 @@ This distribution contains code from the following projects (full license text b - LZ4 source repository : https://github.com/Cyan4973/lz4 - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c + - LodePNG + Website: https://lodev.org/lodepng/ + Source download: https://github.com/lvandeve/lodepng + License: zlib + Copyright (c) 2005-2020 Lode Vandevenne + - TinyEXR Website: https://github.com/syoyo/tinyexr License: 3-Clause BSD @@ -80,12 +86,18 @@ This distribution contains code from the following projects (full license text b License: MIT/Expat Copyright 2018 David Reid + - stb_image + Website: https://github.com/nothings/stb + Source download: https://github.com/nothings/stb/blob/f54acd4e13430c5122cab4ca657705c84aa61b08/stb_image.h + License: MIT/Expat + Copyright (c) 2017 Sean Barrett + - libmpg123 - Website: http://www.mpg123.de/ - Source download: http://sourceforge.net/projects/mpg123/files/latest/download - License: LGPL 2.1 - Copyright (c) 1995-2013 by Michael Hipp and others, free software under the terms of the LGPL v2.1 - Detailed information from the debian project: + Website: http://www.mpg123.de/ + Source download: http://sourceforge.net/projects/mpg123/files/latest/download + License: LGPL 2.1 + Copyright (c) 1995-2013 by Michael Hipp and others, free software under the terms of the LGPL v2.1 + Detailed information from the debian project: Copyright 1995-2016 by the mpg123 project Copyright 2009-2011 by Malcolm Boczek Copyright 2008 Christian Weisgerber @@ -95,9 +107,9 @@ This distribution contains code from the following projects (full license text b Copyright 1997 Mikko Tommila - OpenAL Soft - Website: http://kcat.strangesoft.net/openal.html - Source download: http://kcat.strangesoft.net/openal.html#download - License: Mixed, licensing information obtained from the debian project + Website: http://kcat.strangesoft.net/openal.html + Source download: http://kcat.strangesoft.net/openal.html#download + License: Mixed, licensing information obtained from the debian project - Alc/backends/opensl.c License: Apache 2.0 Copyright 2011 The Android Open Source Project From 96b8d29a5c94e7b2f5670276f04834860b0f44bd Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 28 Jun 2020 21:58:13 -0300 Subject: [PATCH 37/54] Clean up code for computing smooth line vertex colors. --- src/modules/graphics/Polyline.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/modules/graphics/Polyline.cpp b/src/modules/graphics/Polyline.cpp index da1397b42..eabd11c45 100644 --- a/src/modules/graphics/Polyline.cpp +++ b/src/modules/graphics/Polyline.cpp @@ -405,18 +405,28 @@ void Polyline::draw(love::graphics::Graphics *gfx) Color32 *colordata = (Color32 *) data.stream[1]; + int draw_rough_count = std::min(cmd.vertexCount, (int) vertex_count - vertex_start); + // Constant vertex color up to the overdraw vertices. - for (int i = 0; i < std::min(cmd.vertexCount, (int) vertex_count - vertex_start); i++) + for (int i = 0; i < draw_rough_count; i++) colordata[i] = curcolor; - int colorcount = 0; if (overdraw) - colorcount = std::min(cmd.vertexCount, overdraw_count - (vertex_start - overdraw_start)); - - if (colorcount > 0) { - Color32 *colors = colordata + std::max(0, (overdraw_start - vertex_start)); - fill_color_array(curcolor, colors, colorcount); + int draw_remaining_count = cmd.vertexCount - draw_rough_count; + + int draw_overdraw_begin = overdraw_start - vertex_start; + int draw_overdraw_end = draw_overdraw_begin + overdraw_count; + + draw_overdraw_begin = std::max(0, draw_overdraw_begin); + + int draw_overdraw_count = std::min(draw_remaining_count, draw_overdraw_end - draw_overdraw_begin); + + if (draw_overdraw_count > 0) + { + Color32 *colors = colordata + draw_overdraw_begin; + fill_color_array(curcolor, colors, draw_overdraw_count); + } } } } From 50eeed7bb16f286a85a50bb8c99866a0d6db4b5e Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 10 Jul 2020 22:52:23 -0300 Subject: [PATCH 38/54] Fix Shader:send's Data variant when a matrix layout arg is used. Also add a second more consistent Data+matrix layout variant of Shader:send which matches the argument order of the table+matrix layout variant - Shader:send(name, matrixlayout, data, ...). --- src/modules/graphics/wrap_Shader.cpp | 50 ++++++++++++++++++---------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src/modules/graphics/wrap_Shader.cpp b/src/modules/graphics/wrap_Shader.cpp index 2c34727b0..fb677dbfb 100644 --- a/src/modules/graphics/wrap_Shader.cpp +++ b/src/modules/graphics/wrap_Shader.cpp @@ -313,20 +313,36 @@ static int w_Shader_sendData(lua_State *L, int startidx, Shader *shader, const S if (info->baseType == Shader::UNIFORM_SAMPLER) return luaL_error(L, "Uniform sampler values (textures) cannot be sent to Shaders via Data objects."); - bool columnmajor = false; - if (info->baseType == Shader::UNIFORM_MATRIX && lua_type(L, startidx + 1) == LUA_TSTRING) + math::Transform::MatrixLayout layout = math::Transform::MATRIX_ROW_MAJOR; + int dataidx = startidx; + if (info->baseType == Shader::UNIFORM_MATRIX) { - const char *layoutstr = lua_tostring(L, startidx + 1); - math::Transform::MatrixLayout layout; - if (!math::Transform::getConstant(layoutstr, layout)) - return luax_enumerror(L, "matrix layout", math::Transform::getConstants(layout), layoutstr); + if (lua_type(L, startidx) == LUA_TSTRING) + { + // (matrixlayout, data, ...) + const char *layoutstr = lua_tostring(L, startidx); + if (!math::Transform::getConstant(layoutstr, layout)) + return luax_enumerror(L, "matrix layout", math::Transform::getConstants(layout), layoutstr); - columnmajor = (layout == math::Transform::MATRIX_COLUMN_MAJOR); - startidx++; + startidx++; + dataidx = startidx; + } + else if (lua_type(L, startidx + 1) == LUA_TSTRING) + { + // (data, matrixlayout, ...) + // Should be deprecated in the future (doesn't match the argument + // order of Shader:send(name, matrixlayout, table)) + const char *layoutstr = lua_tostring(L, startidx + 1); + if (!math::Transform::getConstant(layoutstr, layout)) + return luax_enumerror(L, "matrix layout", math::Transform::getConstants(layout), layoutstr); + + startidx++; + } } - Data *data = luax_checktype(L, startidx); + bool columnmajor = (layout == math::Transform::MATRIX_COLUMN_MAJOR); + Data *data = luax_checktype(L, dataidx); size_t size = data->getSize(); ptrdiff_t offset = (ptrdiff_t) luaL_optinteger(L, startidx + 1, 0); @@ -339,17 +355,17 @@ static int w_Shader_sendData(lua_State *L, int startidx, Shader *shader, const S if (!lua_isnoneornil(L, startidx + 2)) { - lua_Integer datasize = luaL_checkinteger(L, startidx + 2); - if (datasize <= 0) + lua_Integer sizearg = luaL_checkinteger(L, startidx + 2); + if (sizearg <= 0) return luaL_error(L, "Size must be greater than 0."); - else if ((size_t) datasize > size - offset) + else if ((size_t) sizearg > size - offset) return luaL_error(L, "Size and offset must fit within the Data's bounds."); - else if (size % uniformstride != 0) - return luaL_error(L, "Size must be a multiple of the uniform's size in bytes."); - else if (size > info->dataSize) + else if (sizearg % uniformstride != 0) + return luaL_error(L, "Size (%d) must be a multiple of the uniform's size in bytes (%d).", sizearg, uniformstride); + else if ((size_t) sizearg > info->dataSize) return luaL_error(L, "Size must not be greater than the uniform's total size in bytes."); - size = (size_t) datasize; + size = (size_t) sizearg; } else { @@ -415,7 +431,7 @@ int w_Shader_send(lua_State *L) int startidx = 3; - if (luax_istype(L, startidx, Data::type)) + if (luax_istype(L, startidx, Data::type) || (info->baseType == Shader::UNIFORM_MATRIX && luax_istype(L, startidx + 1, Data::type))) return w_Shader_sendData(L, startidx, shader, info, false); else return w_Shader_sendLuaValues(L, startidx, shader, info, name); From d60d8867f48feb1778216f354add560acb2e1d34 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 11 Jul 2020 17:21:26 -0300 Subject: [PATCH 39/54] Possible workaround for an Intel driver bug with readable depth buffers https://github.com/love2d/love/issues/1592 --- src/modules/graphics/opengl/Canvas.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/modules/graphics/opengl/Canvas.cpp b/src/modules/graphics/opengl/Canvas.cpp index 0057db773..c6a2ba7c5 100644 --- a/src/modules/graphics/opengl/Canvas.cpp +++ b/src/modules/graphics/opengl/Canvas.cpp @@ -39,6 +39,11 @@ static GLenum createFBO(GLuint &framebuffer, TextureType texType, PixelFormat fo glGenFramebuffers(1, &framebuffer); gl.bindFramebuffer(OpenGL::FRAMEBUFFER_ALL, framebuffer); + // Might work around an Intel driver bug: https://github.com/love2d/love/issues/1592 + bool current_srgb = gl.isStateEnabled(OpenGL::ENABLE_FRAMEBUFFER_SRGB); + if (current_srgb && isPixelFormatDepthStencil(format)) + gl.setEnableState(OpenGL::ENABLE_FRAMEBUFFER_SRGB, false); + if (texture != 0) { if (isPixelFormatDepthStencil(format) && (GLAD_ES_VERSION_3_0 || !GLAD_ES_VERSION_2_0)) @@ -104,6 +109,11 @@ static GLenum createFBO(GLuint &framebuffer, TextureType texType, PixelFormat fo GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); gl.bindFramebuffer(OpenGL::FRAMEBUFFER_ALL, current_fbo); + + // Restore sRGB state if we turned it off above. + if (current_srgb && isPixelFormatDepthStencil(format)) + gl.setEnableState(OpenGL::ENABLE_FRAMEBUFFER_SRGB, current_srgb); + return status; } From dde3db300640adb291ea7abaa2693922cbf21ec3 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 12 Jul 2020 18:25:55 -0300 Subject: [PATCH 40/54] Apply Image:replacePixels/missing text workaround to more ATI drivers issue #1563 --- src/modules/graphics/opengl/OpenGL.cpp | 4 ++-- src/modules/graphics/opengl/OpenGL.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index fa0525ecc..d0e93b4fa 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -160,11 +160,11 @@ bool OpenGL::initContext() #ifdef LOVE_WINDOWS if (getVendor() == VENDOR_AMD) { - // Radeon HD drivers switched from "ATI Radeon" to "AMD Radeon" around + // Radeon drivers switched from "ATI Radeon" to "AMD Radeon" around // the 7000 series. We'll assume this bug doesn't affect those newer // GPUs / drivers. const char *device = (const char *) glGetString(GL_RENDERER); - if (strstr(device, "ATI Radeon HD ") || strstr(device, "ATI Mobility Radeon HD")) + if (strstr(device, "ATI Radeon") || strstr(device, "ATI Mobility Radeon")) bugs.texStorageBreaksSubImage = true; } #endif diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index e926459de..a1a6cb61a 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -165,7 +165,7 @@ public: * initial full-size one (determined after some investigation with an * affected user on Discord.) * https://bitbucket.org/rude/love/issues/1436/bug-with-lovegraphicsprint-on-older-ati - * + * https://github.com/love2d/love/issues/1563 **/ bool texStorageBreaksSubImage; From 0c7793e195aaf22f8545d46d83a487fdac813c90 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 19 Jul 2020 15:41:04 -0300 Subject: [PATCH 41/54] Fix detection of #pragma language glsl3 in shaders --- src/modules/graphics/Shader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/graphics/Shader.cpp b/src/modules/graphics/Shader.cpp index fbfdc7ebe..e8d37abd8 100644 --- a/src/modules/graphics/Shader.cpp +++ b/src/modules/graphics/Shader.cpp @@ -390,7 +390,7 @@ static Shader::Language getTargetLanguage(const std::string &src) { std::regex r("^\\s*#pragma language (\\w+)"); std::smatch m; - std::string langstr = std::regex_search(src, m, r) ? m[0] : std::string("glsl1"); + std::string langstr = std::regex_search(src, m, r) && m.size() > 1 ? m[1] : std::string("glsl1"); Shader::Language lang = Shader::LANGUAGE_MAX_ENUM; Shader::getConstant(langstr.c_str(), lang); return lang; From e60736f5a60c2382fc648d7a61fb189bf91b76ec Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 20 Jul 2020 22:10:08 -0300 Subject: [PATCH 42/54] Add Mesh:set/getIndexBuffer. --- src/common/StringMap.h | 6 ++-- src/modules/graphics/Mesh.cpp | 25 +++++++++++++++- src/modules/graphics/Mesh.h | 8 +++++- src/modules/graphics/vertex.cpp | 46 ++++++++++++++++++------------ src/modules/graphics/vertex.h | 20 +++++++------ src/modules/graphics/wrap_Mesh.cpp | 19 ++++++++++++ 6 files changed, 92 insertions(+), 32 deletions(-) diff --git a/src/common/StringMap.h b/src/common/StringMap.h index 97dbe3c8b..4e6dc25de 100644 --- a/src/common/StringMap.h +++ b/src/common/StringMap.h @@ -182,15 +182,15 @@ private: }; // StringMap -#define DECLARE_STRINGMAP(type) \ +#define STRINGMAP_DECLARE(type) \ bool getConstant(const char *in, type &out); \ bool getConstant(type in, const char *&out); \ std::vector getConstants(type); \ -#define DEFINE_STRINGMAP_BEGIN(type, count, name) \ +#define STRINGMAP_BEGIN(type, count, name) \ static StringMap::Entry name##Entries[] = -#define DEFINE_STRINGMAP_END(type, count, name) \ +#define STRINGMAP_END(type, count, name) \ ; \ static StringMap name##s(name##Entries, sizeof(name##Entries)); \ bool getConstant(const char *in, type &out) { return name##s.find(in, out); } \ diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 816493361..77261e7bb 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -472,6 +472,9 @@ bool Mesh::getVertexMap(std::vector &map) const if (!indexBuffer || indexCount == 0) return true; + if ((indexBuffer->getMapFlags() & Buffer::MAP_READ) == 0) + return false; + // We unmap the buffer in Mesh::draw, Mesh::setVertexMap, and Mesh::flush. void *buffer = indexBuffer->map(); @@ -490,7 +493,27 @@ bool Mesh::getVertexMap(std::vector &map) const return true; } -size_t Mesh::getVertexMapCount() const +void Mesh::setIndexBuffer(Buffer *buffer) +{ + // Buffer constructor does the rest of the validation for index buffers + // (data member formats, etc.) + if (buffer != nullptr && (buffer->getTypeFlags() & Buffer::TYPEFLAG_INDEX) == 0) + throw love::Exception("setIndexBuffer requires a Buffer created as an index buffer."); + + indexBuffer.set(buffer); + useIndexBuffer = buffer != nullptr; + indexCount = buffer != nullptr ? buffer->getArrayLength() : 0; + + if (buffer != nullptr) + indexDataType = getIndexDataType(buffer->getDataMember(0).decl.format); +} + +Buffer *Mesh::getIndexBuffer() const +{ + return indexBuffer; +} + +size_t Mesh::getIndexCount() const { return indexCount; } diff --git a/src/modules/graphics/Mesh.h b/src/modules/graphics/Mesh.h index 187f0bc0c..72994f051 100644 --- a/src/modules/graphics/Mesh.h +++ b/src/modules/graphics/Mesh.h @@ -95,6 +95,9 @@ public: **/ size_t getVertexStride() const; + /** + * Gets the Buffer that holds the Mesh's vertices. + **/ Buffer *getVertexBuffer() const; /** @@ -140,10 +143,13 @@ public: **/ bool getVertexMap(std::vector &map) const; + void setIndexBuffer(Buffer *buffer); + Buffer *getIndexBuffer() const; + /** * Gets the total number of elements in the vertex map array. **/ - size_t getVertexMapCount() const; + size_t getIndexCount() const; /** * Sets the texture used when drawing the Mesh. diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index 0ecfb7d26..ea135e0f4 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -183,6 +183,16 @@ DataFormat getIndexDataFormat(IndexDataType type) return type == INDEX_UINT32 ? DATAFORMAT_UINT32 : DATAFORMAT_UINT16; } +IndexDataType getIndexDataType(DataFormat format) +{ + switch (format) + { + case DATAFORMAT_UINT16: return INDEX_UINT16; + case DATAFORMAT_UINT32: return INDEX_UINT32; + default: return INDEX_MAX_ENUM; + } +} + int getIndexCount(TriangleIndexMode mode, int vertexCount) { switch (mode) @@ -312,13 +322,13 @@ void VertexAttributes::setCommonFormat(CommonFormat format, uint8 bufferindex) } } -DEFINE_STRINGMAP_BEGIN(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) +STRINGMAP_BEGIN(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) { { "VertexPosition", ATTRIB_POS }, { "VertexTexCoord", ATTRIB_TEXCOORD }, { "VertexColor", ATTRIB_COLOR }, } -DEFINE_STRINGMAP_END(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) +STRINGMAP_END(BuiltinVertexAttribute, ATTRIB_MAX_ENUM, attribName) const char *getConstant(BuiltinVertexAttribute attrib) { @@ -327,38 +337,38 @@ const char *getConstant(BuiltinVertexAttribute attrib) return name; } -DEFINE_STRINGMAP_BEGIN(IndexDataType, INDEX_MAX_ENUM, indexType) +STRINGMAP_BEGIN(IndexDataType, INDEX_MAX_ENUM, indexType) { { "uint16", INDEX_UINT16 }, { "uint32", INDEX_UINT32 }, } -DEFINE_STRINGMAP_END(IndexDataType, INDEX_MAX_ENUM, indexType) +STRINGMAP_END(IndexDataType, INDEX_MAX_ENUM, indexType) -DEFINE_STRINGMAP_BEGIN(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) +STRINGMAP_BEGIN(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) { { "stream", BUFFERUSAGE_STREAM }, { "dynamic", BUFFERUSAGE_DYNAMIC }, { "static", BUFFERUSAGE_STATIC }, } -DEFINE_STRINGMAP_END(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) +STRINGMAP_END(BufferUsage, BUFFERUSAGE_MAX_ENUM, bufferUsage) -DEFINE_STRINGMAP_BEGIN(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) +STRINGMAP_BEGIN(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) { { "fan", PRIMITIVE_TRIANGLE_FAN }, { "strip", PRIMITIVE_TRIANGLE_STRIP }, { "triangles", PRIMITIVE_TRIANGLES }, { "points", PRIMITIVE_POINTS }, } -DEFINE_STRINGMAP_END(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) +STRINGMAP_END(PrimitiveType, PRIMITIVE_MAX_ENUM, primitiveType) -DEFINE_STRINGMAP_BEGIN(AttributeStep, STEP_MAX_ENUM, attributeStep) +STRINGMAP_BEGIN(AttributeStep, STEP_MAX_ENUM, attributeStep) { { "pervertex", STEP_PER_VERTEX }, { "perinstance", STEP_PER_INSTANCE }, } -DEFINE_STRINGMAP_END(AttributeStep, STEP_MAX_ENUM, attributeStep) +STRINGMAP_END(AttributeStep, STEP_MAX_ENUM, attributeStep) -DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) +STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) { { "float", DATAFORMAT_FLOAT }, { "floatvec2", DATAFORMAT_FLOAT_VEC2 }, @@ -410,9 +420,9 @@ DEFINE_STRINGMAP_BEGIN(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) { "boolvec3", DATAFORMAT_BOOL_VEC3 }, { "boolvec4", DATAFORMAT_BOOL_VEC4 }, } -DEFINE_STRINGMAP_END(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) +STRINGMAP_END(DataFormat, DATAFORMAT_MAX_ENUM, dataFormat) -DEFINE_STRINGMAP_BEGIN(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) +STRINGMAP_BEGIN(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) { { "float", DATA_BASETYPE_FLOAT }, { "int", DATA_BASETYPE_INT }, @@ -421,22 +431,22 @@ DEFINE_STRINGMAP_BEGIN(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) { "unorm", DATA_BASETYPE_UNORM }, { "bool", DATA_BASETYPE_BOOL }, } -DEFINE_STRINGMAP_END(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) +STRINGMAP_END(DataBaseType, DATA_BASETYPE_MAX_ENUM, dataBaseType) -DEFINE_STRINGMAP_BEGIN(CullMode, CULL_MAX_ENUM, cullMode) +STRINGMAP_BEGIN(CullMode, CULL_MAX_ENUM, cullMode) { { "none", CULL_NONE }, { "back", CULL_BACK }, { "front", CULL_FRONT }, } -DEFINE_STRINGMAP_END(CullMode, CULL_MAX_ENUM, cullMode) +STRINGMAP_END(CullMode, CULL_MAX_ENUM, cullMode) -DEFINE_STRINGMAP_BEGIN(Winding, WINDING_MAX_ENUM, winding) +STRINGMAP_BEGIN(Winding, WINDING_MAX_ENUM, winding) { { "cw", WINDING_CW }, { "ccw", WINDING_CCW }, } -DEFINE_STRINGMAP_END(Winding, WINDING_MAX_ENUM, winding) +STRINGMAP_END(Winding, WINDING_MAX_ENUM, winding) } // graphics } // love diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 0c7477579..003d4eb9f 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -289,6 +289,7 @@ struct VertexAttributeInfo struct VertexBufferLayout { + // Attribute step rate is stored outside this struct as a bitmask. uint16 stride; }; @@ -368,21 +369,22 @@ const DataFormatInfo &getDataFormatInfo(DataFormat format); size_t getIndexDataSize(IndexDataType type); IndexDataType getIndexDataTypeFromMax(size_t maxvalue); DataFormat getIndexDataFormat(IndexDataType type); +IndexDataType getIndexDataType(DataFormat format); int getIndexCount(TriangleIndexMode mode, int vertexCount); void fillIndices(TriangleIndexMode mode, uint16 vertexStart, uint16 vertexCount, uint16 *indices); void fillIndices(TriangleIndexMode mode, uint32 vertexStart, uint32 vertexCount, uint32 *indices); -DECLARE_STRINGMAP(BuiltinVertexAttribute); -DECLARE_STRINGMAP(IndexDataType); -DECLARE_STRINGMAP(BufferUsage); -DECLARE_STRINGMAP(PrimitiveType); -DECLARE_STRINGMAP(AttributeStep); -DECLARE_STRINGMAP(DataFormat); -DECLARE_STRINGMAP(DataBaseType); -DECLARE_STRINGMAP(CullMode); -DECLARE_STRINGMAP(Winding); +STRINGMAP_DECLARE(BuiltinVertexAttribute); +STRINGMAP_DECLARE(IndexDataType); +STRINGMAP_DECLARE(BufferUsage); +STRINGMAP_DECLARE(PrimitiveType); +STRINGMAP_DECLARE(AttributeStep); +STRINGMAP_DECLARE(DataFormat); +STRINGMAP_DECLARE(DataBaseType); +STRINGMAP_DECLARE(CullMode); +STRINGMAP_DECLARE(Winding); const char *getConstant(BuiltinVertexAttribute attrib); diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index 15e32e71d..5920ae1cb 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -448,6 +448,23 @@ int w_Mesh_getVertexMap(lua_State *L) return 1; } +int w_Mesh_setIndexBuffer(lua_State *L) +{ + Mesh *t = luax_checkmesh(L, 1); + Buffer *b = nullptr; + if (!lua_isnoneornil(L, 2)) + b = luax_checkbuffer(L, 2); + luax_catchexcept(L, [&]() { t->setIndexBuffer(b); }); + return 0; +} + +int w_Mesh_getIndexBuffer(lua_State *L) +{ + Mesh *t = luax_checkmesh(L, 1); + luax_pushtype(L, t->getIndexBuffer()); + return 1; +} + int w_Mesh_setTexture(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); @@ -548,6 +565,8 @@ static const luaL_Reg w_Mesh_functions[] = { "flush", w_Mesh_flush }, { "setVertexMap", w_Mesh_setVertexMap }, { "getVertexMap", w_Mesh_getVertexMap }, + { "setIndexBuffer", w_Mesh_setIndexBuffer }, + { "getIndexBuffer", w_Mesh_getIndexBuffer }, { "setTexture", w_Mesh_setTexture }, { "getTexture", w_Mesh_getTexture }, { "setDrawMode", w_Mesh_setDrawMode }, From 834cddc34ce91b048b1cf3831cceacc371b1c6cb Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 20 Jul 2020 22:13:30 -0300 Subject: [PATCH 43/54] Add Mesh:getVertexBuffer. --- src/modules/graphics/wrap_Mesh.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index 5920ae1cb..d499106c1 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -358,6 +358,13 @@ int w_Mesh_getAttachedAttributes(lua_State *L) return 1; } +int w_Mesh_getVertexBuffer(lua_State *L) +{ + Mesh *t = luax_checkmesh(L, 1); + luax_pushtype(L, t->getVertexBuffer()); + return 1; +} + int w_Mesh_flush(lua_State *L) { Mesh *t = luax_checkmesh(L, 1); @@ -562,6 +569,7 @@ static const luaL_Reg w_Mesh_functions[] = { "attachAttribute", w_Mesh_attachAttribute }, { "detachAttribute", w_Mesh_detachAttribute }, { "getAttachedAttributes", w_Mesh_getAttachedAttributes }, + { "getVertexBuffer", w_Mesh_getVertexBuffer }, { "flush", w_Mesh_flush }, { "setVertexMap", w_Mesh_setVertexMap }, { "getVertexMap", w_Mesh_getVertexMap }, From 3b67db4672bf7b879275faab0841a076d916337f Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 21 Jul 2020 18:57:50 -0300 Subject: [PATCH 44/54] Add love.graphics.newIndexBuffer --- src/modules/graphics/Buffer.cpp | 2 +- src/modules/graphics/Buffer.h | 14 +++- src/modules/graphics/wrap_Graphics.cpp | 91 ++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 8 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 211e84500..b839db8f9 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -51,7 +51,7 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vectornewBuffer(settings, format, nullptr, 0, arraylength); }); + + if (lua_istable(L, 1)) + { + Buffer::Mapper mapper(*b); + uint16 *u16data = (uint16 *) mapper.data; + uint32 *u32data = (uint32 *) mapper.data; + + for (int i = 0; i < arraylength; i++) + { + lua_rawgeti(L, 1, i + 1); + lua_Integer v = luaL_checkinteger(L, -1); + lua_pop(L, 1); + if (format == DATAFORMAT_UINT16) + u16data[i] = (uint16) v; + else + u32data[i] = (uint32) v; + } + } + + luax_pushtype(L, b); + b->release(); + return 1; +} + static PrimitiveType luax_optmeshdrawmode(lua_State *L, int idx, PrimitiveType def) { const char *modestr = lua_isnoneornil(L, idx) ? nullptr : luaL_checkstring(L, idx); @@ -1512,7 +1592,7 @@ static Mesh *newStandardMesh(lua_State *L) Mesh *t = nullptr; PrimitiveType drawmode = luax_optmeshdrawmode(L, 2, PRIMITIVE_TRIANGLE_FAN); - BufferUsage usage = luax_optmeshusage(L, 3, BUFFERUSAGE_DYNAMIC); + BufferUsage usage = luax_optbufferusage(L, 3, BUFFERUSAGE_DYNAMIC); std::vector format = Mesh::getDefaultVertexFormat(); @@ -1574,7 +1654,7 @@ static Mesh *newCustomMesh(lua_State *L) std::vector vertexformat; PrimitiveType drawmode = luax_optmeshdrawmode(L, 3, PRIMITIVE_TRIANGLE_FAN); - BufferUsage usage = luax_optmeshusage(L, 4, BUFFERUSAGE_DYNAMIC); + BufferUsage usage = luax_optbufferusage(L, 4, BUFFERUSAGE_DYNAMIC); lua_rawgeti(L, 1, 1); if (!lua_istable(L, -1)) @@ -1598,7 +1678,7 @@ static Mesh *newCustomMesh(lua_State *L) DataFormat format = DATAFORMAT_FLOAT; const char *tname = luaL_checkstring(L, -2); - if (!getConstant(tname, format)) + if (!lua_isnoneornil(L, -1)) { int components = (int) luaL_checkinteger(L, -1); @@ -1633,7 +1713,7 @@ static Mesh *newCustomMesh(lua_State *L) else luaL_error(L, "Invalid component count (%d) for vertex data type %s", components, tname); } - else + else if (!getConstant(tname, format)) luax_enumerror(L, "vertex data format", getConstants(format), tname); } @@ -3096,6 +3176,7 @@ static const luaL_Reg functions[] = { "newSpriteBatch", w_newSpriteBatch }, { "newParticleSystem", w_newParticleSystem }, { "newShader", w_newShader }, + { "newIndexBuffer", w_newIndexBuffer }, { "newMesh", w_newMesh }, { "newText", w_newText }, { "_newVideo", w_newVideo }, From 77834d8e6c87da1902f29cad11bd398b2dc239e8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 21 Jul 2020 19:09:13 -0300 Subject: [PATCH 45/54] Add a Data object variant of love.graphics.newIndexBuffer --- src/modules/graphics/wrap_Graphics.cpp | 40 +++++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index eaf96f810..ff87b05f7 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1519,32 +1519,45 @@ int w_newIndexBuffer(lua_State *L) Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY, BUFFERUSAGE_DYNAMIC); luax_optbuffersettings(L, 3, settings); - int arraylength = 0; + size_t arraylength = 0; + size_t bytesize = 0; DataFormat format = DATAFORMAT_UINT16; + Data *data = nullptr; + + if (luax_istype(L, 1, Data::type)) + { + data = luax_checktype(L, 1); + bytesize = data->getSize(); + } if (lua_istable(L, 1)) { - arraylength = (int) luax_objlen(L, 1); + arraylength = (size_t) luax_objlen(L, 1); // Scan array for invalid types and the max value. lua_Integer maxvalue = 0; - for (int i = 0; i < arraylength; i++) + for (size_t i = 0; i < arraylength; i++) { lua_rawgeti(L, 1, i + 1); - lua_Integer v = luaL_checkinteger(L, -1); + lua_Integer v = luaL_checkinteger(L, -1) - 1; lua_pop(L, 1); if (v < 0) - return luaL_argerror(L, 1, "expected non-negative integer values in array"); + return luaL_argerror(L, 1, "expected positive integer values in array"); else maxvalue = std::max(maxvalue, v); } format = getIndexDataFormat(getIndexDataTypeFromMax(maxvalue)); } - else - arraylength = (int) luaL_checkinteger(L, 1); + else if (data == nullptr) + { + lua_Integer len = luaL_checkinteger(L, 1); + if (len <= 0) + return luaL_argerror(L, 1, "number of elements must be greater than 0"); + arraylength = (size_t) len; + } - if (!lua_isnoneornil(L, 2)) + if (data != nullptr || !lua_isnoneornil(L, 2)) { const char *formatstr = luaL_checkstring(L, 2); if (!getConstant(formatstr, format)) @@ -1552,7 +1565,7 @@ int w_newIndexBuffer(lua_State *L) } Buffer *b = nullptr; - luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, nullptr, 0, arraylength); }); + luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, nullptr, bytesize, arraylength); }); if (lua_istable(L, 1)) { @@ -1560,10 +1573,10 @@ int w_newIndexBuffer(lua_State *L) uint16 *u16data = (uint16 *) mapper.data; uint32 *u32data = (uint32 *) mapper.data; - for (int i = 0; i < arraylength; i++) + for (size_t i = 0; i < arraylength; i++) { lua_rawgeti(L, 1, i + 1); - lua_Integer v = luaL_checkinteger(L, -1); + lua_Integer v = luaL_checkinteger(L, -1) - 1; lua_pop(L, 1); if (format == DATAFORMAT_UINT16) u16data[i] = (uint16) v; @@ -1571,6 +1584,11 @@ int w_newIndexBuffer(lua_State *L) u32data[i] = (uint32) v; } } + else if (data != nullptr) + { + Buffer::Mapper mapper(*b); + memcpy(mapper.data, data->getData(), std::min(data->getSize(), b->getSize())); + } luax_pushtype(L, b); b->release(); From c2be89f13018136b4fdf915cdc1a4439e4f775c4 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 21 Jul 2020 20:50:49 -0300 Subject: [PATCH 46/54] Fix crashes when creating a Buffer. --- src/modules/graphics/Buffer.cpp | 2 ++ src/modules/graphics/opengl/Buffer.cpp | 3 +++ src/modules/graphics/wrap_Graphics.cpp | 9 +++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index b839db8f9..257571d22 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -91,6 +91,8 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) : love::graphics::Buffer(gfx, settings, format, size, arraylength) { + size = getSize(); + arraylength = getArrayLength(); + if (typeFlags & TYPEFLAG_VERTEX) mapType = BUFFERTYPE_VERTEX; else if (typeFlags & TYPEFLAG_INDEX) diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index ff87b05f7..5c2bc44c3 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1523,10 +1523,12 @@ int w_newIndexBuffer(lua_State *L) size_t bytesize = 0; DataFormat format = DATAFORMAT_UINT16; Data *data = nullptr; + const void *initialdata = nullptr; if (luax_istype(L, 1, Data::type)) { data = luax_checktype(L, 1); + initialdata = data->getData(); bytesize = data->getSize(); } @@ -1565,7 +1567,7 @@ int w_newIndexBuffer(lua_State *L) } Buffer *b = nullptr; - luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, nullptr, bytesize, arraylength); }); + luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, initialdata, bytesize, arraylength); }); if (lua_istable(L, 1)) { @@ -1584,11 +1586,6 @@ int w_newIndexBuffer(lua_State *L) u32data[i] = (uint32) v; } } - else if (data != nullptr) - { - Buffer::Mapper mapper(*b); - memcpy(mapper.data, data->getData(), std::min(data->getSize(), b->getSize())); - } luax_pushtype(L, b); b->release(); From 7ad5e5a21ab5c8d0713ad03d97e1bbf1d1e72ff9 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 21 Jul 2020 21:46:45 -0300 Subject: [PATCH 47/54] Fix newMesh(format, ...). Fix Mesh:attachAttribute. Deprecate the mesh argument variant of attachAttribute in favor of the buffer argument variant. --- src/modules/graphics/Mesh.cpp | 1 + src/modules/graphics/wrap_Graphics.cpp | 7 ++++--- src/modules/graphics/wrap_Mesh.cpp | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/Mesh.cpp b/src/modules/graphics/Mesh.cpp index 77261e7bb..c85662a08 100644 --- a/src/modules/graphics/Mesh.cpp +++ b/src/modules/graphics/Mesh.cpp @@ -307,6 +307,7 @@ void Mesh::attachAttribute(const std::string &name, Buffer *buffer, const std::s else if (attachedAttributes.size() + 1 > VertexAttributes::MAX) throw love::Exception("A maximum of %d attributes can be attached at once.", VertexAttributes::MAX); + newattrib.name = name; newattrib.buffer = buffer; newattrib.enabled = oldattrib.buffer.get() ? oldattrib.enabled : true; newattrib.indexInBuffer = buffer->getDataMemberIndex(attachname); diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 5c2bc44c3..90a1d6595 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1690,7 +1690,7 @@ static Mesh *newCustomMesh(lua_State *L) const char *name = luaL_checkstring(L, -3); - DataFormat format = DATAFORMAT_FLOAT; + DataFormat format = DATAFORMAT_MAX_ENUM; const char *tname = luaL_checkstring(L, -2); if (!lua_isnoneornil(L, -1)) @@ -1728,10 +1728,11 @@ static Mesh *newCustomMesh(lua_State *L) else luaL_error(L, "Invalid component count (%d) for vertex data type %s", components, tname); } - else if (!getConstant(tname, format)) - luax_enumerror(L, "vertex data format", getConstants(format), tname); } + if (format == DATAFORMAT_MAX_ENUM && !getConstant(tname, format)) + luax_enumerror(L, "vertex data format", getConstants(format), tname); + lua_pop(L, 4); vertexformat.emplace_back(name, format); } diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index d499106c1..aa00d4bb2 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -300,6 +300,7 @@ int w_Mesh_attachAttribute(lua_State *L) buffer = mesh->getVertexBuffer(); if (buffer == nullptr) return luaL_error(L, "Mesh does not have its own vertex buffer."); + luax_markdeprecated(L, "Mesh:attachAttribute(name, mesh, ...)", API_METHOD, DEPRECATED_REPLACED, "Mesh:attachAttribute(name, buffer, ...)"); } AttributeStep step = STEP_PER_VERTEX; From 1d087cc5c2cb882424e7d8022ae16740192f36b2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 21 Jul 2020 21:56:47 -0300 Subject: [PATCH 48/54] Fix Mesh/Buffer:flush uploading more data than it needs to, sometimes. --- src/modules/graphics/opengl/Buffer.cpp | 16 ++++++++++++++-- src/modules/graphics/opengl/Buffer.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 3fd4beaed..2b17dc121 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -112,6 +112,7 @@ void *Buffer::map() modifiedOffset = 0; modifiedSize = 0; + isMappedDataModified = false; return memoryMap; } @@ -149,8 +150,13 @@ void Buffer::unmap() if (!mapped) return; + mapped = false; + if ((mapFlags & MAP_EXPLICIT_RANGE_MODIFY) != 0) { + if (!isMappedDataModified) + return; + modifiedOffset = std::min(modifiedOffset, getSize() - 1); modifiedSize = std::min(modifiedSize, getSize() - modifiedOffset); } @@ -184,8 +190,6 @@ void Buffer::unmap() modifiedOffset = 0; modifiedSize = 0; - - mapped = false; } void Buffer::setMappedRangeModified(size_t offset, size_t modifiedsize) @@ -193,6 +197,14 @@ void Buffer::setMappedRangeModified(size_t offset, size_t modifiedsize) if (!mapped || !(mapFlags & MAP_EXPLICIT_RANGE_MODIFY)) return; + if (!isMappedDataModified) + { + modifiedOffset = offset; + modifiedSize = size; + isMappedDataModified = true; + return; + } + // We're being conservative right now by internally marking the whole range // from the start of section a to the end of section b as modified if both // a and b are marked as modified. diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index e3c089ebc..64fde2f3c 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -75,6 +75,7 @@ private: size_t modifiedOffset = 0; size_t modifiedSize = 0; + bool isMappedDataModified = false; }; // Buffer From d75f5df80d9bfe9f911d7d7367442238d624c8f2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 25 Jul 2020 19:48:54 -0300 Subject: [PATCH 49/54] Add Buffer methods flush, setArrayData, setElement, getElement, getElementCount, getElementStride, getSize, getFormat --- src/modules/graphics/Buffer.cpp | 2 +- src/modules/graphics/Buffer.h | 6 +- src/modules/graphics/opengl/Buffer.cpp | 2 +- src/modules/graphics/wrap_Buffer.cpp | 255 ++++++++++++++++++++++ src/modules/graphics/wrap_Mesh.cpp | 2 +- src/modules/graphics/wrap_SpriteBatch.cpp | 3 + 6 files changed, 264 insertions(+), 6 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 257571d22..8929eaa57 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -69,7 +69,7 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 0) + if (decl.arrayLength > 0) throw love::Exception("Arrays are not supported in vertex buffers."); if (info.isMatrix) diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 15b1360a3..6411f9064 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -66,12 +66,12 @@ public: { std::string name; DataFormat format; - int arraySize; + int arrayLength; - DataDeclaration(const std::string &name, DataFormat format, int arraySize = 0) + DataDeclaration(const std::string &name, DataFormat format, int arrayLength = 0) : name(name) , format(format) - , arraySize(arraySize) + , arrayLength(arrayLength) {} }; diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index 2b17dc121..fbd8eae95 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -200,7 +200,7 @@ void Buffer::setMappedRangeModified(size_t offset, size_t modifiedsize) if (!isMappedDataModified) { modifiedOffset = offset; - modifiedSize = size; + modifiedSize = modifiedsize; isMappedDataModified = true; return; } diff --git a/src/modules/graphics/wrap_Buffer.cpp b/src/modules/graphics/wrap_Buffer.cpp index d352c40f8..eb0b680e3 100644 --- a/src/modules/graphics/wrap_Buffer.cpp +++ b/src/modules/graphics/wrap_Buffer.cpp @@ -20,6 +20,7 @@ #include "wrap_Buffer.h" #include "Buffer.h" +#include "common/Data.h" namespace love { @@ -185,8 +186,262 @@ Buffer *luax_checkbuffer(lua_State *L, int idx) return luax_checktype(L, idx); } +static int w_Buffer_flush(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + t->unmap(); + return 0; +} + +static int w_Buffer_setArrayData(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + + int startindex = (int) luaL_optnumber(L, 3, 1) - 1; + + int count = -1; + if (!lua_isnoneornil(L, 4)) + { + count = (int) luaL_checknumber(L, 4); + if (count <= 0) + return luaL_error(L, "Element count must be greater than 0."); + } + + size_t stride = t->getArrayStride(); + size_t offset = startindex * stride; + int arraylength = (int) t->getArrayLength(); + + if (startindex >= arraylength || startindex < 0) + return luaL_error(L, "Invalid vertex start index (must be between 1 and %d)", arraylength); + + if (luax_istype(L, 2, Data::type)) + { + Data *d = luax_checktype(L, 2); + + count = count >= 0 ? count : (arraylength - startindex); + if (startindex + count > arraylength) + return luaL_error(L, "Too many array elements (expected at most %d, got %d)", arraylength - startindex, count); + + size_t datasize = std::min(d->getSize(), count * stride); + char *bytedata = (char *) t->map() + offset; + + memcpy(bytedata, d->getData(), datasize); + + t->setMappedRangeModified(offset, datasize); + t->unmap(); + return 0; + } + + const std::vector &members = t->getDataMembers(); + + int ncomponents = 0; + for (const Buffer::DataMember &member : members) + ncomponents += member.info.components; + + luaL_checktype(L, 2, LUA_TTABLE); + int tablelen = (int) luax_objlen(L, 2); + + lua_rawgeti(L, 2, 1); + bool tableoftables = lua_istable(L, -1); + lua_pop(L, 1); + + if (!tableoftables) + { + if (tablelen % ncomponents != 0) + return luaL_error(L, "Array length in flat array variant of Buffer:setArrayData must be a multiple of the number of the total number of components (%d)", ncomponents); + tablelen /= ncomponents; + } + + count = count >= 0 ? std::min(count, tablelen) : tablelen; + if (startindex + count > arraylength) + return luaL_error(L, "Too many array elements (expected at most %d, got %d)", arraylength - startindex, count); + + char *data = (char *) t->map() + offset; + + if (tableoftables) + { + for (int i = 0; i < count; i++) + { + // get arraydata[index] + lua_rawgeti(L, 2, i + 1); + luaL_checktype(L, -1, LUA_TTABLE); + + // get arraydata[index][j] + for (int j = 1; j <= ncomponents; j++) + lua_rawgeti(L, -j, j); + + int idx = -ncomponents; + + for (const Buffer::DataMember &member : members) + { + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; + } + + lua_pop(L, ncomponents + 1); + + data += stride; + } + } + else // Flat array + { + for (int i = 0; i < count; i++) + { + // get arraydata[arrayindex * ncomponents + componentindex] + for (int componentindex = 1; componentindex <= ncomponents; componentindex++) + lua_rawgeti(L, 2, i * ncomponents + componentindex); + + int idx = -ncomponents; + + for (const Buffer::DataMember &member : members) + { + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; + } + + lua_pop(L, ncomponents); + + data += stride; + } + } + + t->setMappedRangeModified(offset, count * stride); + t->unmap(); + + return 0; +} + +static int w_Buffer_setElement(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + + size_t index = (size_t) (luaL_checkinteger(L, 2) - 1); + if (index >= t->getArrayLength()) + return luaL_error(L, "Invalid Buffer element index: %ld", index); + + size_t offset = index * t->getArrayStride(); + char *data = (char *) t->map() + offset; + const auto &members = t->getDataMembers(); + + bool istable = lua_istable(L, 3); + int idx = istable ? 1 : 3; + + if (istable) + { + for (const Buffer::DataMember &member : members) + { + int components = member.info.components; + + for (int i = idx; i < idx + components; i++) + lua_rawgeti(L, 3, i); + + luax_writebufferdata(L, -components, member.decl.format, data + member.offset); + + idx += components; + lua_pop(L, components); + } + } + else + { + for (const Buffer::DataMember &member : members) + { + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; + } + } + + return 0; +} + +static int w_Buffer_getElement(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + if ((t->getMapFlags() & Buffer::MAP_READ) == 0) + return luaL_error(L, "Buffer:getElement requires the buffer to be created with the 'cpureadable' setting set to true."); + + size_t index = (size_t) (luaL_checkinteger(L, 2) - 1); + if (index >= t->getArrayLength()) + return luaL_error(L, "Invalid Buffer element index: %ld", index); + + size_t offset = index * t->getArrayStride(); + const char *data = (const char *) t->map() + offset; + const auto &members = t->getDataMembers(); + + int n = 0; + + for (const Buffer::DataMember &member : members) + { + luax_readbufferdata(L, member.decl.format, data + member.offset); + n += member.info.components; + } + + return n; +} + +static int w_Buffer_getElementCount(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + lua_pushinteger(L, t->getArrayLength()); + return 1; +} + +static int w_Buffer_getElementStride(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + lua_pushinteger(L, t->getArrayStride()); + return 1; +} + +static int w_Buffer_getSize(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + lua_pushinteger(L, t->getSize()); + return 1; +} + +static int w_Buffer_getFormat(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + const auto &members = t->getDataMembers(); + + lua_createtable(L, (int) members.size(), 0); + + for (size_t i = 0; i < members.size(); i++) + { + const Buffer::DataMember &member = members[i]; + + lua_createtable(L, 0, 4); + + lua_pushstring(L, member.decl.name.c_str()); + lua_setfield(L, -2, "name"); + + const char *formatstr = "unknown"; + getConstant(member.decl.format, formatstr); + lua_pushstring(L, formatstr); + lua_setfield(L, -2, "format"); + + lua_pushinteger(L, member.decl.arrayLength); + lua_setfield(L, -2, "arraylength"); + + lua_pushinteger(L, member.offset); + lua_setfield(L, -2, "offset"); + + lua_rawseti(L, -2, i + 1); + } + + return 1; +} + static const luaL_Reg w_Buffer_functions[] = { + { "flush", w_Buffer_flush }, + { "setArrayData", w_Buffer_setArrayData }, + { "setElement", w_Buffer_setElement }, + { "getElement", w_Buffer_getElement }, + { "getElementCount", w_Buffer_getElementCount }, + { "getElementStride", w_Buffer_getElementStride }, + { "getSize", w_Buffer_getSize }, + { "getFormat", w_Buffer_getFormat }, { 0, 0 } }; diff --git a/src/modules/graphics/wrap_Mesh.cpp b/src/modules/graphics/wrap_Mesh.cpp index aa00d4bb2..211463033 100644 --- a/src/modules/graphics/wrap_Mesh.cpp +++ b/src/modules/graphics/wrap_Mesh.cpp @@ -55,7 +55,7 @@ int w_Mesh_setVertices(lua_State *L) size_t byteoffset = vertstart * stride; int totalverts = (int) t->getVertexCount(); - if (vertstart >= totalverts) + if (vertstart >= totalverts || vertstart < 0) return luaL_error(L, "Invalid vertex start index (must be between 1 and %d)", totalverts); if (luax_istype(L, 2, Data::type)) diff --git a/src/modules/graphics/wrap_SpriteBatch.cpp b/src/modules/graphics/wrap_SpriteBatch.cpp index f9e1fe360..981bcb6dc 100644 --- a/src/modules/graphics/wrap_SpriteBatch.cpp +++ b/src/modules/graphics/wrap_SpriteBatch.cpp @@ -226,6 +226,9 @@ int w_SpriteBatch_attachAttribute(lua_State *L) { Mesh *mesh = luax_checktype(L, 3); buffer = mesh->getVertexBuffer(); + if (buffer == nullptr) + return luaL_error(L, "Mesh does not have its own vertex buffer."); + luax_markdeprecated(L, "SpriteBatch:attachAttribute(name, mesh)", API_METHOD, DEPRECATED_REPLACED, "SpriteBatch:attachAttribute(name, buffer)"); } luax_catchexcept(L, [&](){ t->attachAttribute(name, buffer); }); From 36b0394afcf4456da5f923d8a9c39bc339fbe6df Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 26 Jul 2020 16:32:18 -0300 Subject: [PATCH 50/54] Add love.graphics.newVertexBuffer and love.graphics.newBuffer. --- src/modules/graphics/Buffer.cpp | 3 + src/modules/graphics/wrap_Buffer.cpp | 8 +- src/modules/graphics/wrap_Graphics.cpp | 191 ++++++++++++++++++++++++- 3 files changed, 197 insertions(+), 5 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 8929eaa57..6f4996d10 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -48,6 +48,9 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector= t->getArrayLength()) return luaL_error(L, "Invalid Buffer element index: %ld", index); - size_t offset = index * t->getArrayStride(); + size_t stride = t->getArrayStride(); + size_t offset = index * stride; char *data = (char *) t->map() + offset; const auto &members = t->getDataMembers(); @@ -350,6 +349,7 @@ static int w_Buffer_setElement(lua_State *L) } } + t->setMappedRangeModified(offset, stride); return 0; } diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 90a1d6595..ec897c9ec 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -1514,6 +1515,192 @@ static void luax_optbuffersettings(lua_State *L, int idx, Buffer::Settings &sett settings.mapFlags = (Buffer::MapFlags)(settings.mapFlags & (~Buffer::MAP_READ)); } +static void luax_checkbufferformat(lua_State *L, int idx, std::vector &format) +{ + luaL_checktype(L, idx, LUA_TTABLE); + int tablelen = luax_objlen(L, idx); + + for (int i = 1; i <= tablelen; i++) + { + lua_rawgeti(L, idx, i); + luaL_checktype(L, -1, LUA_TTABLE); + + Buffer::DataDeclaration decl("", DATAFORMAT_MAX_ENUM); + + lua_getfield(L, -1, "name"); + if (lua_type(L, -1) != LUA_TSTRING) + { + std::ostringstream ss; + ss << "'name' field expected in array element #"; + ss << i; + ss << " of format table"; + std::string str = ss.str(); + luaL_argerror(L, idx, str.c_str()); + } + decl.name = luax_checkstring(L, -1); + lua_pop(L, 1); + + lua_getfield(L, -1, "format"); + if (lua_type(L, -1) != LUA_TSTRING) + { + std::ostringstream ss; + ss << "'format' field expected in array element #"; + ss << i; + ss << " of format table"; + std::string str = ss.str(); + luaL_argerror(L, idx, str.c_str()); + } + const char *formatstr = luaL_checkstring(L, -1); + if (!getConstant(formatstr, decl.format)) + luax_enumerror(L, "data format", getConstants(decl.format), formatstr); + lua_pop(L, 1); + + decl.arrayLength = luax_intflag(L, -1, "arraylength", 0); + + format.push_back(decl); + lua_pop(L, 1); + } +} + +static Buffer *luax_newbuffer(lua_State *L, int idx, const Buffer::Settings &settings, const std::vector &format) +{ + size_t arraylength = 0; + size_t bytesize = 0; + Data *data = nullptr; + const void *initialdata = nullptr; + + int ncomponents = 0; + for (const Buffer::DataDeclaration &decl : format) + ncomponents += getDataFormatInfo(decl.format).components; + + if (luax_istype(L, idx, Data::type)) + { + data = luax_checktype(L, idx); + initialdata = data->getData(); + bytesize = data->getSize(); + } + + bool tableoftables = false; + + if (lua_istable(L, idx)) + { + arraylength = luax_objlen(L, idx); + + lua_rawgeti(L, idx, 1); + tableoftables = lua_istable(L, -1); + lua_pop(L, 1); + + if (!tableoftables) + { + if (arraylength % ncomponents != 0) + luaL_error(L, "Array length in flat array variant of newBuffer must be a multiple of the total number of components (%d)", ncomponents); + arraylength /= ncomponents; + } + } + else if (data == nullptr) + { + lua_Integer len = luaL_checkinteger(L, idx); + if (len <= 0) + luaL_argerror(L, idx, "number of elements must be greater than 0"); + arraylength = (size_t) len; + } + + Buffer *b = nullptr; + luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, initialdata, bytesize, arraylength); }); + + if (lua_istable(L, idx)) + { + Buffer::Mapper mapper(*b); + char *data = (char *) mapper.data; + const auto &members = b->getDataMembers(); + size_t stride = b->getArrayStride(); + + if (tableoftables) + { + for (size_t i = 0; i < arraylength; i++) + { + // get arraydata[index] + lua_rawgeti(L, 2, i + 1); + luaL_checktype(L, -1, LUA_TTABLE); + + // get arraydata[index][j] + for (int j = 1; j <= ncomponents; j++) + lua_rawgeti(L, -j, j); + + int idx = -ncomponents; + + for (const Buffer::DataMember &member : members) + { + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; + } + + lua_pop(L, ncomponents + 1); + data += stride; + } + } + else // Flat array + { + for (size_t i = 0; i < arraylength; i++) + { + // get arraydata[arrayindex * ncomponents + componentindex] + for (int componentindex = 1; componentindex <= ncomponents; componentindex++) + lua_rawgeti(L, 2, i * ncomponents + componentindex); + + int idx = -ncomponents; + + for (const Buffer::DataMember &member : members) + { + luax_writebufferdata(L, idx, member.decl.format, data + member.offset); + idx += member.info.components; + } + + lua_pop(L, ncomponents); + data += stride; + } + } + } + + return b; +} + +int w_newBuffer(lua_State *L) +{ + Buffer::Settings settings(0, Buffer::MAP_EXPLICIT_RANGE_MODIFY, BUFFERUSAGE_DYNAMIC); + + luaL_checktype(L, 3, LUA_TTABLE); + if (luax_boolflag(L, 3, "vertex", false)) + settings.typeFlags = (Buffer::TypeFlags)(settings.typeFlags | Buffer::TYPEFLAG_VERTEX); + if (luax_boolflag(L, 3, "index", false)) + settings.typeFlags = (Buffer::TypeFlags)(settings.typeFlags | Buffer::TYPEFLAG_INDEX); + + luax_optbuffersettings(L, 3, settings); + + std::vector format; + luax_checkbufferformat(L, 1, format); + + Buffer *b = luax_newbuffer(L, 2, settings, format); + + luax_pushtype(L, b); + b->release(); + return 1; +} + +int w_newVertexBuffer(lua_State *L) +{ + Buffer::Settings settings(Buffer::TYPEFLAG_VERTEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY, BUFFERUSAGE_DYNAMIC); + luax_optbuffersettings(L, 3, settings); + + std::vector format; + luax_checkbufferformat(L, 1, format); + + Buffer *b = luax_newbuffer(L, 2, settings, format); + + luax_pushtype(L, b); + b->release(); + return 1; +} + int w_newIndexBuffer(lua_State *L) { Buffer::Settings settings(Buffer::TYPEFLAG_INDEX, Buffer::MAP_EXPLICIT_RANGE_MODIFY, BUFFERUSAGE_DYNAMIC); @@ -1534,7 +1721,7 @@ int w_newIndexBuffer(lua_State *L) if (lua_istable(L, 1)) { - arraylength = (size_t) luax_objlen(L, 1); + arraylength = luax_objlen(L, 1); // Scan array for invalid types and the max value. lua_Integer maxvalue = 0; @@ -3192,6 +3379,8 @@ static const luaL_Reg functions[] = { "newSpriteBatch", w_newSpriteBatch }, { "newParticleSystem", w_newParticleSystem }, { "newShader", w_newShader }, + { "newBuffer", w_newBuffer }, + { "newVertexBuffer", w_newVertexBuffer }, { "newIndexBuffer", w_newIndexBuffer }, { "newMesh", w_newMesh }, { "newText", w_newText }, From 2d7267a4284ca2f088b289c46bd2c0db6312eaf2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 26 Jul 2020 16:43:40 -0300 Subject: [PATCH 51/54] Add Buffer:isBufferType and Buffer:isCPUReadable. --- src/modules/graphics/vertex.cpp | 7 +++++++ src/modules/graphics/vertex.h | 1 + src/modules/graphics/wrap_Buffer.cpp | 20 ++++++++++++++++++++ src/modules/graphics/wrap_Graphics.cpp | 14 ++++++++++---- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index ea135e0f4..ffc3e448c 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -337,6 +337,13 @@ const char *getConstant(BuiltinVertexAttribute attrib) return name; } +STRINGMAP_BEGIN(BufferType, BUFFERTYPE_MAX_ENUM, bufferTypeName) +{ + { "vertex", BUFFERTYPE_VERTEX }, + { "index", BUFFERTYPE_INDEX }, +} +STRINGMAP_END(BufferType, BUFFERTYPE_MAX_ENUM, bufferTypeName) + STRINGMAP_BEGIN(IndexDataType, INDEX_MAX_ENUM, indexType) { { "uint16", INDEX_UINT16 }, diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 003d4eb9f..5dd74ce47 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -377,6 +377,7 @@ void fillIndices(TriangleIndexMode mode, uint16 vertexStart, uint16 vertexCount, void fillIndices(TriangleIndexMode mode, uint32 vertexStart, uint32 vertexCount, uint32 *indices); STRINGMAP_DECLARE(BuiltinVertexAttribute); +STRINGMAP_DECLARE(BufferType); STRINGMAP_DECLARE(IndexDataType); STRINGMAP_DECLARE(BufferUsage); STRINGMAP_DECLARE(PrimitiveType); diff --git a/src/modules/graphics/wrap_Buffer.cpp b/src/modules/graphics/wrap_Buffer.cpp index 219552258..78813170b 100644 --- a/src/modules/graphics/wrap_Buffer.cpp +++ b/src/modules/graphics/wrap_Buffer.cpp @@ -432,6 +432,24 @@ static int w_Buffer_getFormat(lua_State *L) return 1; } +static int w_Buffer_isBufferType(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + BufferType buffertype = BUFFERTYPE_MAX_ENUM; + const char *typestr = luaL_checkstring(L, 2); + if (!getConstant(typestr, buffertype)) + return luax_enumerror(L, "buffer type", getConstants(buffertype), typestr); + luax_pushboolean(L, (t->getTypeFlags() & (1 << buffertype)) != 0); + return 1; +} + +static int w_Buffer_isCPUReadable(lua_State *L) +{ + Buffer *t = luax_checkbuffer(L, 1); + luax_pushboolean(L, (t->getMapFlags() & Buffer::MAP_READ) != 0); + return 1; +} + static const luaL_Reg w_Buffer_functions[] = { { "flush", w_Buffer_flush }, @@ -442,6 +460,8 @@ static const luaL_Reg w_Buffer_functions[] = { "getElementStride", w_Buffer_getElementStride }, { "getSize", w_Buffer_getSize }, { "getFormat", w_Buffer_getFormat }, + { "isBufferType", w_Buffer_isBufferType }, + { "isCPUReadable", w_Buffer_isCPUReadable }, { 0, 0 } }; diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index ec897c9ec..a479411b3 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1669,10 +1669,16 @@ int w_newBuffer(lua_State *L) Buffer::Settings settings(0, Buffer::MAP_EXPLICIT_RANGE_MODIFY, BUFFERUSAGE_DYNAMIC); luaL_checktype(L, 3, LUA_TTABLE); - if (luax_boolflag(L, 3, "vertex", false)) - settings.typeFlags = (Buffer::TypeFlags)(settings.typeFlags | Buffer::TYPEFLAG_VERTEX); - if (luax_boolflag(L, 3, "index", false)) - settings.typeFlags = (Buffer::TypeFlags)(settings.typeFlags | Buffer::TYPEFLAG_INDEX); + + for (int i = 0; i < BUFFERTYPE_MAX_ENUM; i++) + { + BufferType buffertype = (BufferType) i; + const char *tname = nullptr; + if (!getConstant(buffertype, tname)) + continue; + if (luax_boolflag(L, 3, tname, false)) + settings.typeFlags = (Buffer::TypeFlags)(settings.typeFlags | (1u << i)); + } luax_optbuffersettings(L, 3, settings); From de370beb68362b1ca20cc28a1b996a8a20bcc0fe Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 26 Jul 2020 16:59:09 -0300 Subject: [PATCH 52/54] Remove deprecation notices from newImage for now --- src/modules/graphics/wrap_Graphics.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index a479411b3..93966a874 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1195,25 +1195,25 @@ int w_newVolumeTexture(lua_State *L) int w_newImage(lua_State *L) { - luax_markdeprecated(L, "love.graphics.newImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newTexture"); + //luax_markdeprecated(L, "love.graphics.newImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newTexture"); return w_newTexture(L); } int w_newCubeImage(lua_State *L) { - luax_markdeprecated(L, "love.graphics.newCubeImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newCubeTexture"); + //luax_markdeprecated(L, "love.graphics.newCubeImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newCubeTexture"); return w_newCubeTexture(L); } int w_newArrayImage(lua_State *L) { - luax_markdeprecated(L, "love.graphics.newArrayImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newArrayTexture"); + //luax_markdeprecated(L, "love.graphics.newArrayImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newArrayTexture"); return w_newArrayTexture(L); } int w_newVolumeImage(lua_State *L) { - luax_markdeprecated(L, "love.graphics.newVolumeImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newVolumeTexture"); + //luax_markdeprecated(L, "love.graphics.newVolumeImage", API_FUNCTION, DEPRECATED_RENAMED, "love.graphics.newVolumeTexture"); return w_newVolumeTexture(L); } From 3c65d5ae417291aed96c42f34d8edb6dab0e8d11 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 27 Jul 2020 17:35:16 -0300 Subject: [PATCH 53/54] love.graphics.newIndexBuffer uses 0-based index values. It can't be consistent with other buffer types or Buffer methods if it's 1-based. --- src/modules/graphics/wrap_Graphics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 93966a874..f411028be 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1734,7 +1734,7 @@ int w_newIndexBuffer(lua_State *L) for (size_t i = 0; i < arraylength; i++) { lua_rawgeti(L, 1, i + 1); - lua_Integer v = luaL_checkinteger(L, -1) - 1; + lua_Integer v = luaL_checkinteger(L, -1); lua_pop(L, 1); if (v < 0) return luaL_argerror(L, 1, "expected positive integer values in array"); @@ -1771,7 +1771,7 @@ int w_newIndexBuffer(lua_State *L) for (size_t i = 0; i < arraylength; i++) { lua_rawgeti(L, 1, i + 1); - lua_Integer v = luaL_checkinteger(L, -1) - 1; + lua_Integer v = luaL_checkinteger(L, -1); lua_pop(L, 1); if (format == DATAFORMAT_UINT16) u16data[i] = (uint16) v; From b011487a3e86966d447e04bd69e7b82b0921ac38 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 28 Jul 2020 20:44:36 -0300 Subject: [PATCH 54/54] Add new texel buffer type. GLSL 3+ shaders can read from texel buffers by declaring a uniform samplerBuffer variable and calling texelFetch with a 0-based index, in the shader code. All attributes in a texel buffer's format array must have the same data format (e.g. all 'floatvec4' formats). Shader:send accepts a texel Buffer for samplerBuffer uniforms. Added 'texelbuffer' to love.graphics.getSupported (requires GLSL 3+ and desktop OpenGL). Added 'texelbuffersize' to love.graphics.getSystemLimits. Returns the max number of values in a texel buffer (array length multiplied by the number of attributes declared in the buffer's format array). --- src/modules/graphics/Buffer.cpp | 41 ++++- src/modules/graphics/Buffer.h | 11 +- src/modules/graphics/Graphics.cpp | 2 + src/modules/graphics/Graphics.h | 2 + src/modules/graphics/Shader.h | 10 +- src/modules/graphics/opengl/Buffer.cpp | 74 ++++++-- src/modules/graphics/opengl/Buffer.h | 11 +- src/modules/graphics/opengl/Graphics.cpp | 28 ++- src/modules/graphics/opengl/Graphics.h | 3 + src/modules/graphics/opengl/OpenGL.cpp | 32 +++- src/modules/graphics/opengl/OpenGL.h | 18 +- src/modules/graphics/opengl/Shader.cpp | 222 +++++++++++++++++++++-- src/modules/graphics/opengl/Shader.h | 6 + src/modules/graphics/vertex.cpp | 1 + src/modules/graphics/vertex.h | 1 + src/modules/graphics/wrap_Buffer.cpp | 4 +- src/modules/graphics/wrap_Graphics.cpp | 22 ++- src/modules/graphics/wrap_Shader.cpp | 19 ++ 18 files changed, 445 insertions(+), 62 deletions(-) diff --git a/src/modules/graphics/Buffer.cpp b/src/modules/graphics/Buffer.cpp index 6f4996d10..6124e515d 100644 --- a/src/modules/graphics/Buffer.cpp +++ b/src/modules/graphics/Buffer.cpp @@ -43,13 +43,18 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vectorgetCapabilities().features[Graphics::FEATURE_GLSL3]; + const auto &caps = gfx->getCapabilities(); + bool supportsGLSL3 = caps.features[Graphics::FEATURE_GLSL3]; bool indexbuffer = settings.typeFlags & TYPEFLAG_INDEX; bool vertexbuffer = settings.typeFlags & TYPEFLAG_VERTEX; + bool texelbuffer = settings.typeFlags & TYPEFLAG_TEXEL; - if (!indexbuffer && !vertexbuffer) - throw love::Exception("Buffer must be created with at least one buffer type (index or vertex)."); + if (!indexbuffer && !vertexbuffer && !texelbuffer) + throw love::Exception("Buffer must be created with at least one buffer type (index, vertex, or texel)."); + + if (texelbuffer && !caps.features[Graphics::FEATURE_TEXEL_BUFFER]) + throw love::Exception("Texel buffers are not supported on this system."); size_t offset = 0; size_t stride = 0; @@ -68,6 +73,9 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 1) throw love::Exception("Index buffers only support a single value per element."); + + if (decl.arrayLength > 0) + throw love::Exception("Arrays are not supported in index buffers."); } if (vertexbuffer) @@ -83,6 +91,30 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector 0) + throw love::Exception("Arrays are not supported in texel buffers."); + + if (info.isMatrix) + throw love::Exception("Matrix types are not supported in texel buffers."); + + if (info.baseType == DATA_BASETYPE_BOOL) + throw love::Exception("Bool types are not supported in texel buffers."); + + if (info.components == 3) + throw love::Exception("3-component formats are not supported in texel buffers."); + + if (info.baseType == DATA_BASETYPE_SNORM) + throw love::Exception("Signed normalized formats are not supported in texel buffers."); } // TODO: alignment @@ -111,6 +143,9 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vectorarrayStride = stride; this->arrayLength = arraylength; this->size = size; + + if (texelbuffer && arraylength * dataMembers.size() > caps.limits[Graphics::LIMIT_TEXEL_BUFFER_SIZE]) + throw love::Exception("Cannot create texel buffer: total number of values in the buffer (%d * %d) is too large for this system (maximum %d).", (int) dataMembers.size(), (int) arraylength, caps.limits[Graphics::LIMIT_TEXEL_BUFFER_SIZE]); } Buffer::~Buffer() diff --git a/src/modules/graphics/Buffer.h b/src/modules/graphics/Buffer.h index 6411f9064..36f684702 100644 --- a/src/modules/graphics/Buffer.h +++ b/src/modules/graphics/Buffer.h @@ -60,6 +60,7 @@ public: TYPEFLAG_NONE = 0, TYPEFLAG_VERTEX = 1 << BUFFERTYPE_VERTEX, TYPEFLAG_INDEX = 1 << BUFFERTYPE_INDEX, + TYPEFLAG_TEXEL = 1 << BUFFERTYPE_TEXEL, }; struct DataDeclaration @@ -141,10 +142,6 @@ public: /** * Fill a portion of the buffer with data and marks the range as modified. - * - * @param offset The offset in the GLBuffer to store the data. - * @param size The size of the incoming data. - * @param data Pointer to memory to copy data from. */ virtual void fill(size_t offset, size_t size, const void *data) = 0; @@ -153,6 +150,12 @@ public: **/ virtual void copyTo(size_t offset, size_t size, Buffer *other, size_t otheroffset) = 0; + /** + * Texel buffers may use an additional texture handle as well as a buffer + * handle. + **/ + virtual ptrdiff_t getTexelBufferHandle() const = 0; + static std::vector getCommonFormatDeclaration(CommonFormat format); class Mapper diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp index 7fbe0a7b5..001806e85 100644 --- a/src/modules/graphics/Graphics.cpp +++ b/src/modules/graphics/Graphics.cpp @@ -1932,6 +1932,7 @@ StringMap::Entry Graphics::featur { "glsl3", FEATURE_GLSL3 }, { "glsl4", FEATURE_GLSL4 }, { "instancing", FEATURE_INSTANCING }, + { "texelbuffer", FEATURE_TEXEL_BUFFER }, }; StringMap Graphics::features(Graphics::featureEntries, sizeof(Graphics::featureEntries)); @@ -1943,6 +1944,7 @@ StringMap::Entry Graphics::syst { "texturelayers", LIMIT_TEXTURE_LAYERS }, { "volumetexturesize", LIMIT_VOLUME_TEXTURE_SIZE }, { "cubetexturesize", LIMIT_CUBE_TEXTURE_SIZE }, + { "texelbuffersize", LIMIT_TEXEL_BUFFER_SIZE }, { "rendertargets", LIMIT_RENDER_TARGETS }, { "texturemsaa", LIMIT_TEXTURE_MSAA }, { "anisotropy", LIMIT_ANISOTROPY }, diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h index 1a2f75640..d26ba929a 100644 --- a/src/modules/graphics/Graphics.h +++ b/src/modules/graphics/Graphics.h @@ -143,6 +143,7 @@ public: FEATURE_GLSL3, FEATURE_GLSL4, FEATURE_INSTANCING, + FEATURE_TEXEL_BUFFER, FEATURE_MAX_ENUM }; @@ -160,6 +161,7 @@ public: LIMIT_VOLUME_TEXTURE_SIZE, LIMIT_CUBE_TEXTURE_SIZE, LIMIT_TEXTURE_LAYERS, + LIMIT_TEXEL_BUFFER_SIZE, LIMIT_RENDER_TARGETS, LIMIT_TEXTURE_MSAA, LIMIT_ANISOTROPY, diff --git a/src/modules/graphics/Shader.h b/src/modules/graphics/Shader.h index f6b9b2a08..2c4717626 100644 --- a/src/modules/graphics/Shader.h +++ b/src/modules/graphics/Shader.h @@ -39,6 +39,7 @@ namespace graphics { class Graphics; +class Buffer; // A GLSL shader class Shader : public Object, public Resource @@ -76,6 +77,7 @@ public: UNIFORM_UINT, UNIFORM_BOOL, UNIFORM_SAMPLER, + UNIFORM_TEXELBUFFER, UNIFORM_UNKNOWN, UNIFORM_MAX_ENUM }; @@ -115,6 +117,7 @@ public: UniformType baseType; TextureType textureType; + DataBaseType texelBufferType; bool isDepthSampler; std::string name; @@ -128,7 +131,11 @@ public: size_t dataSize; - Texture **textures; + union + { + Texture **textures; + Buffer **buffers; + }; }; // The members in here must respect uniform buffer alignment/padding rules. @@ -178,6 +185,7 @@ public: virtual void updateUniform(const UniformInfo *info, int count) = 0; virtual void sendTextures(const UniformInfo *info, Texture **textures, int count) = 0; + virtual void sendBuffers(const UniformInfo *info, Buffer **buffers, int count) = 0; /** * Gets whether a uniform with the specified name exists and is actively diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp index fbd8eae95..61eb6e61b 100644 --- a/src/modules/graphics/opengl/Buffer.cpp +++ b/src/modules/graphics/opengl/Buffer.cpp @@ -35,13 +35,45 @@ namespace graphics namespace opengl { +static GLenum getGLFormat(DataFormat format) +{ + switch (format) + { + case DATAFORMAT_FLOAT: return GL_R32F; + case DATAFORMAT_FLOAT_VEC2: return GL_RG32F; + case DATAFORMAT_FLOAT_VEC3: return GL_RGB32F; + case DATAFORMAT_FLOAT_VEC4: return GL_RGBA32F; + case DATAFORMAT_INT32: return GL_R32I; + case DATAFORMAT_INT32_VEC2: return GL_RG32I; + case DATAFORMAT_INT32_VEC3: return GL_RGB32I; + case DATAFORMAT_INT32_VEC4: return GL_RGBA32I; + case DATAFORMAT_UINT32: return GL_R32UI; + case DATAFORMAT_UINT32_VEC2: return GL_RG32UI; + case DATAFORMAT_UINT32_VEC3: return GL_RGB32UI; + case DATAFORMAT_UINT32_VEC4: return GL_RGBA32UI; + case DATAFORMAT_UNORM8_VEC4: return GL_RGBA8; + case DATAFORMAT_INT8_VEC4: return GL_RGBA8I; + case DATAFORMAT_UINT8_VEC4: return GL_RGBA8UI; + case DATAFORMAT_UNORM16_VEC2: return GL_RG16; + case DATAFORMAT_UNORM16_VEC4: return GL_RGBA16; + case DATAFORMAT_INT16_VEC2: return GL_RG16I; + case DATAFORMAT_INT16_VEC4: return GL_RGBA16I; + case DATAFORMAT_UINT16: return GL_R16UI; + case DATAFORMAT_UINT16_VEC2: return GL_RG16UI; + case DATAFORMAT_UINT16_VEC4: return GL_RGBA16UI; + default: return GL_ZERO; + } +} + Buffer::Buffer(love::graphics::Graphics *gfx, const Settings &settings, const std::vector &format, const void *data, size_t size, size_t arraylength) : love::graphics::Buffer(gfx, settings, format, size, arraylength) { size = getSize(); arraylength = getArrayLength(); - if (typeFlags & TYPEFLAG_VERTEX) + if (typeFlags & TYPEFLAG_TEXEL) + mapType = BUFFERTYPE_TEXEL; + else if (typeFlags & TYPEFLAG_VERTEX) mapType = BUFFERTYPE_VERTEX; else if (typeFlags & TYPEFLAG_INDEX) mapType = BUFFERTYPE_INDEX; @@ -62,8 +94,9 @@ Buffer::Buffer(love::graphics::Graphics *gfx, const Settings &settings, const st if (!load(data != nullptr)) { + unloadVolatile(); delete[] memoryMap; - throw love::Exception("Could not load vertex buffer (out of VRAM?)"); + throw love::Exception("Could not create buffer (out of VRAM?)"); } } @@ -75,31 +108,45 @@ Buffer::~Buffer() bool Buffer::loadVolatile() { + if (buffer != 0) + return true; + return load(true); } void Buffer::unloadVolatile() { mapped = false; - if (vbo != 0) - gl.deleteBuffer(vbo); - vbo = 0; + if (buffer != 0) + gl.deleteBuffer(buffer); + buffer = 0; + if (texture != 0) + gl.deleteTexture(texture); + texture = 0; } bool Buffer::load(bool restore) { - glGenBuffers(1, &vbo); - gl.bindBuffer(mapType, vbo); - while (glGetError() != GL_NO_ERROR) /* Clear the error buffer. */; + glGenBuffers(1, &buffer); + gl.bindBuffer(mapType, buffer); + // Copy the old buffer only if 'restore' was requested. const GLvoid *src = restore ? memoryMap : nullptr; // Note that if 'src' is '0', no data will be copied. glBufferData(target, (GLsizeiptr) getSize(), src, OpenGL::getGLBufferUsage(getUsage())); + if (getTypeFlags() & TYPEFLAG_TEXEL) + { + glGenTextures(1, &texture); + gl.bindBufferTextureToUnit(texture, 0, false, true); + + glTexBuffer(target, getGLFormat(getDataMember(0).decl.format), buffer); + } + return (glGetError() == GL_NO_ERROR); } @@ -123,7 +170,7 @@ void Buffer::unmapStatic(size_t offset, size_t size) return; // Upload the mapped data to the buffer. - gl.bindBuffer(mapType, vbo); + gl.bindBuffer(mapType, buffer); glBufferSubData(target, (GLintptr) offset, (GLsizeiptr) size, memoryMap + offset); } @@ -133,7 +180,7 @@ void Buffer::unmapStream() // "orphan" current buffer to avoid implicit synchronisation on the GPU: // http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-AsynchronousBufferTransfers.pdf - gl.bindBuffer(mapType, vbo); + gl.bindBuffer(mapType, buffer); glBufferData(target, (GLsizeiptr) getSize(), nullptr, glusage); #if LOVE_WINDOWS @@ -224,16 +271,11 @@ void Buffer::fill(size_t offset, size_t size, const void *data) setMappedRangeModified(offset, size); else { - gl.bindBuffer(mapType, vbo); + gl.bindBuffer(mapType, buffer); glBufferSubData(target, (GLintptr) offset, (GLsizeiptr) size, data); } } -ptrdiff_t Buffer::getHandle() const -{ - return vbo; -} - void Buffer::copyTo(size_t offset, size_t size, love::graphics::Buffer *other, size_t otheroffset) { other->fill(otheroffset, size, memoryMap + offset); diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h index 64fde2f3c..b0a96bb5f 100644 --- a/src/modules/graphics/opengl/Buffer.h +++ b/src/modules/graphics/opengl/Buffer.h @@ -53,7 +53,9 @@ public: void unmap() override; void setMappedRangeModified(size_t offset, size_t size) override; void fill(size_t offset, size_t size, const void *data) override; - ptrdiff_t getHandle() const override; + + ptrdiff_t getHandle() const override { return buffer; }; + ptrdiff_t getTexelBufferHandle() const override { return texture; }; void copyTo(size_t offset, size_t size, love::graphics::Buffer *other, size_t otheroffset) override; @@ -67,8 +69,11 @@ private: BufferType mapType = BUFFERTYPE_VERTEX; GLenum target = 0; - // The VBO identifier. Assigned by OpenGL. - GLuint vbo = 0; + // The buffer object identifier. Assigned by OpenGL. + GLuint buffer = 0; + + // Used for Texel Buffer types. + GLuint texture = 0; // A pointer to mapped memory. char *memoryMap = nullptr; diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 77e4f49e1..8f6bfffb1 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -91,6 +91,7 @@ static GLenum getGLBlendFactor(BlendFactor factor) Graphics::Graphics() : windowHasStencil(false) , mainVAO(0) + , defaultBuffers() , supportedFormats() { gl = OpenGL(); @@ -243,6 +244,27 @@ bool Graphics::setMode(int width, int height, int pixelwidth, int pixelheight, b batchedDrawState.indexBuffer = CreateStreamBuffer(BUFFERTYPE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX); } + if (capabilities.features[FEATURE_TEXEL_BUFFER] && defaultBuffers[BUFFERTYPE_TEXEL].get() == nullptr) + { + Buffer::Settings settings(Buffer::TYPEFLAG_TEXEL, 0, BUFFERUSAGE_STATIC); + std::vector format = {{"", DATAFORMAT_FLOAT_VEC4, 0}}; + + const float texel[] = {0.0f, 0.0f, 0.0f, 1.0f}; + + love::graphics::Buffer *buffer = newBuffer(settings, format, texel, sizeof(texel), 1); + defaultBuffers[BUFFERTYPE_TEXEL].set(buffer, Acquire::NORETAIN); + } + + // Load default resources before other Volatile. + for (int i = 0; i < BUFFERTYPE_MAX_ENUM; i++) + { + if (defaultBuffers[i].get()) + ((Buffer *) defaultBuffers[i].get())->loadVolatile(); + } + + if (defaultBuffers[BUFFERTYPE_TEXEL].get()) + gl.setDefaultTexelBuffer((GLuint) defaultBuffers[BUFFERTYPE_TEXEL]->getTexelBufferHandle()); + // Reload all volatile objects. if (!Volatile::loadAll()) ::printf("Could not reload all volatile objects.\n"); @@ -1366,17 +1388,19 @@ void Graphics::initCapabilities() capabilities.features[FEATURE_GLSL3] = GLAD_ES_VERSION_3_0 || gl.isCoreProfile(); capabilities.features[FEATURE_GLSL4] = GLAD_ES_VERSION_3_1 || (gl.isCoreProfile() && GLAD_VERSION_4_3); capabilities.features[FEATURE_INSTANCING] = gl.isInstancingSupported(); - static_assert(FEATURE_MAX_ENUM == 10, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); + capabilities.features[FEATURE_TEXEL_BUFFER] = gl.areTexelBuffersSupported(); + static_assert(FEATURE_MAX_ENUM == 11, "Graphics::initCapabilities must be updated when adding a new graphics feature!"); capabilities.limits[LIMIT_POINT_SIZE] = gl.getMaxPointSize(); capabilities.limits[LIMIT_TEXTURE_SIZE] = gl.getMax2DTextureSize(); capabilities.limits[LIMIT_TEXTURE_LAYERS] = gl.getMaxTextureLayers(); capabilities.limits[LIMIT_VOLUME_TEXTURE_SIZE] = gl.getMax3DTextureSize(); capabilities.limits[LIMIT_CUBE_TEXTURE_SIZE] = gl.getMaxCubeTextureSize(); + capabilities.limits[LIMIT_TEXEL_BUFFER_SIZE] = gl.getMaxTexelBufferSize(); capabilities.limits[LIMIT_RENDER_TARGETS] = gl.getMaxRenderTargets(); capabilities.limits[LIMIT_TEXTURE_MSAA] = gl.getMaxSamples(); capabilities.limits[LIMIT_ANISOTROPY] = gl.getMaxAnisotropy(); - static_assert(LIMIT_MAX_ENUM == 8, "Graphics::initCapabilities must be updated when adding a new system limit!"); + static_assert(LIMIT_MAX_ENUM == 9, "Graphics::initCapabilities must be updated when adding a new system limit!"); for (int i = 0; i < TEXTURE_MAX_ENUM; i++) capabilities.textureTypes[i] = gl.isTextureTypeSupported((TextureType) i); diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h index d23934eb9..62b0ae71f 100644 --- a/src/modules/graphics/opengl/Graphics.h +++ b/src/modules/graphics/opengl/Graphics.h @@ -147,6 +147,9 @@ private: bool windowHasStencil; GLuint mainVAO; + // Only needed for buffer types that can be bound to shaders. + StrongRef defaultBuffers[BUFFERTYPE_MAX_ENUM]; + // [rendertarget][readable][srgb] OptionalBool supportedFormats[PIXELFORMAT_MAX_ENUM][2][2][2]; diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 8fb8a497b..d3ac04fd2 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -229,7 +229,7 @@ void OpenGL::setupContext() } // Initialize multiple texture unit support for shaders. - for (int i = 0; i < TEXTURE_MAX_ENUM; i++) + for (int i = 0; i < TEXTURE_MAX_ENUM + 1; i++) { state.boundTextures[i].clear(); state.boundTextures[i].resize(maxTextureUnits, 0); @@ -280,6 +280,10 @@ void OpenGL::deInitContext() } } + if (state.defaultTexelBuffer != 0) + gl.deleteTexture(state.defaultTexelBuffer); + state.defaultTexelBuffer = 0; + contextInitialized = false; } @@ -459,6 +463,11 @@ void OpenGL::initMaxValues() else maxTextureArrayLayers = 0; + if (areTexelBuffersSupported()) + glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &maxTexelBufferSize); + else + maxTexelBufferSize = 0; + int maxattachments = 1; int maxdrawbuffers = 1; @@ -578,6 +587,7 @@ GLenum OpenGL::getGLBufferType(BufferType type) { case BUFFERTYPE_VERTEX: return GL_ARRAY_BUFFER; case BUFFERTYPE_INDEX: return GL_ELEMENT_ARRAY_BUFFER; + case BUFFERTYPE_TEXEL: return GL_TEXTURE_BUFFER; case BUFFERTYPE_MAX_ENUM: return GL_ZERO; } @@ -592,7 +602,7 @@ GLenum OpenGL::getGLTextureType(TextureType type) case TEXTURE_VOLUME: return GL_TEXTURE_3D; case TEXTURE_2D_ARRAY: return GL_TEXTURE_2D_ARRAY; case TEXTURE_CUBE: return GL_TEXTURE_CUBE_MAP; - case TEXTURE_MAX_ENUM: return GL_ZERO; + case TEXTURE_MAX_ENUM: return GL_TEXTURE_BUFFER; // Hack } return GL_ZERO; @@ -1084,6 +1094,11 @@ void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureun } } +void OpenGL::bindBufferTextureToUnit(GLuint texture, int textureunit, bool restoreprev, bool bindforedit) +{ + bindTextureToUnit(TEXTURE_MAX_ENUM, texture, textureunit, restoreprev, bindforedit); +} + void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev, bool bindforedit) { TextureType textype = TEXTURE_2D; @@ -1113,7 +1128,7 @@ void OpenGL::deleteTexture(GLuint texture) { // glDeleteTextures binds texture 0 to all texture units the deleted texture // was bound to before deletion. - for (int i = 0; i < TEXTURE_MAX_ENUM; i++) + for (int i = 0; i < TEXTURE_MAX_ENUM + 1; i++) { for (GLuint &texid : state.boundTextures[i]) { @@ -1402,6 +1417,12 @@ bool OpenGL::isMultiFormatMRTSupported() const return getMaxRenderTargets() > 1 && (GLAD_ES_VERSION_3_0 || GLAD_VERSION_3_0 || GLAD_ARB_framebuffer_object); } +bool OpenGL::areTexelBuffersSupported() const +{ + // Not supported in ES until 3.2, which we don't support shaders for... + return GLAD_VERSION_3_1; +} + int OpenGL::getMax2DTextureSize() const { return std::max(max2DTextureSize, 1); @@ -1422,6 +1443,11 @@ int OpenGL::getMaxTextureLayers() const return std::max(maxTextureArrayLayers, 1); } +int OpenGL::getMaxTexelBufferSize() const +{ + return maxTexelBufferSize; +} + int OpenGL::getMaxRenderTargets() const { return std::min(maxRenderTargets, MAX_COLOR_RENDER_TARGETS); diff --git a/src/modules/graphics/opengl/OpenGL.h b/src/modules/graphics/opengl/OpenGL.h index a16d20313..2ae6d13f4 100644 --- a/src/modules/graphics/opengl/OpenGL.h +++ b/src/modules/graphics/opengl/OpenGL.h @@ -306,6 +306,12 @@ public: **/ GLuint getDefaultTexture(TextureType type) const; + /** + * Gets the texture ID for love's default texel buffer. + **/ + GLuint getDefaultTexelBuffer() const { return state.defaultTexelBuffer; } + void setDefaultTexelBuffer(GLuint tex) { state.defaultTexelBuffer = tex; } + /** * Helper for setting the active texture unit. * @@ -323,6 +329,8 @@ public: void bindTextureToUnit(TextureType target, GLuint texture, int textureunit, bool restoreprev, bool bindforedit = true); void bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev, bool bindforedit = true); + void bindBufferTextureToUnit(GLuint texture, int textureunit, bool restoreprev, bool bindforedit); + /** * Helper for deleting an OpenGL texture. * Cleans up if the texture is currently bound. @@ -349,6 +357,7 @@ public: bool isSamplerLODBiasSupported() const; bool isBaseVertexSupported() const; bool isMultiFormatMRTSupported() const; + bool areTexelBuffersSupported() const; /** * Returns the maximum supported width or height of a texture. @@ -358,6 +367,11 @@ public: int getMaxCubeTextureSize() const; int getMaxTextureLayers() const; + /** + * Returns the maximum number of values in a texel buffer. + **/ + int getMaxTexelBufferSize() const; + /** * Returns the maximum supported number of simultaneous render targets. **/ @@ -436,6 +450,7 @@ private: int max3DTextureSize; int maxCubeTextureSize; int maxTextureArrayLayers; + int maxTexelBufferSize; int maxRenderTargets; int maxSamples; int maxTextureUnits; @@ -451,7 +466,7 @@ private: GLuint boundBuffers[BUFFERTYPE_MAX_ENUM]; // Texture unit state (currently bound texture for each texture unit.) - std::vector boundTextures[TEXTURE_MAX_ENUM]; + std::vector boundTextures[TEXTURE_MAX_ENUM + 1]; bool enableState[ENABLE_MAX_ENUM]; @@ -472,6 +487,7 @@ private: GLuint boundFramebuffers[2]; GLuint defaultTexture[TEXTURE_MAX_ENUM]; + GLuint defaultTexelBuffer; } state; diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index f93f126b9..ed5256f10 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -69,6 +69,16 @@ Shader::~Shader() delete[] p.second.textures; } + else if (p.second.baseType == UNIFORM_TEXELBUFFER) + { + for (int i = 0; i < p.second.count; i++) + { + if (p.second.buffers[i] != nullptr) + p.second.buffers[i]->release(); + } + + delete[] p.second.buffers; + } } } @@ -107,6 +117,7 @@ void Shader::mapActiveUniforms() u.location = glGetUniformLocation(program, u.name.c_str()); u.baseType = getUniformBaseType(gltype); u.textureType = getUniformTextureType(gltype); + u.texelBufferType = getUniformTexelBufferType(gltype); u.isDepthSampler = isDepthTextureType(gltype); if (u.baseType == UNIFORM_MATRIX) @@ -130,12 +141,22 @@ void Shader::mapActiveUniforms() if (u.location == -1) continue; - if (u.baseType == UNIFORM_SAMPLER && builtin != BUILTIN_TEXTURE_MAIN) + if ((u.baseType == UNIFORM_SAMPLER && builtin != BUILTIN_TEXTURE_MAIN) || u.baseType == UNIFORM_TEXELBUFFER) { TextureUnit unit; unit.type = u.textureType; unit.active = true; - unit.texture = gl.getDefaultTexture(u.textureType); + + if (u.baseType == UNIFORM_TEXELBUFFER) + { + unit.isTexelBuffer = true; + unit.texture = gl.getDefaultTexelBuffer(); + } + else + { + unit.isTexelBuffer = false; + unit.texture = gl.getDefaultTexture(u.textureType); + } for (int i = 0; i < u.count; i++) textureUnits.push_back(unit); @@ -165,6 +186,7 @@ void Shader::mapActiveUniforms() case UNIFORM_INT: case UNIFORM_BOOL: case UNIFORM_SAMPLER: + case UNIFORM_TEXELBUFFER: u.dataSize = sizeof(int) * u.components * u.count; u.data = malloc(u.dataSize); break; @@ -184,7 +206,7 @@ void Shader::mapActiveUniforms() { memset(u.data, 0, u.dataSize); - if (u.baseType == UNIFORM_SAMPLER) + if (u.baseType == UNIFORM_SAMPLER || u.baseType == UNIFORM_TEXELBUFFER) { int startunit = (int) textureUnits.size() - u.count; @@ -196,8 +218,16 @@ void Shader::mapActiveUniforms() glUniform1iv(u.location, u.count, u.ints); - u.textures = new love::graphics::Texture*[u.count]; - memset(u.textures, 0, sizeof(Texture *) * u.count); + if (u.baseType == UNIFORM_TEXELBUFFER) + { + u.buffers = new love::graphics::Buffer*[u.count]; + memset(u.buffers, 0, sizeof(Buffer *) * u.count); + } + else + { + u.textures = new love::graphics::Texture*[u.count]; + memset(u.textures, 0, sizeof(Texture *) * u.count); + } } } @@ -258,7 +288,6 @@ void Shader::mapActiveUniforms() { if (u.textures[i] == nullptr) continue; - Volatile *v = dynamic_cast(u.textures[i]); if (v != nullptr) v->loadVolatile(); @@ -266,6 +295,19 @@ void Shader::mapActiveUniforms() sendTextures(&u, u.textures, u.count, true); } + else if (u.baseType == UNIFORM_TEXELBUFFER) + { + for (int i = 0; i < u.count; i++) + { + if (u.buffers[i] == nullptr) + continue; + Volatile *v = dynamic_cast(u.buffers[i]); + if (v != nullptr) + v->loadVolatile(); + } + + sendBuffers(&u, u.buffers, u.count, true); + } } // Make sure uniforms that existed before but don't exist anymore are @@ -276,16 +318,26 @@ void Shader::mapActiveUniforms() { free(p.second.data); - if (p.second.baseType != UNIFORM_SAMPLER) - continue; - - for (int i = 0; i < p.second.count; i++) + if (p.second.baseType == UNIFORM_SAMPLER) { - if (p.second.textures[i] != nullptr) - p.second.textures[i]->release(); - } + for (int i = 0; i < p.second.count; i++) + { + if (p.second.textures[i] != nullptr) + p.second.textures[i]->release(); + } - delete[] p.second.textures; + delete[] p.second.textures; + } + else if (p.second.baseType == UNIFORM_TEXELBUFFER) + { + for (int i = 0; i < p.second.count; i++) + { + if (p.second.buffers[i] != nullptr) + p.second.buffers[i]->release(); + } + + delete[] p.second.buffers; + } } } @@ -440,7 +492,12 @@ void Shader::attach() { const TextureUnit &unit = textureUnits[i]; if (unit.active) - gl.bindTextureToUnit(unit.type, unit.texture, i, false, false); + { + if (unit.isTexelBuffer) + gl.bindBufferTextureToUnit(unit.texture, i, false, false); + else + gl.bindTextureToUnit(unit.type, unit.texture, i, false, false); + } } // send any pending uniforms to the shader program. @@ -503,7 +560,7 @@ void Shader::updateUniform(const UniformInfo *info, int count, bool internalupda break; } } - else if (type == UNIFORM_INT || type == UNIFORM_BOOL || type == UNIFORM_SAMPLER) + else if (type == UNIFORM_INT || type == UNIFORM_BOOL || type == UNIFORM_SAMPLER || type == UNIFORM_TEXELBUFFER) { switch (info->components) { @@ -644,6 +701,109 @@ void Shader::sendTextures(const UniformInfo *info, love::graphics::Texture **tex } } +void Shader::sendBuffers(const UniformInfo *info, love::graphics::Buffer **buffers, int count) +{ + Shader::sendBuffers(info, buffers, count, false); +} + +static bool isTexelBufferTypeCompatible(DataBaseType a, DataBaseType b) +{ + if (a == DATA_BASETYPE_FLOAT || a == DATA_BASETYPE_UNORM || a == DATA_BASETYPE_SNORM) + return b == DATA_BASETYPE_FLOAT || b == DATA_BASETYPE_UNORM || b == DATA_BASETYPE_SNORM; + + if (a == DATA_BASETYPE_INT && b == DATA_BASETYPE_INT) + return true; + + if (a == DATA_BASETYPE_UINT && b == DATA_BASETYPE_UINT) + return true; + + return false; +} + +void Shader::sendBuffers(const UniformInfo *info, love::graphics::Buffer **buffers, int count, bool internalUpdate) +{ + if (info->baseType != UNIFORM_TEXELBUFFER) + return; + + uint32 requiredtypeflags = Buffer::TYPEFLAG_TEXEL; + + bool shaderactive = current == this; + + if (!internalUpdate && shaderactive) + flushBatchedDraws(); + + count = std::min(count, info->count); + + // Bind the textures to the texture units. + for (int i = 0; i < count; i++) + { + love::graphics::Buffer *buffer = buffers[i]; + + if (buffer != nullptr) + { + if ((buffer->getTypeFlags() & requiredtypeflags) == 0) + { + if (internalUpdate) + continue; + else + throw love::Exception("Shader uniform '%s' is a texel buffer, but the given Buffer was not created with texel buffer capabilities.", info->name.c_str()); + } + + DataBaseType basetype = buffer->getDataMember(0).info.baseType; + if (!isTexelBufferTypeCompatible(basetype, info->texelBufferType)) + { + if (internalUpdate) + continue; + else + throw love::Exception("Texel buffer's data format base type must match the variable declared in the shader."); + } + + buffer->retain(); + } + + bool addbuffertoarray = true; + + if (info->buffers[i] != nullptr) + { + Buffer *oldbuffer = info->buffers[i]; + auto it = std::find(buffersToUnmap.begin(), buffersToUnmap.end(), oldbuffer); + if (it != buffersToUnmap.end()) + { + addbuffertoarray = false; + if (buffer != nullptr) + *it = buffer; + else + { + auto last = buffersToUnmap.end() - 1; + *it = *last; + buffersToUnmap.erase(last); + } + } + + oldbuffer->release(); + } + + if (addbuffertoarray && buffer != nullptr) + buffersToUnmap.push_back(buffer); + + info->buffers[i] = buffer; + + GLuint gltex = 0; + if (buffers[i] != nullptr) + gltex = (GLuint) buffer->getTexelBufferHandle(); + else + gltex = gl.getDefaultTexelBuffer(); + + int texunit = info->ints[i]; + + if (shaderactive) + gl.bindBufferTextureToUnit(gltex, texunit, false, false); + + // Store texture id so it can be re-bound to the texture unit later. + textureUnits[texunit].texture = gltex; + } +} + void Shader::flushBatchedDraws() const { if (current == this) @@ -756,11 +916,20 @@ void Shader::updateBuiltinUniforms(love::graphics::Graphics *gfx, int viewportW, GLint location = builtinUniforms[BUILTIN_UNIFORMS_PER_DRAW]; if (location >= 0) glUniform4fv(location, 13, (const GLfloat *) &data); + + // TODO: Find a better place to put this. + // Buffers used in this shader can be mapped by external code without + // unmapping. We need to make sure the data on the GPU is up to date, + // otherwise the shader can read from old data. + for (Buffer *buffer : buffersToUnmap) + buffer->unmap(); } int Shader::getUniformTypeComponents(GLenum type) const { - if (getUniformBaseType(type) == UNIFORM_SAMPLER) + UniformType basetype = getUniformBaseType(type); + + if (basetype == UNIFORM_SAMPLER || basetype == UNIFORM_TEXELBUFFER) return 1; switch (type) @@ -889,6 +1058,10 @@ Shader::UniformType Shader::getUniformBaseType(GLenum type) const case GL_SAMPLER_CUBE_MAP_ARRAY: case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW: return UNIFORM_SAMPLER; + case GL_SAMPLER_BUFFER: + case GL_INT_SAMPLER_BUFFER: + case GL_UNSIGNED_INT_SAMPLER_BUFFER: + return UNIFORM_TEXELBUFFER; default: return UNIFORM_UNKNOWN; } @@ -932,6 +1105,21 @@ TextureType Shader::getUniformTextureType(GLenum type) const } } +DataBaseType Shader::getUniformTexelBufferType(GLenum type) const +{ + switch (type) + { + case GL_SAMPLER_BUFFER: + return DATA_BASETYPE_FLOAT; + case GL_INT_SAMPLER_BUFFER: + return DATA_BASETYPE_INT; + case GL_UNSIGNED_INT_SAMPLER_BUFFER: + return DATA_BASETYPE_UINT; + default: + return DATA_BASETYPE_MAX_ENUM; + } +} + bool Shader::isDepthTextureType(GLenum type) const { switch (type) diff --git a/src/modules/graphics/opengl/Shader.h b/src/modules/graphics/opengl/Shader.h index 868563970..10591744e 100644 --- a/src/modules/graphics/opengl/Shader.h +++ b/src/modules/graphics/opengl/Shader.h @@ -62,6 +62,7 @@ public: const UniformInfo *getUniformInfo(BuiltinUniform builtin) const override; void updateUniform(const UniformInfo *info, int count) override; void sendTextures(const UniformInfo *info, love::graphics::Texture **textures, int count) override; + void sendBuffers(const UniformInfo *info, love::graphics::Buffer **buffers, int count) override; bool hasUniform(const std::string &name) const override; ptrdiff_t getHandle() const override; void setVideoTextures(love::graphics::Texture *ytexture, love::graphics::Texture *cbtexture, love::graphics::Texture *crtexture) override; @@ -75,6 +76,7 @@ private: { GLuint texture = 0; TextureType type = TEXTURE_2D; + bool isTexelBuffer = false; bool active = false; }; @@ -83,11 +85,13 @@ private: void updateUniform(const UniformInfo *info, int count, bool internalupdate); void sendTextures(const UniformInfo *info, love::graphics::Texture **textures, int count, bool internalupdate); + void sendBuffers(const UniformInfo *info, love::graphics::Buffer **buffers, int count, bool internalupdate); int getUniformTypeComponents(GLenum type) const; MatrixSize getMatrixSize(GLenum type) const; UniformType getUniformBaseType(GLenum type) const; TextureType getUniformTextureType(GLenum type) const; + DataBaseType getUniformTexelBufferType(GLenum type) const; bool isDepthTextureType(GLenum type) const; void flushBatchedDraws() const; @@ -115,6 +119,8 @@ private: std::vector> pendingUniformUpdates; + std::vector buffersToUnmap; + float lastPointSize; }; // Shader diff --git a/src/modules/graphics/vertex.cpp b/src/modules/graphics/vertex.cpp index ffc3e448c..15d16891e 100644 --- a/src/modules/graphics/vertex.cpp +++ b/src/modules/graphics/vertex.cpp @@ -341,6 +341,7 @@ STRINGMAP_BEGIN(BufferType, BUFFERTYPE_MAX_ENUM, bufferTypeName) { { "vertex", BUFFERTYPE_VERTEX }, { "index", BUFFERTYPE_INDEX }, + { "texel", BUFFERTYPE_TEXEL }, } STRINGMAP_END(BufferType, BUFFERTYPE_MAX_ENUM, bufferTypeName) diff --git a/src/modules/graphics/vertex.h b/src/modules/graphics/vertex.h index 5dd74ce47..f1479ccf8 100644 --- a/src/modules/graphics/vertex.h +++ b/src/modules/graphics/vertex.h @@ -58,6 +58,7 @@ enum BufferType { BUFFERTYPE_VERTEX = 0, BUFFERTYPE_INDEX, + BUFFERTYPE_TEXEL, BUFFERTYPE_MAX_ENUM }; diff --git a/src/modules/graphics/wrap_Buffer.cpp b/src/modules/graphics/wrap_Buffer.cpp index 78813170b..fe61b39ea 100644 --- a/src/modules/graphics/wrap_Buffer.cpp +++ b/src/modules/graphics/wrap_Buffer.cpp @@ -315,7 +315,7 @@ static int w_Buffer_setElement(lua_State *L) size_t index = (size_t) (luaL_checkinteger(L, 2) - 1); if (index >= t->getArrayLength()) - return luaL_error(L, "Invalid Buffer element index: %ld", index); + return luaL_error(L, "Invalid Buffer element index: %d", (int) index + 1); size_t stride = t->getArrayStride(); size_t offset = index * stride; @@ -361,7 +361,7 @@ static int w_Buffer_getElement(lua_State *L) size_t index = (size_t) (luaL_checkinteger(L, 2) - 1); if (index >= t->getArrayLength()) - return luaL_error(L, "Invalid Buffer element index: %ld", index); + return luaL_error(L, "Invalid Buffer element index: %d", (int) index + 1); size_t offset = index * t->getArrayStride(); const char *data = (const char *) t->map() + offset; diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index f411028be..b20f34148 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -1517,6 +1517,16 @@ static void luax_optbuffersettings(lua_State *L, int idx, Buffer::Settings &sett static void luax_checkbufferformat(lua_State *L, int idx, std::vector &format) { + if (lua_type(L, idx) == LUA_TSTRING) + { + Buffer::DataDeclaration decl("", DATAFORMAT_MAX_ENUM); + const char *formatstr = luaL_checkstring(L, idx); + if (!getConstant(formatstr, decl.format)) + luax_enumerror(L, "data format", getConstants(decl.format), formatstr); + format.push_back(decl); + return; + } + luaL_checktype(L, idx, LUA_TTABLE); int tablelen = luax_objlen(L, idx); @@ -1528,16 +1538,8 @@ static void luax_checkbufferformat(lua_State *L, int idx, std::vector buffers; + buffers.reserve(count); + + for (int i = 0; i < count; i++) + { + Buffer *buffer = luax_checktype(L, startidx + i); + buffers.push_back(buffer); + } + + luax_catchexcept(L, [&]() { shader->sendBuffers(info, buffers.data(), count); }); + return 0; +} + static int w_Shader_sendLuaValues(lua_State *L, int startidx, Shader *shader, const Shader::UniformInfo *info, const char *name) { switch (info->baseType) @@ -303,6 +320,8 @@ static int w_Shader_sendLuaValues(lua_State *L, int startidx, Shader *shader, co return w_Shader_sendBooleans(L, startidx, shader, info); case Shader::UNIFORM_SAMPLER: return w_Shader_sendTextures(L, startidx, shader, info); + case Shader::UNIFORM_TEXELBUFFER: + return w_Shader_sendBuffers(L, startidx, shader, info); default: return luaL_error(L, "Unknown variable type for shader uniform '%s", name); }