Clean unused code in WebXRDisplayProvider

Author: De-Panther

Packages/webxr/Runtime/Plugins/WebGL/WebXRDisplayProvider.cpp

@@ -4,7 +4,6 @@
 #include "WebXRProviderContext.h"
 #include <cmath>
 #include <vector>
-#include <stdio.h>
 
 #define SIDE_BY_SIDE 1
 #define NUM_RENDER_PASSES 2
@@ -40,7 +39,6 @@ class WebXRDisplayProvider : ProviderImpl
     UnitySubsystemErrorCode GfxThread_Stop();
     UnitySubsystemErrorCode GfxThread_FinalBlitToGameViewBackBuffer(const UnityXRMirrorViewBlitInfo* mirrorBlitInfo, WebXRProviderContext& ctx);
 
-    UnitySubsystemErrorCode QueryMirrorViewBlitDesc(const UnityXRMirrorViewBlitInfo* mirrorRtDesc, UnityXRMirrorViewBlitDesc* blitDescriptor, WebXRProviderContext& ctx);
     UnitySubsystemErrorCode UpdateDisplayState(UnityXRDisplayState* state);
 
     void Stop() override;
@@ -54,9 +52,7 @@ class WebXRDisplayProvider : ProviderImpl
     UnityXRProjection GetProjection(int pass);
 
 private:
-    //std::vector<void*> m_NativeTextures;
     std::vector<UnityXRRenderTextureId> m_UnityTextures;
-    std::vector<UnityXRVector2> m_UnityTexturesSizes;
     float *m_ViewsDataArray;
     float viewWidth;
     float viewHeight;
@@ -78,7 +74,6 @@ UnitySubsystemErrorCode WebXRDisplayProvider::Start()
     viewHeight = *(m_ViewsDataArray + 47);
     frameBufferWidth = *(m_ViewsDataArray + 56);
     frameBufferHeight = *(m_ViewsDataArray + 57);
-    printf("Start %f, %f\n", frameBufferWidth, frameBufferHeight);
     hasMultipleViews = *(m_ViewsDataArray + 54) > 1;
     if (hasMultipleViews)
     {
@@ -278,9 +273,7 @@ void WebXRDisplayProvider::CreateTextures(int numTextures, int textureArrayLengt
     const int texWidth = (int)(SIDE_BY_SIDE ? frameBufferWidth : viewWidth);
     const int texHeight = (int)(SIDE_BY_SIDE ? frameBufferHeight : viewHeight);
 
-    //m_NativeTextures.resize(numTextures);
     m_UnityTextures.resize(numTextures);
-    m_UnityTexturesSizes.resize(numTextures);
 
     // Tell unity about the native textures, getting back UnityXRRenderTextureIds.
     for (int i = 0; i < numTextures; ++i)
@@ -295,14 +288,11 @@ void WebXRDisplayProvider::CreateTextures(int numTextures, int textureArrayLengt
 
         // Create an UnityXRRenderTextureId for the native texture so we can tell unity to render to it later.
         UnityXRRenderTextureId uTexId;
-        printf("CreateTexture\n");
         m_Ctx.display->CreateTexture(m_Handle, &uDesc, &uTexId);
         UnityXRVector2 size;
         size.x = texWidth;
         size.x = texHeight;
         m_UnityTextures[i] = uTexId;
-        m_UnityTexturesSizes[i] = size;
-        printf("uTexId %d\n", uTexId);
     }
 }
 
@@ -317,8 +307,6 @@ void WebXRDisplayProvider::DestroyTextures()
     }
 
     m_UnityTextures.clear();
-    m_UnityTexturesSizes.clear();
-    //m_NativeTextures.clear();
 }
 
 UnityXRPose WebXRDisplayProvider::GetPose(int pass)
@@ -351,63 +339,14 @@ UnityXRProjection WebXRDisplayProvider::GetProjection(int pass)
     ret.data.matrix.columns[2].x = *(m_ViewsDataArray + start + 8);
     ret.data.matrix.columns[2].y = *(m_ViewsDataArray + start + 9);
     ret.data.matrix.columns[2].z = *(m_ViewsDataArray + start + 10);
-    ret.data.matrix.columns[2].w = *(m_ViewsDataArray + start + 11); // should replace with 14?
+    ret.data.matrix.columns[2].w = *(m_ViewsDataArray + start + 11);
     ret.data.matrix.columns[3].x = *(m_ViewsDataArray + start + 12);
     ret.data.matrix.columns[3].y = *(m_ViewsDataArray + start + 13);
-    ret.data.matrix.columns[3].z = *(m_ViewsDataArray + start + 14); // should replace with 11?
+    ret.data.matrix.columns[3].z = *(m_ViewsDataArray + start + 14);
     ret.data.matrix.columns[3].w = *(m_ViewsDataArray + start + 15);
     return ret;
 }
 
-UnitySubsystemErrorCode WebXRDisplayProvider::QueryMirrorViewBlitDesc(const UnityXRMirrorViewBlitInfo* mirrorBlitInfo, UnityXRMirrorViewBlitDesc* blitDescriptor, WebXRProviderContext& ctx)
-{
-    if (ctx.displayProvider->m_UnityTextures.size() == 0)
-    {
-        // Eye texture is not available yet, return failure
-        return UnitySubsystemErrorCode::kUnitySubsystemErrorCodeFailure;
-    }
-    int srcTexId = ctx.displayProvider->m_UnityTextures[0];
-    const UnityXRVector2 sourceTextureSize = {static_cast<float>(m_UnityTexturesSizes[0].x), static_cast<float>(m_UnityTexturesSizes[0].y)};
-    const UnityXRRectf sourceUVRect = {0.0f, 0.0f, 1.0f, 1.0f};
-    const UnityXRVector2 destTextureSize = {static_cast<float>(mirrorBlitInfo->mirrorRtDesc->rtScaledWidth), static_cast<float>(mirrorBlitInfo->mirrorRtDesc->rtScaledHeight)};
-    const UnityXRRectf destUVRect = {0.0f, 0.0f, 1.0f, 1.0f};
-
-    // By default, The source rect will be adjust so that it matches the dest rect aspect ratio.
-    // This has the visual effect of expanding the source image, resulting in cropping
-    // along the non-fitting axis. In this mode, the destination rect will be completely
-    // filled, but not all the source image may be visible.
-    UnityXRVector2 sourceUV0, sourceUV1, destUV0, destUV1;
-
-    float sourceAspect = (sourceTextureSize.x * sourceUVRect.width) / (sourceTextureSize.y * sourceUVRect.height);
-    float destAspect = (destTextureSize.x * destUVRect.width) / (destTextureSize.y * destUVRect.height);
-    float ratio = sourceAspect / destAspect;
-    UnityXRVector2 sourceUVCenter = {sourceUVRect.x + sourceUVRect.width * 0.5f, sourceUVRect.y + sourceUVRect.height * 0.5f};
-    UnityXRVector2 sourceUVSize = {sourceUVRect.width, sourceUVRect.height};
-    UnityXRVector2 destUVCenter = {destUVRect.x + destUVRect.width * 0.5f, destUVRect.y + destUVRect.height * 0.5f};
-    UnityXRVector2 destUVSize = {destUVRect.width, destUVRect.height};
-
-    if (ratio > 1.0f)
-    {
-        sourceUVSize.x /= ratio;
-    }
-    else
-    {
-        sourceUVSize.y *= ratio;
-    }
-
-    sourceUV0 = {sourceUVCenter.x - (sourceUVSize.x * 0.5f), sourceUVCenter.y - (sourceUVSize.y * 0.5f)};
-    sourceUV1 = {sourceUV0.x + sourceUVSize.x, sourceUV0.y + sourceUVSize.y};
-    destUV0 = {destUVCenter.x - destUVSize.x * 0.5f, destUVCenter.y - destUVSize.y * 0.5f};
-    destUV1 = {destUV0.x + destUVSize.x, destUV0.y + destUVSize.y};
-
-    (*blitDescriptor).blitParamsCount = 1;
-    (*blitDescriptor).blitParams[0].srcTexId = srcTexId;
-    (*blitDescriptor).blitParams[0].srcTexArraySlice = 0;
-    (*blitDescriptor).blitParams[0].srcRect = {sourceUV0.x, sourceUV0.y, sourceUV1.x - sourceUV0.x, sourceUV1.y - sourceUV0.y};
-    (*blitDescriptor).blitParams[0].destRect = {destUV0.x, destUV0.y, destUV1.x - destUV0.x, destUV1.y - destUV0.y};
-    return kUnitySubsystemErrorCodeSuccess;
-}
-
 UnitySubsystemErrorCode WebXRDisplayProvider::UpdateDisplayState(UnityXRDisplayState * state)
 {
     state->displayIsTransparent = transparentBackground;
@@ -454,10 +393,6 @@ static UnitySubsystemErrorCode UNITY_INTERFACE_API Display_Initialize(UnitySubsy
     ctx.display->RegisterProviderForGraphicsThread(handle, &gfxThreadProvider);
 
     UnityXRDisplayProvider provider{&ctx, NULL, NULL};
-    //provider.QueryMirrorViewBlitDesc = [](UnitySubsystemHandle handle, void* userData, const UnityXRMirrorViewBlitInfo mirrorBlitInfo, UnityXRMirrorViewBlitDesc* blitDescriptor) -> UnitySubsystemErrorCode {
-    //    auto& ctx = GetWebXRProviderContext(userData);
-    //    return ctx.displayProvider->QueryMirrorViewBlitDesc(&mirrorBlitInfo, blitDescriptor, ctx);
-    //};
 
     provider.UpdateDisplayState = [](UnitySubsystemHandle handle, void* userData, UnityXRDisplayState* state) -> UnitySubsystemErrorCode {
         auto& ctx = GetWebXRProviderContext(userData);