diff --git a/MobileGL/MG_Backend/DirectVulkan/VulkanRendererConfig.h b/MobileGL/MG_Backend/DirectVulkan/VulkanRendererConfig.h index ee01301c..3c3efb34 100644 --- a/MobileGL/MG_Backend/DirectVulkan/VulkanRendererConfig.h +++ b/MobileGL/MG_Backend/DirectVulkan/VulkanRendererConfig.h @@ -13,8 +13,8 @@ namespace MobileGL::MG_Backend::DirectVulkan { struct VulkanRendererConfig { Uint32 MaxFramesInFlight = 2; String AppName = "MobileGL-VulkanRenderer"; - Version Version = MG_Config::CoreVersion; + MobileGL::Version Version = MG_Config::CoreVersion; Uint64 CacheVersion = MG_Config::CacheVersion; Bool EnableValidationLayers = true; }; -} // namespace MobileGL::MG_Backend::DirectVulkan \ No newline at end of file +} // namespace MobileGL::MG_Backend::DirectVulkan diff --git a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp index e7df7fe1..19ae4ea2 100644 --- a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp +++ b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp @@ -34,7 +34,7 @@ namespace MobileGL::MG_Impl::GLImpl { TextureUploadTarget textureUploadTarget, TextureTarget textureTarget) { if (TextureImpl::IsProxyTextureTarget(textureUploadTarget)) { auto& textureObject = - TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget); + TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget); if (!TextureImpl::ValidateTextureObject(textureObject)) return nullTextureObject; return textureObject; } else { @@ -554,9 +554,6 @@ namespace MobileGL::MG_Impl::GLImpl { textureObject->SetInternalFormat(textureInternalFormat); - // if isProxy, no more pixel transfer needed below - if (isProxy) return; - const void* originalPixels = pixels; // PBO @@ -671,9 +668,6 @@ namespace MobileGL::MG_Impl::GLImpl { MG_Util::ConvertTextureInternalFormatToString(textureInternalFormat).c_str()); textureObject->SetInternalFormat(textureInternalFormat); - // if isProxy, no more pixel transfer needed below - if (isProxy) return; - const void* originalPixels = pixels; // PBO @@ -797,7 +791,7 @@ namespace MobileGL::MG_Impl::GLImpl { auto& bindingSlot = activeUnit.GetBindingSlot(textureTarget); Bool isProxy = TextureImpl::IsProxyTextureTarget(textureUploadTarget); auto& textureObject = - isProxy ? TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget) + isProxy ? TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget) : bindingSlot.GetBoundObject(); if (!TextureImpl::ValidateTextureObject(textureObject)) return; @@ -875,7 +869,7 @@ namespace MobileGL::MG_Impl::GLImpl { auto& bindingSlot = activeUnit.GetBindingSlot(textureTarget); Bool isProxy = TextureImpl::IsProxyTextureTarget(textureUploadTarget); auto& textureObject = - isProxy ? TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget) + isProxy ? TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget) : bindingSlot.GetBoundObject(); if (!TextureImpl::ValidateTextureObject(textureObject)) return; @@ -967,7 +961,7 @@ namespace MobileGL::MG_Impl::GLImpl { auto& bindingSlot = activeUnit.GetBindingSlot(textureTarget); Bool isProxy = TextureImpl::IsProxyTextureTarget(textureUploadTarget); auto& textureObject = - isProxy ? TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget) + isProxy ? TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget) : bindingSlot.GetBoundObject(); if (!TextureImpl::ValidateTextureObject(textureObject)) return; @@ -1039,6 +1033,7 @@ namespace MobileGL::MG_Impl::GLImpl { "pname is not a valid texture level parameter.")); return; } + MGLOG_D("returned %u",*params); } void GetTexLevelParameterfv_State(GLenum target, GLint level, GLenum pname, GLfloat* params) { @@ -1056,7 +1051,7 @@ namespace MobileGL::MG_Impl::GLImpl { auto& bindingSlot = activeUnit.GetBindingSlot(textureTarget); Bool isProxy = TextureImpl::IsProxyTextureTarget(textureUploadTarget); auto& textureObject = - isProxy ? TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget) + isProxy ? TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget) : bindingSlot.GetBoundObject(); if (!TextureImpl::ValidateTextureObject(textureObject)) return; @@ -1395,7 +1390,7 @@ namespace MobileGL::MG_Impl::GLImpl { auto& bindingSlot = activeUnit.GetBindingSlot(textureTarget); Bool isProxy = TextureImpl::IsProxyTextureTarget(textureUploadTarget); auto& textureObject = - isProxy ? TextureImpl::pProxyTextureManager->CreateOrReplaceProxyTextureObject(textureUploadTarget) + isProxy ? TextureImpl::pProxyTextureManager->GetProxyTextureObject(textureUploadTarget) : bindingSlot.GetBoundObject(); if (!TextureImpl::ValidateTextureObject(textureObject)) {