diff --git a/.gitignore b/.gitignore index 86e433c..0418816 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ cmake_install.cmake VITA-Homebrew-Sorter *.vpk *.sfo +eboot.bin diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f9e93c..4c6c290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,10 +89,10 @@ target_link_libraries(${PROJECT_NAME} ) ## Create Vita files -vita_create_self(${PROJECT_NAME}.self ${PROJECT_NAME} UNSAFE) +vita_create_self(eboot.bin ${PROJECT_NAME} UNSAFE) # The FILE directive lets you add additional files to the VPK, the syntax is # FILE src_path dst_path_in_vpk. In this case, we add the LiveArea paths. -vita_create_vpk(${PROJECT_NAME}.vpk ${VITA_TITLEID} ${PROJECT_NAME}.self +vita_create_vpk(${PROJECT_NAME}.vpk ${VITA_TITLEID} eboot.bin VERSION ${VITA_VERSION} NAME ${VITA_APP_NAME} FILE sce_sys/icon0.png sce_sys/icon0.png diff --git a/source/gui.cpp b/source/gui.cpp index 42d9725..dee432a 100644 --- a/source/gui.cpp +++ b/source/gui.cpp @@ -7,8 +7,8 @@ #include "applist.h" #include "config.h" #include "fs.h" -#include "imgui_impl_vitagl.h" #define IMGUI_DEFINE_MATH_OPERATORS +#include "imgui_impl_vitagl.h" #include "imgui_internal.h" #include "loadouts.h" #include "sqlite3.h" diff --git a/source/textures.cpp b/source/textures.cpp index 726d13b..3525a41 100644 --- a/source/textures.cpp +++ b/source/textures.cpp @@ -12,7 +12,7 @@ std::vector icons; namespace Textures { constexpr int max_textures = 7; - static bool Create(unsigned char *data, GLint format, Tex &texture) { + static bool Create(unsigned char *data, GLint format, Tex &texture) { // Create a OpenGL texture identifier glGenTextures(1, &texture.id); glBindTexture(GL_TEXTURE_2D, texture.id); @@ -22,6 +22,9 @@ namespace Textures { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); // Upload pixels into texture +#if defined(GL_UNPACK_ROW_LENGTH) && !defined(__EMSCRIPTEN__) + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); +#endif glTexImage2D(GL_TEXTURE_2D, 0, format, texture.width, texture.height, 0, format, GL_UNSIGNED_BYTE, data); return true; }