Merge remote-tracking branch 'upstream/main' into DisableAtomShim

2021-04-23 18:35:18 -05:00
parent f750a491c8 4abe63e046
commit bc40dd7e5e
4379 changed files with 30092 additions and 39185 deletions
@@ -39,4 +39,4 @@ private:
    static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
 };

-#endif
+#endif
@@ -90,4 +90,4 @@ namespace Render
 } // namespace Render

 #endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
+#pragma once
@@ -685,4 +685,4 @@ Matrix44& SPostEffectsUtils::GetColorMatrix()
    return m_pColorMat;
 }

-////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -309,4 +309,4 @@ private:
    static CTexture* m_UpscaleTarget;
 };

-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
+#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
@@ -71,4 +71,4 @@ void AbstractMeshElement::DrawMeshWireframe()
    gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);

    gcpRendD3D->FX_SetState(nState);
-}
+}
@@ -47,4 +47,4 @@ void CREDeferredShading::mfReset()

 void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}
@@ -240,4 +240,4 @@ bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
    return true;
 }

-#endif
+#endif
@@ -47,4 +47,4 @@ void CREHDRProcess::mfReset()

 void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}
@@ -58,4 +58,4 @@ IOpticsElementBase*  COpticsFactory::Create(EFlareType type) const
    default:
        return NULL;
    }
-}
+}
@@ -74,4 +74,4 @@ public:
        static OpticsPredef instance;
        return &instance;
    }
-};
+};
@@ -850,4 +850,4 @@ EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, con
    }

    return state;
-}//-------------------------------------------------------------------------------------------------
+}//-------------------------------------------------------------------------------------------------
@@ -150,4 +150,4 @@ enum EPolygonInCircle2D

 EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);

-#endif // _POLYGON_MATH_2D_
+#endif // _POLYGON_MATH_2D_
@@ -285,4 +285,4 @@ void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
 #endif // !RELEASE

 #endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
+#endif // _SPATIAL_HASH_GRID_
@@ -19,4 +19,4 @@ FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
 FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
 FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
 FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
+FX_STATIC_FLAG(GLES3_0)
@@ -51,4 +51,4 @@ struct PerFrameParameters
    Vec4 m_VolumetricFogDistanceParams;
 };

-#endif // _PER_FRAME_RESOURCE_GROUP_
+#endif // _PER_FRAME_RESOURCE_GROUP_
@@ -228,4 +228,4 @@ void CPowerOf2BlockPacker::FreeContainers()
    Clear();
    stl::free_container(m_Blocks);
    stl::free_container(m_BlockBitmap);
-}
+}
@@ -43,4 +43,4 @@ void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit,
    {
        AZ_Assert(true, "Invalid eye provided for rendering");
    }
-}
+}
@@ -37,4 +37,4 @@ public:
    void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
    
    AZStd::vector<CTexture*> m_textures;
-};
+};
@@ -12,4 +12,4 @@
 // Original file Copyright Crytek GMBH or its affiliates, used under license.

 #include "RenderDll_precompiled.h"
- 
+
@@ -198,4 +198,4 @@ bool CRELensOptics::mfDraw(CShader* pShader, [[maybe_unused]] SShaderPass* pass)
 void CRELensOptics::ClearResources()
 {
    g_SoftOcclusionManager.ClearResources();
-}
+}
@@ -14,4 +14,4 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
-</Project>
+</Project>
@@ -14,4 +14,4 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
-</Project>
+</Project>
@@ -116,4 +116,4 @@ class D3DHMDRenderer
        EyeRenderTarget m_eyes[STEREO_EYE_COUNT];     ///< Device render targets to be rendered to and submitted to the HMD for display.

        bool m_framePrepared;       ///< If true, PrepareFrame() and SubmitFrame() were called in the proper ordering (just for debugging purproses).
-};
+};
@@ -53,4 +53,4 @@ namespace RenderCapabilities
    {
        return true;
    }
-}
+}
@@ -53,4 +53,4 @@ namespace RenderCapabilities
    {
        return true;
    }
-}
+}
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -43,4 +43,4 @@
 #       include <glad/glx.h>
 #       undef GLAD_GLX_IMPLEMENTATION
 #   endif
-#endif
+#endif
@@ -40,4 +40,4 @@ namespace NCryOpenGL
                                                                "{"
                                                                "   Output0 = texture(text0, VtxOutput0.xy);"
                                                                "}";
-}
+}
@@ -352,4 +352,4 @@ namespace NCryOpenGL
 };


-#endif //__GLFORMAT__
+#endif //__GLFORMAT__
@@ -1112,4 +1112,4 @@ CUSTOM_INSTRUMENT(Delete, glDeleteSamplers)
 CUSTOM_INSTRUMENT(Delete, glDeleteTransformFeedbacks)
 CUSTOM_INSTRUMENT(Delete, glDeleteProgramPipelines)

-#endif //__GLINSTRUMENT__
+#endif //__GLINSTRUMENT__
@@ -51,4 +51,4 @@ bool CCryDXGLBlendState::Apply(NCryOpenGL::CContext* pContext)
 void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -75,4 +75,4 @@ LPVOID CCryDXGLBlob::GetBufferPointer()
 SIZE_T CCryDXGLBlob::GetBufferSize()
 {
    return m_uBufferSize;
-}
+}
@@ -41,4 +41,4 @@ private:
    D3D11_BUFFER_DESC m_kDesc;
 };

-#endif //__CRYDXGLBUFFER__
+#endif //__CRYDXGLBUFFER__
@@ -50,4 +50,4 @@ bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryOpenGL::CCon
 void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -53,4 +53,4 @@ NCryOpenGL::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
 void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ protected:
    _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
 };

-#endif //__CRYDXGLDEPTHSTENCILVIEW__
+#endif //__CRYDXGLDEPTHSTENCILVIEW__
@@ -53,4 +53,4 @@ HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
    DXGL_TODO("Implement if required")
    * ppParent = NULL;
    return E_FAIL;
-}
+}
@@ -331,4 +331,4 @@ HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
 {
    DXGL_NOT_IMPLEMENTED
    return E_FAIL;
-}
+}
@@ -57,4 +57,4 @@ protected:
    DXGI_OUTPUT_DESC m_kDesc;
 };

-#endif //__CRYDXGLGIOUTPUT__
+#endif //__CRYDXGLGIOUTPUT__
@@ -34,4 +34,4 @@ CCryDXGLInputLayout::~CCryDXGLInputLayout()
 NCryOpenGL::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
 {
    return m_spGLLayout;
-}
+}
@@ -38,4 +38,4 @@ private:
    _smart_ptr<NCryOpenGL::SInputLayout> m_spGLLayout;
 };

-#endif //__CRYDXGLINPUTLAYOUT__
+#endif //__CRYDXGLINPUTLAYOUT__
@@ -55,4 +55,4 @@ UINT CCryDXGLQuery::GetDataSize(void)
 void CCryDXGLQuery::GetDesc(D3D11_QUERY_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -59,4 +59,4 @@ private:
    _smart_ptr<NCryOpenGL::SQuery> m_spGLQuery;
 };

-#endif //__CRYDXGLQUERY__
+#endif //__CRYDXGLQUERY__
@@ -44,4 +44,4 @@ protected:
    NCryOpenGL::SRasterizerState* m_pGLState;
 };

-#endif //__CRYDXGLRASTERIZERSTATE__
+#endif //__CRYDXGLRASTERIZERSTATE__
@@ -54,4 +54,4 @@ NCryOpenGL::SOutputMergerView* CCryDXGLRenderTargetView::GetGLView()
 void CCryDXGLRenderTargetView::GetDesc(D3D11_RENDER_TARGET_VIEW_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ private:
    _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
 };

-#endif //__CRYDXGLRENDERTARGETVIEW__
+#endif //__CRYDXGLRENDERTARGETVIEW__
@@ -49,4 +49,4 @@ UINT CCryDXGLResource::GetEvictionPriority(void)
 {
    DXGL_NOT_IMPLEMENTED
    return 0;
-}
+}
@@ -57,4 +57,4 @@ protected:
    D3D11_RESOURCE_DIMENSION m_eDimension;
 };

-#endif //__CRYDXGLRESOURCE__
+#endif //__CRYDXGLRESOURCE__
@@ -52,4 +52,4 @@ void CCryDXGLSamplerState::Apply(uint32 uStage, uint32 uSlot, NCryOpenGL::CConte
 void CCryDXGLSamplerState::GetDesc(D3D11_SAMPLER_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ protected:
    NCryOpenGL::SSamplerState* m_pGLState;
 };

-#endif //__CRYDXGLSAMPLERSTATE__
+#endif //__CRYDXGLSAMPLERSTATE__
@@ -31,4 +31,4 @@ CCryDXGLShader::~CCryDXGLShader()
 NCryOpenGL::SShader* CCryDXGLShader::GetGLShader()
 {
    return m_spGLShader.get();
-}
+}
@@ -114,4 +114,4 @@ public:
    }
 };

-#endif  //__CRYDXGLSHADER__
+#endif  //__CRYDXGLSHADER__
@@ -414,4 +414,4 @@ UINT CCryDXGLShaderReflection::GetThreadGroupSize(UINT* pSizeX, UINT* pSizeY, UI
 {
    DXGL_NOT_IMPLEMENTED
    return 0;
-}
+}
@@ -49,4 +49,4 @@ bool CCryDXGLShaderResourceView::Initialize(NCryOpenGL::CContext* pContext)
 void CCryDXGLShaderResourceView::GetDesc(D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -211,4 +211,4 @@ HRESULT CCryDXGLSwapChain::GetLastPresentCount(UINT* pLastPresentCount)
 {
    DXGL_NOT_IMPLEMENTED;
    return E_FAIL;
-}
+}
@@ -63,4 +63,4 @@ protected:
    DXGI_SWAP_CHAIN_DESC m_kDesc;
 };

-#endif //__CRYDXGLSWAPCHAIN__
+#endif //__CRYDXGLSWAPCHAIN__
@@ -44,4 +44,4 @@ BOOL CCryDXGLSwitchToRef::GetUseRef()
 {
    DXGL_NOT_IMPLEMENTED
    return false;
-}
+}
@@ -37,4 +37,4 @@ CCryDXGLTexture1D::~CCryDXGLTexture1D()
 void CCryDXGLTexture1D::GetDesc(D3D11_TEXTURE1D_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -46,4 +46,4 @@ private:
    D3D11_TEXTURE1D_DESC m_kDesc;
 };

-#endif //__CRYDXGLTEXTURE1D__
+#endif //__CRYDXGLTEXTURE1D__
@@ -37,4 +37,4 @@ CCryDXGLTexture2D::~CCryDXGLTexture2D()
 void CCryDXGLTexture2D::GetDesc(D3D11_TEXTURE2D_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -48,4 +48,4 @@ private:
    D3D11_TEXTURE2D_DESC m_kDesc;
 };

-#endif //__CRYDXGLTEXTURE2D__
+#endif //__CRYDXGLTEXTURE2D__
@@ -37,4 +37,4 @@ CCryDXGLTexture3D::~CCryDXGLTexture3D()
 void CCryDXGLTexture3D::GetDesc(D3D11_TEXTURE3D_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -46,4 +46,4 @@ private:
    D3D11_TEXTURE3D_DESC m_kDesc;
 };

-#endif //__CRYDXGLTEXTURE3D__
+#endif //__CRYDXGLTEXTURE3D__
@@ -34,4 +34,4 @@ public:
    NCryOpenGL::STexture* GetGLTexture();
 };

-#endif //__CRYDXGLTEXTUREBASE__
+#endif //__CRYDXGLTEXTUREBASE__
@@ -54,4 +54,4 @@ NCryOpenGL::SShaderView* CCryDXGLUnorderedAccessView::GetGLView()
 void CCryDXGLUnorderedAccessView::GetDesc(D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ protected:
    _smart_ptr<NCryOpenGL::SShaderView> m_spGLView;
 };

-#endif //__CRYDXGLUNORDEREDACCESSVIEW__
+#endif //__CRYDXGLUNORDEREDACCESSVIEW__
@@ -42,4 +42,4 @@ void CCryDXGLView::GetResource(ID3D11Resource** ppResource)
        m_spResource->AddRef();
    }
    CCryDXGLResource::ToInterface(ppResource, m_spResource);
-}
+}
@@ -180,4 +180,4 @@ namespace RenderCapabilities
    {
        return GetGLDevice()->GetFeatureSpec().m_kVersion.ToUint();
    }
-}
+}
@@ -124,4 +124,4 @@ set(SKIP_UNITY_BUILD_INCLUSION_FILES
    Implementation/GLBlitFramebufferHelper.cpp
    Implementation/GLShader.cpp
    Implementation/GLShader.hpp
-)
+)
@@ -1764,4 +1764,4 @@ struct ID3D11CommandList;
 //struct ID3D11Device;                          // Typedef as CCryDXGLDevice


-#endif // __DXGL_D3D11_h__
+#endif // __DXGL_D3D11_h__
@@ -134,4 +134,4 @@ typedef struct _D3D11_SHADER_INPUT_BIND_DESC
 } D3D11_SHADER_INPUT_BIND_DESC;


-#endif //__DXGL_D3D11Shader_h__
+#endif //__DXGL_D3D11Shader_h__
@@ -660,4 +660,4 @@ struct ID3DInclude
    virtual HRESULT STDMETHODCALLTYPE Open(LPCVOID pData) = 0;
 };

-#endif //__DXGL_D3DCommon_h__
+#endif //__DXGL_D3DCommon_h__
@@ -42,4 +42,4 @@
 #define D3DCOMPILE_RESERVED17                     (1 << 17)
 #define D3DCOMPILE_WARNINGS_ARE_ERRORS            (1 << 18)

-#endif //__DXGL_D3D11Compiler_h__
+#endif //__DXGL_D3D11Compiler_h__
@@ -25,4 +25,4 @@
 ////////////////////////////////////////////////////////////////////////////
 struct ID3DX11ThreadPump;

-#endif //__DXGL_D3DX11_h__
+#endif //__DXGL_D3DX11_h__
@@ -127,4 +127,4 @@ typedef struct _D3DX11_TEXTURE_LOAD_INFO
    UINT            MipFilter;
 } D3DX11_TEXTURE_LOAD_INFO;

-#endif //__DXGL_D3DX11tex_h__
+#endif //__DXGL_D3DX11tex_h__
@@ -196,4 +196,4 @@ struct IDXGISurface1;
 //struct IDXGIAdapter1;             // Typedef as CCryDXGLGIAdapter
 //struct IDXGIDevice1;              // Typedef as CCryDXGLDevice

-#endif //__DXGL_DXGI_h__
+#endif //__DXGL_DXGI_h__
@@ -221,4 +221,4 @@ struct ID3D11ShaderReflection

 #endif //DXGL_FULL_EMULATION

-#endif //__DXGL_D3D11Shader_h__
+#endif //__DXGL_D3D11Shader_h__
@@ -660,4 +660,4 @@ struct ID3DInclude
    virtual HRESULT STDMETHODCALLTYPE Open(LPCVOID pData) = 0;
 };

-#endif //__DXGL_D3DCommon_h__
+#endif //__DXGL_D3DCommon_h__
@@ -55,4 +55,4 @@ typedef HRESULT (WINAPI * pD3DCompile)
    ID3DBlob**                      ppCode,
    ID3DBlob**                      ppErrorMsgs);

-#endif //__DXGL_D3D11Compiler_h__
+#endif //__DXGL_D3D11Compiler_h__
@@ -25,4 +25,4 @@
 ////////////////////////////////////////////////////////////////////////////
 struct ID3DX11ThreadPump;

-#endif //__DXGL_D3DX11_h__
+#endif //__DXGL_D3DX11_h__
@@ -127,4 +127,4 @@ typedef struct _D3DX11_TEXTURE_LOAD_INFO
    UINT            MipFilter;
 } D3DX11_TEXTURE_LOAD_INFO;

-#endif //__DXGL_D3DX11tex_h__
+#endif //__DXGL_D3DX11tex_h__
@@ -280,4 +280,4 @@ struct IDXGIDevice1

 #endif //DXGL_FULL_EMULATION

-#endif //__DXGL_DXGI_h__
+#endif //__DXGL_DXGI_h__
@@ -20,4 +20,4 @@
 // Return -1 on failure and availabe VRAM otherwise
 long GetVRAMForDisplay(const int dspNum);

-#endif
+#endif
@@ -24,4 +24,4 @@ namespace NCryOpenGL
        SAutoLog g_kLog("DXGL.log");
        SAutoTLSSlot g_kCRCTable;
    }
-}
+}
@@ -194,4 +194,4 @@ namespace NCryOpenGL
    };
 }

-#endif //__GLCROSSPLATFORM__
+#endif //__GLCROSSPLATFORM__
@@ -127,4 +127,4 @@ namespace NCryOpenGL
    }
 }

-#endif //__GLWINPLATFORM__
+#endif //__GLWINPLATFORM__
@@ -51,4 +51,4 @@ bool CCryDXGLBlendState::Apply(NCryMetal::CContext* pContext)
 void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -75,4 +75,4 @@ LPVOID CCryDXGLBlob::GetBufferPointer()
 SIZE_T CCryDXGLBlob::GetBufferSize()
 {
    return m_uBufferSize;
-}
+}
@@ -41,4 +41,4 @@ private:
    D3D11_BUFFER_DESC m_kDesc;
 };

-#endif //__CRYMETALGLBUFFER__
+#endif //__CRYMETALGLBUFFER__
@@ -62,4 +62,4 @@ bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryMetal::CCont
 void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -53,4 +53,4 @@ NCryMetal::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
 void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ protected:
    _smart_ptr<NCryMetal::SOutputMergerView> m_spGLView;
 };

-#endif //__CRYMETALGLDEPTHSTENCILVIEW__
+#endif //__CRYMETALGLDEPTHSTENCILVIEW__
@@ -131,4 +131,4 @@ BOOL CCryDXGLGIFactory::IsCurrent()
 {
    DXGL_NOT_IMPLEMENTED
    return false;
-}
+}
@@ -53,4 +53,4 @@ HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
    DXGL_TODO("Implement if required")
    * ppParent = NULL;
    return E_FAIL;
-}
+}
@@ -108,4 +108,4 @@ HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
 {
    DXGL_NOT_IMPLEMENTED
    return E_FAIL;
-}
+}
@@ -48,4 +48,4 @@ protected:
    DXGI_OUTPUT_DESC m_OutputDesc;
 };

-#endif //__CRYMETALGLGIOUTPUT__
+#endif //__CRYMETALGLGIOUTPUT__
@@ -33,4 +33,4 @@ CCryDXGLInputLayout::~CCryDXGLInputLayout()
 NCryMetal::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
 {
    return m_spGLLayout;
-}
+}
@@ -38,4 +38,4 @@ private:
    _smart_ptr<NCryMetal::SInputLayout> m_spGLLayout;
 };

-#endif //__CRYMETALGLINPUTLAYOUT__
+#endif //__CRYMETALGLINPUTLAYOUT__
--- a/Show More
+++ b/Show More