WIP

Author: hoffstadt

extensions/pl_graphics_ext.c

@@ -433,9 +433,9 @@ pl__format_stride(plFormat tFormat)
         case PL_FORMAT_EAC_R11G11_UNORM:
         case PL_FORMAT_EAC_R11G11_SNORM:
             return 64 / (4 * 8);
-
-        case PL_FORMAT_BC2_SRGB:
+            
         case PL_FORMAT_BC2_UNORM:
+        case PL_FORMAT_BC2_SRGB:
         case PL_FORMAT_BC3_UNORM:
         case PL_FORMAT_BC3_SRGB:
         case PL_FORMAT_BC5_UNORM:

extensions/pl_graphics_metal.m

@@ -873,7 +873,19 @@
         tDesc.pcDebugName = "unnamed texture";
 
     if(tDesc.uMips == 0)
-        tDesc.uMips = (uint32_t)floorf(log2f((float)pl_maxi((int)tDesc.tDimensions.x, (int)tDesc.tDimensions.y))) + 1u;
+        tDesc.uMips = (uint32_t)floorf(log2f((float)pl_maxi((int)tDesc.tDimensions.x, (int)tDesc.tDimensions.y))) + 1;
+
+    for(uint32_t uMipLevel = 1; uMipLevel < tDesc.uMips; uMipLevel++)
+    {
+        int iCurrentWidth = (int)tDesc.tDimensions.x / ((1 << (int)uMipLevel));
+        int iCurrentHeight = (int)tDesc.tDimensions.y / ((1 << (int)uMipLevel));
+
+        if(iCurrentHeight < 4 || iCurrentWidth < 4)
+        {
+            tDesc.uMips = uMipLevel;
+            break;
+        }
+    }
 
     ptTexture->tDesc = tDesc,
     ptTexture->tView = (plTextureViewDesc){

extensions/pl_resource_ext.c

@@ -382,6 +382,7 @@ pl_resource_load_ex(const char* pcName, plResourceLoadFlags tFlags, uint8_t* puO
 
             bool bResizeNeeded = false;
             bool bGenerateMips = true;
+            // bool bAttemptCompression = false;
             bool bAttemptCompression = true;
             plImageInfo tImageInfo = {0};
             size_t szStagingOffset = 0;
@@ -614,6 +615,9 @@ pl_resource_load_ex(const char* pcName, plResourceLoadFlags tFlags, uint8_t* puO
                                 uint8_t uGreen = (ptPixel0[1] + ptPixel1[1] + ptPixel2[1] + ptPixel3[1]) / 4;
                                 uint8_t uBlue  = (ptPixel0[2] + ptPixel1[2] + ptPixel2[2] + ptPixel3[2]) / 4;
                                 uint8_t uAlpha = (ptPixel0[3] + ptPixel1[3] + ptPixel2[3] + ptPixel3[3]) / 4;
+                                // uint8_t uAlpha = pl_max(ptPixel0[3], ptPixel1[3]);
+                                // uAlpha = pl_max(uAlpha, ptPixel2[3]);
+                                // uAlpha = pl_max(uAlpha, ptPixel3[3]);
 
 
                                 puDstBuffer[j * iCurrentWidth * 4 + i * 4 + 0] = uRed;
@@ -647,7 +651,11 @@ pl_resource_load_ex(const char* pcName, plResourceLoadFlags tFlags, uint8_t* puO
                             .uMipLevel      = uMipLevel
                         };
 
-                        gptGfx->copy_buffer_to_texture(ptBlitEncoder, gptResourceManager->tStagingBuffer.tStagingBufferHandle, tResource.tTexture, 1, &tBufferImageCopy);
+                        gptGfx->copy_buffer_to_texture(ptBlitEncoder,
+                            gptResourceManager->tStagingBuffer.tStagingBufferHandle,
+                            tResource.tTexture,
+                            1,
+                            &tBufferImageCopy);
                         szStagingOffset += szCurrentSize;
                     }