Fixes;

Author: bjornbytes

src/api/l_graphics.c

@@ -1491,8 +1491,6 @@ static int l_lovrGraphicsNewMaterial(lua_State* L) {
   luax_assert(L, material);
 
   if (lua_istable(L, 1)) {
-    float value, color[4];
-
     for (uint32_t i = 0; i < NUMBER_COUNT; i++) {
       lua_pushlstring(L, lovrMaterialNumber[i].string, lovrMaterialNumber[i].length);
       lua_gettable(L, 1);
@@ -1509,6 +1507,7 @@ static int l_lovrGraphicsNewMaterial(lua_State* L) {
 
       lua_gettable(L, 1);
       if (!lua_isnil(L, -1)) {
+        float color[4];
         luax_optcolor(L, -1, color);
         lovrMaterialSetColor(material, i, color);
       }
@@ -1536,7 +1535,7 @@ static int l_lovrGraphicsNewMaterial(lua_State* L) {
       lua_pop(L, 1);
     }
 
-    float quad[4];
+    float quad[4] = { 0.f, 0.f, 1.f, 1.f };
 
     // Deprecated
     lua_getfield(L, 1, "uvShift");
@@ -1577,6 +1576,8 @@ static int l_lovrGraphicsNewMaterial(lua_State* L) {
       lua_pop(L, 4);
     }
     lua_pop(L, 1);
+
+    lovrMaterialSetQuad(material, quad[0], quad[1], quad[2], quad[3]);
   }
 
   luax_pushtype(L, Material, material);

src/api/l_graphics_material.c

@@ -29,7 +29,7 @@ static int l_lovrMaterialSetNumber(lua_State* L) {
   Material* material = luax_checktype(L, 1, Material);
   MaterialNumber key = luax_checkenum(L, 2, MaterialNumber, NULL);
   float number = luax_checkfloat(L, 3);
-  lovrMaterialSetNumber(material, key, number);
+  luax_assert(L, lovrMaterialSetNumber(material, key, number));
   return 0;
 }
 
@@ -50,7 +50,7 @@ static int l_lovrMaterialSetColor(lua_State* L) {
   float color[4];
   MaterialColor key = lua_type(L, index) == LUA_TSTRING ? luax_checkenum(L, index++, MaterialColor, NULL) : COLOR_BASE;
   luax_readcolor(L, index, color);
-  lovrMaterialSetColor(material, key, color);
+  luax_assert(L, lovrMaterialSetColor(material, key, color));
   return 0;
 }
 
@@ -67,7 +67,7 @@ static int l_lovrMaterialSetTexture(lua_State* L) {
   int index = 2;
   MaterialTexture key = lua_type(L, index) == LUA_TSTRING ? luax_checkenum(L, index++, MaterialTexture, NULL) : TEXTURE_COLOR;
   Texture* texture = luax_checktype(L, index, Texture);
-  lovrMaterialSetTexture(material, key, texture);
+  luax_assert(L, lovrMaterialSetTexture(material, key, texture));
   return 0;
 }
 

src/modules/graphics/graphics.c

@@ -4208,9 +4208,11 @@ static bool lovrMaterialAllocate(Material* material) {
 static void lovrMaterialRecycle(Material* material) {
   if (!material->block) return;
   mtx_lock(&state.lock);
-  material->block->nodes[material->index].tick = state.tick;
-  material->block->tail = material->index;
-  if (material->block->head == ~0u) material->block->head = material->block->tail;
+  MaterialBlock* block = material->block;
+  block->nodes[material->index].tick = state.tick;
+  if (block->head == ~0u) block->head = material->index;
+  else block->nodes[block->tail].next = material->index;
+  block->tail = material->index;
   material->block = NULL;
   material->index = ~0u;
   material->bundle = NULL;
@@ -4224,15 +4226,23 @@ static bool lovrMaterialUpload(Material* material) {
 
   mtx_lock(&state.lock);
   BufferView staging = getBuffer(GPU_BUFFER_STREAM, sizeof(MaterialData), 4);
-  if (!staging.buffer) return mtx_unlock(&state.lock), NULL;
+  if (!staging.buffer) return mtx_unlock(&state.lock), false;
   gpu_copy_buffers(state.stream, staging.buffer, material->block->buffer, staging.offset, MATERIAL_STRIDE * material->index, sizeof(MaterialData));
   state.barrier.prev |= GPU_PHASE_COPY;
   state.barrier.next |= GPU_PHASE_SHADER_VERTEX | GPU_PHASE_SHADER_FRAGMENT;
   state.barrier.flush |= GPU_CACHE_TRANSFER_WRITE;
   state.barrier.clear |= GPU_CACHE_UNIFORM;
   material->bufferTick = state.tick;
   material->pointer = staging.pointer;
-  memcpy(material->pointer, &material->data, sizeof(MaterialData));
+  memcpy(material->pointer->numbers, &material->data.numbers, sizeof(material->data.numbers));
+  for (uint32_t i = 0; i < COLOR_COUNT; i++) {
+    material->pointer->colors[i][0] = lovrMathGammaToLinear(material->data.colors[i][0]);
+    material->pointer->colors[i][1] = lovrMathGammaToLinear(material->data.colors[i][1]);
+    material->pointer->colors[i][2] = lovrMathGammaToLinear(material->data.colors[i][2]);
+    material->pointer->colors[i][3] = material->data.colors[i][3];
+  }
+  memcpy(material->pointer->quad, material->data.quad, sizeof(material->data.quad));
+  memcpy(material->pointer->sdfRange, material->data.sdfRange, sizeof(material->data.sdfRange));
   mtx_unlock(&state.lock);
 
   return true;