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

use constant color for VertexColor

Browse Source
This commit is contained in:
niki
2022-06-14 23:30:51 +02:00
parent 1111aa3f42
commit 2bf7c35220
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Shader.cpp
+1 -3
View File
@@ -290,9 +290,7 @@ vec4 position(mat4 clipSpaceFromLocal, vec4 localPosition);
void main() { void main() {
love_initializeBuiltinUniforms(); love_initializeBuiltinUniforms();
VaryingTexCoord = VertexTexCoord; VaryingTexCoord = VertexTexCoord;
// FIXME VaryingColor = gammaCorrectColor(VertexColor) * ConstantColor;
// VaryingColor = gammaCorrectColor(VertexColor) * ConstantColor;
VaryingColor = vec4(1, 1, 1, 1);
love_Position = position(ClipSpaceFromLocal, VertexPosition); love_Position = position(ClipSpaceFromLocal, VertexPosition);
} }
)"; )";
src/modules/graphics/vulkan/Graphics.cpp
+26 -2
View File
@@ -228,6 +228,8 @@ namespace love {
created = true; created = true;
float whiteColor[] = { 1.0f, 1.0f, 1.0f, 1.0f };
batchedDrawBuffers.clear(); batchedDrawBuffers.clear();
batchedDrawBuffers.reserve(MAX_FRAMES_IN_FLIGHT); batchedDrawBuffers.reserve(MAX_FRAMES_IN_FLIGHT);
for (int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) { for (int i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
@@ -237,6 +239,13 @@ namespace love {
batchedDrawBuffers[i].vertexBuffer1 = new StreamBuffer(vmaAllocator, BUFFERUSAGE_VERTEX, 1024 * 1024 * 1); batchedDrawBuffers[i].vertexBuffer1 = new StreamBuffer(vmaAllocator, BUFFERUSAGE_VERTEX, 1024 * 1024 * 1);
batchedDrawBuffers[i].vertexBuffer2 = new StreamBuffer(vmaAllocator, BUFFERUSAGE_VERTEX, 256 * 1024 * 1); batchedDrawBuffers[i].vertexBuffer2 = new StreamBuffer(vmaAllocator, BUFFERUSAGE_VERTEX, 256 * 1024 * 1);
batchedDrawBuffers[i].indexBuffer = new StreamBuffer(vmaAllocator, BUFFERUSAGE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX); batchedDrawBuffers[i].indexBuffer = new StreamBuffer(vmaAllocator, BUFFERUSAGE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX);
// sometimes the VertexColor is not set, so we manually adjust it to white color
batchedDrawBuffers[i].constantColorBuffer = new StreamBuffer(vmaAllocator, BUFFERUSAGE_VERTEX, sizeof(whiteColor));
auto mapInfo = batchedDrawBuffers[i].constantColorBuffer->map(sizeof(whiteColor));
memcpy(mapInfo.data, whiteColor, sizeof(whiteColor));
batchedDrawBuffers[i].constantColorBuffer->unmap(sizeof(whiteColor));
batchedDrawBuffers[i].constantColorBuffer->markUsed(sizeof(whiteColor));
} }
updatedBatchedDrawBuffers(); updatedBatchedDrawBuffers();
@@ -312,6 +321,10 @@ namespace love {
buffers.push_back((VkBuffer)cmd.buffers->info[1].buffer->getHandle()); buffers.push_back((VkBuffer)cmd.buffers->info[1].buffer->getHandle());
offsets.push_back((VkDeviceSize)cmd.buffers->info[1].offset); offsets.push_back((VkDeviceSize)cmd.buffers->info[1].offset);
//constant color
buffers.push_back((VkBuffer)batchedDrawBuffers[currentFrame].constantColorBuffer->getHandle());
offsets.push_back((VkDeviceSize)0);
if (cmd.texture == nullptr) { if (cmd.texture == nullptr) {
setTexture(standardTexture); setTexture(standardTexture);
} }
@@ -1055,8 +1068,19 @@ namespace love {
texCoordsInputAttributeDescription.format = VK_FORMAT_R32G32_SFLOAT; texCoordsInputAttributeDescription.format = VK_FORMAT_R32G32_SFLOAT;
texCoordsInputAttributeDescription.offset = 0; texCoordsInputAttributeDescription.offset = 0;
std::vector<VkVertexInputBindingDescription> bindingDescriptions = { vertexBindingDescription, texCoordsBindingDescription }; VkVertexInputBindingDescription constantColorBindingDescription;
std::vector<VkVertexInputAttributeDescription> vertexInputAttributeDescriptions = { positionInputAttributeDescription, texCoordsInputAttributeDescription }; constantColorBindingDescription.binding = 2;
constantColorBindingDescription.stride = 0;
constantColorBindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
VkVertexInputAttributeDescription constantColorInputAttributeDescription;
constantColorInputAttributeDescription.binding = 2;
constantColorInputAttributeDescription.location = 2;
constantColorInputAttributeDescription.format = VK_FORMAT_R32G32B32A32_SFLOAT;
constantColorInputAttributeDescription.offset = 0;
std::vector<VkVertexInputBindingDescription> bindingDescriptions = { vertexBindingDescription, texCoordsBindingDescription, constantColorBindingDescription };
std::vector<VkVertexInputAttributeDescription> vertexInputAttributeDescriptions = { positionInputAttributeDescription, texCoordsInputAttributeDescription, constantColorInputAttributeDescription };
vertexInputInfo.vertexBindingDescriptionCount = bindingDescriptions.size(); vertexInputInfo.vertexBindingDescriptionCount = bindingDescriptions.size();
vertexInputInfo.pVertexBindingDescriptions = bindingDescriptions.data(); vertexInputInfo.pVertexBindingDescriptions = bindingDescriptions.data();
src/modules/graphics/vulkan/Graphics.h
+2
View File
@@ -110,11 +110,13 @@ namespace love {
StreamBuffer* vertexBuffer1; StreamBuffer* vertexBuffer1;
StreamBuffer* vertexBuffer2; StreamBuffer* vertexBuffer2;
StreamBuffer* indexBuffer; StreamBuffer* indexBuffer;
StreamBuffer* constantColorBuffer;
~BatchedDrawBuffers() { ~BatchedDrawBuffers() {
delete vertexBuffer1; delete vertexBuffer1;
delete vertexBuffer2; delete vertexBuffer2;
delete indexBuffer; delete indexBuffer;
delete constantColorBuffer;
} }
}; };