commit some fixes

platform/hac/include/driver/display/deko.hpp

@@ -285,7 +285,7 @@ namespace love
         Framebuffer framebuffers[MAX_RENDERTARGETS];
         Framebuffer depthbuffer;
 
-        CCmdMemRing<2> commands;
+        CCmdMemRing<MAX_RENDERTARGETS> commands;
         std::array<DkImage const*, MAX_RENDERTARGETS> targets;
 
         BitwiseAlloc<MAX_OBJECTS> textureHandles;

platform/hac/source/boot.cpp

@@ -15,14 +15,14 @@ namespace love
     // clang-format off
     static constexpr std::array<const Service, 8> services =
     {{
-        { "bsd",         BIND(socketInitializeDefault),                           &socketExit  },
-        { "pl:u",        BIND(plInitialize,      PlServiceType_User),             &plExit      },
-        { "acc:a",       BIND(accountInitialize, AccountServiceType_Application), &accountExit },
-        { "set",         BIND(setInitialize),                                     &setExit     },
-        { "set:sys",     BIND(setsysInitialize),                                  &setsysExit  },
-        { "psm",         BIND(psmInitialize),                                     &psmExit     },
-        { "friend:u",    BIND(friendsInitialize, FriendsServiceType_User),        &friendsExit },
-        { "nifm:u",      BIND(nifmInitialize,    NifmServiceType_User),           &nifmExit    }
+        { "bsd",      BIND(socketInitializeDefault),                                  &socketExit  },
+        { "pl:u",     BIND(plInitialize,             PlServiceType_User),             &plExit      },
+        { "acc:a",    BIND(accountInitialize,        AccountServiceType_Application), &accountExit },
+        { "set",      BIND(setInitialize),                                            &setExit     },
+        { "set:sys",  BIND(setsysInitialize),                                         &setsysExit  },
+        { "psm",      BIND(psmInitialize),                                            &psmExit     },
+        { "friend:u", BIND(friendsInitialize,        FriendsServiceType_User),        &friendsExit },
+        { "nifm:u",   BIND(nifmInitialize,           NifmServiceType_User),           &nifmExit    }
     }};
     // clang-format on
 
@@ -65,6 +65,7 @@ namespace love
         }
 
         padConfigureInput(8, HidNpadStyleSet_NpadStandard);
+        hidInitializeTouchScreen();
 
         romfsInit();
 

platform/hac/source/driver/EventQueue.cpp

@@ -1,3 +1,5 @@
+#include "common/screen.hpp"
+
 #include "driver/EventQueue.hpp"
 
 #include "modules/joystick/JoystickModule.hpp"
@@ -60,7 +62,13 @@ namespace love
                 }
                 case AppletMessage_OperationModeChanged:
                 {
+                    auto info = love::getScreenInfo(Screen(0));
+                    EventQueue::getInstance().sendResize(info.width, info.height);
+
+                    break;
                 }
+                default:
+                    break;
             }
         }
     }

platform/hac/source/driver/display/deko.cpp

@@ -6,6 +6,7 @@
 namespace love
 {
     deko3d::deko3d() :
+        context {},
         transform {},
         device(dk::DeviceMaker {}.setFlags(DkDeviceFlags_DepthMinusOneToOne).create()),
         mainQueue(dk::QueueMaker { this->device }.setFlags(DkQueueFlags_Graphics).create()),
@@ -14,7 +15,6 @@ namespace love
         images(CMemPool(this->device, GPU_USE_FLAGS, GPU_POOL_SIZE)),
         data(CMemPool(this->device, CPU_USE_FLAGS, CPU_POOL_SIZE)),
         code(CMemPool(this->device, SHADER_USE_FLAGS, SHADER_POOL_SIZE)),
-        context {},
         framebufferSlot(-1)
     {}
 
@@ -210,7 +210,7 @@ namespace love
             this->commandBuffer.barrier(DkBarrier_Primitives, DkInvalidateFlags_Descriptors);
             this->context.descriptorsDirty = false;
         }
-        std::printf("Texture Handle id: %u\n", texture);
+
         this->commandBuffer.bindTextures(DkStage_Fragment, 0, texture);
     }
 
@@ -232,6 +232,9 @@ namespace love
         this->commandBuffer.bindColorWriteState(this->context.colorWrite);
         this->commandBuffer.bindBlendStates(0, this->context.blend);
 
+        if (!this->uniform)
+            return;
+
         this->commandBuffer.pushConstants(this->uniform.getGpuAddr(), this->uniform.getSize(), 0,
                                           TRANSFORM_SIZE, &this->transform);
     }
@@ -370,7 +373,7 @@ namespace love
 
         dk::SamplerDescriptor samplerDescriptor {};
         samplerDescriptor.initialize(*sampler);
-        std::printf("updating index %u\n", index);
+
         this->imageSet.update(this->commandBuffer, index, imageDescriptor);
         this->samplerSet.update(this->commandBuffer, index, samplerDescriptor);
 

source/main.cpp

@@ -98,7 +98,8 @@ static DoneAction runLove(char** argv, int argc, int& result, love::Variant& res
     {
         if (lua_type(L, index) == LUA_TSTRING && strcmp(lua_tostring(L, index), "restart") == 0)
             action = DONE_RESTART;
-        else if (lua_isnumber(L, index))
+
+        if (lua_isnumber(L, index))
             result = lua_tonumber(L, index);
 
         if (index < lua_gettop(L))

source/modules/event/Event.cpp

@@ -53,6 +53,10 @@ namespace love
                 result = new Message("focus", args);
                 break;
             }
+            case SUBTYPE_RESIZE:
+                args.emplace_back(event.resize.width);
+                args.emplace_back(event.resize.height);
+                result = new Message("resize", args);
             default:
                 break;
         }

source/modules/graphics/Graphics.cpp

@@ -54,6 +54,8 @@ namespace love
 
         if (this->batchedDrawState.indexBuffer)
             this->batchedDrawState.indexBuffer->release();
+
+        Volatile::unloadAll();
     }
 
     void GraphicsBase::resetProjection()
@@ -222,10 +224,12 @@ namespace love
         if (this->batchedDrawState.vertexCount > 0)
             stats.drawCalls++;
 
-        stats.drawCallsBatched = this->drawCallsBatched;
-        stats.textures         = TextureBase::textureCount;
-        stats.textureMemory    = TextureBase::totalGraphicsMemory;
-        stats.shaderSwitches   = ShaderBase::shaderSwitches;
+        stats.drawCallsBatched  = this->drawCallsBatched;
+        stats.textures          = TextureBase::textureCount;
+        stats.textureMemory     = TextureBase::totalGraphicsMemory;
+        stats.shaderSwitches    = ShaderBase::shaderSwitches;
+        stats.cpuProcessingTime = GraphicsBase::cpuProcessingTime;
+        stats.gpuDrawingTime    = GraphicsBase::gpuDrawingTime;
 
         return stats;
     }
@@ -450,9 +454,6 @@ namespace love
             command.texture           = state.texture;
             command.isFont            = state.isFont;
 
-            debugVertices((Vertex*)state.vertexBuffer->getData(), state.lastVertexCount);
-            debugIndices((uint16_t*)state.indexBuffer->getData(), state.lastIndexCount);
-
             this->draw(command);
 
             state.indexBufferMap = MapInfo<uint16_t>();

source/modules/love/love.cpp

@@ -164,20 +164,20 @@ static int love_atpanic(lua_State* L)
     return 0;
 }
 
-#if __DEBUG__
-static void love_atcpanic()
-{
-    try
-    {
-        throw;
-    }
-    catch (const std::exception& e)
-    {
-        std::printf("Uncaught exception: %s", e.what());
-        std::exit(EXIT_FAILURE);
-    }
-}
-#endif
+// #if __DEBUG__
+// static void love_atcpanic()
+// {
+//     try
+//     {
+//         throw;
+//     }
+//     catch (const std::exception& e)
+//     {
+//         std::printf("Uncaught exception: %s", e.what());
+//         std::exit(EXIT_FAILURE);
+//     }
+// }
+// #endif
 
 static void luax_addcompatibilityalias(lua_State* L, const char* module, const char* name, const char* alias)
 {
@@ -269,7 +269,7 @@ int love_initialize(lua_State* L)
     lua_atpanic(L, love_atpanic);
 
 #if __DEBUG__
-    std::set_terminate(love_atcpanic);
+    // std::set_terminate(love_atcpanic);
 #endif
 
     return 1;