diff --git a/CONFIG/vita/src/main.cpp b/CONFIG/vita/src/main.cpp index b856b664..75eb5bbc 100644 --- a/CONFIG/vita/src/main.cpp +++ b/CONFIG/vita/src/main.cpp @@ -13,14 +13,14 @@ void loadPluginCB(paf::Plugin* plugin) pageOpenParam.option = paf::Plugin::PageOption_None; plugin->SetLocale(Locale_EN); - + paf::ui::Scene* pScene = plugin->PageOpen("page_main", pageOpenParam); g_rootPage = pScene; pScene->SetDebugMode(paf::ui::Scene::DEBUG_AUTH_LAYOUT_RULER); - //paf::ui::Widget* pText = (paf::ui::Text*) pScene->FindChild("title_text"); - //pText->SetString(L"Test Text"); + // paf::ui::Widget* pText = (paf::ui::Text*) pScene->FindChild("title_text"); + // pText->SetString(L"Test Text"); } int paf_main(void) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 220de06b..3bfb5d4f 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -854,7 +854,7 @@ MxResult IsleApp::SetupWindow() SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, g_targetHeight); SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_FULLSCREEN_BOOLEAN, m_fullScreen); SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, WINDOW_TITLE); -#if defined(MINIWIN)&& !defined(__3DS__) && !defined(WINDOWS_STORE) && !defined(__vita__) +#if defined(MINIWIN) && !defined(__3DS__) && !defined(WINDOWS_STORE) && !defined(__vita__) SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, true); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); diff --git a/miniwin/src/d3drm/backends/gxm/renderer.cpp b/miniwin/src/d3drm/backends/gxm/renderer.cpp index 05274899..d0c91d3d 100644 --- a/miniwin/src/d3drm/backends/gxm/renderer.cpp +++ b/miniwin/src/d3drm/backends/gxm/renderer.cpp @@ -929,7 +929,7 @@ void GXMRenderer::AddTextureDestroyCallback(Uint32 id, IDirect3DRMTexture* textu void GXMRenderer::DeleteTextures(int index) { - for(auto& del : this->m_textures_delete[index]) { + for (auto& del : this->m_textures_delete[index]) { void* textureData = sceGxmTextureGetData(&del); gxm->free(textureData); } @@ -1121,7 +1121,8 @@ Uint32 GXMRenderer::GetTextureId(IDirect3DRMTexture* iTexture, bool isUi, float return textureId; } -const SceGxmTexture* GXMRenderer::UseTexture(GXMTextureCacheEntry& texture) { +const SceGxmTexture* GXMRenderer::UseTexture(GXMTextureCacheEntry& texture) +{ texture.notification = &this->fragmentNotifications[this->currentFragmentBufferIndex]; sceGxmSetFragmentTexture(gxm->context, 0, &texture.gxmTexture); return &texture.gxmTexture; diff --git a/miniwin/src/internal/d3drmrenderer_gxm.h b/miniwin/src/internal/d3drmrenderer_gxm.h index ced0046e..36f63577 100644 --- a/miniwin/src/internal/d3drmrenderer_gxm.h +++ b/miniwin/src/internal/d3drmrenderer_gxm.h @@ -79,6 +79,7 @@ class GXMRenderer : public Direct3DRMRenderer { void SetDither(bool dither) override; void DeleteTextures(int index); + private: void AddTextureDestroyCallback(Uint32 id, IDirect3DRMTexture* texture); void AddMeshDestroyCallback(Uint32 id, IDirect3DRMMesh* mesh);