birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/RenderDll/Common/RenderThread.cpp
+2
View File
@@ -711,6 +711,7 @@ bool SRenderThread::RC_CreateDeviceTexture(CTexture* pTex, const byte* pData[6])
return pTex->RT_CreateDeviceTexture(pData);
}
#if !defined(MULTITHREADED_RESOURCE_CREATION)
if (pTex->IsAsyncDevTexCreation())
{
return !IsFailed();
@@ -727,6 +728,7 @@ bool SRenderThread::RC_CreateDeviceTexture(CTexture* pTex, const byte* pData[6])
FlushAndWait();
return !IsFailed();
#endif
}
void SRenderThread::RC_CopyDataToTexture(
Code/CryEngine/RenderDll/Common/RendererDefs.h
+1 -1
View File
@@ -229,7 +229,7 @@ namespace detail
#if defined(OPENGL) && (defined(DEBUG) || defined(_DEBUG))
#define LY_ENABLE_OPENGL_ERROR_CHECKING
#endif
namespace Lumberyard
namespace O3de
{
namespace OpenGL
{
Code/CryEngine/RenderDll/Common/Shaders/ShaderCache.cpp
-3
View File
@@ -776,9 +776,6 @@ static bool sIterateDL(DWORD& dwDL)
else
{
return false;
nLights = 2;
nType[0] = SLMF_DIRECT;
nType[1] = SLMF_POINT;
}
break;
case 2:
Code/CryEngine/RenderDll/Common/Shaders/ShaderTemplate.cpp
-1
View File
@@ -771,7 +771,6 @@ const char* CShaderMan::mfTemplateTexIdToName(int Id)
default:
return "Unknown";
}
return "Unknown";
}
CTexAnim* CShaderMan::mfReadTexSequence(const char* na, int Flags, [[maybe_unused]] bool bFindOnly)
Code/CryEngine/RenderDll/XRenderD3D9/CryRenderD3D11.rc
+1 -1
View File
@@ -47,7 +47,7 @@ BEGIN
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "FileDescription", "CryRenderD3D11"
VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
VALUE "ProductName", "Lumberyard"
VALUE "ProductName", "Open 3D Engine"
VALUE "ProductVersion", "1, 0, 0, 1"
END
END
Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.rc
+1 -1
View File
@@ -47,7 +47,7 @@ BEGIN
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "FileDescription", "CryRenderGL"
VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
VALUE "ProductName", "Lumberyard"
VALUE "ProductName", "Open 3D Engine"
VALUE "ProductVersion", "1, 0, 0, 1"
END
END
Code/CryEngine/RenderDll/XRenderD3D9/D3DFXPipeline.cpp
-1
View File
@@ -2909,7 +2909,6 @@ byte CD3D9Renderer::FX_StartQuery(SRendItem* pRI)
return 0;
}
#endif
return 0;
}
void CD3D9Renderer::FX_EndQuery(SRendItem* pRI, byte bStartQ)
Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLContext.cpp
+2 -2
View File
@@ -3641,7 +3641,7 @@ case _D3DValue: \
glDrawElements(m_ePrimitiveTopologyMode, uIndexCount, m_eIndexType, pvOffset);
#endif
Lumberyard::OpenGL::CheckError();
O3de::OpenGL::CheckError();
END_TRACE();
}
@@ -3662,7 +3662,7 @@ case _D3DValue: \
CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
glDrawArrays(m_ePrimitiveTopologyMode, uStartVertexLocation, uVertexCount);
Lumberyard::OpenGL::CheckError();
O3de::OpenGL::CheckError();
END_TRACE();
}
Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLDevice.cpp
+6 -6
View File
@@ -2422,7 +2422,7 @@ namespace NCryOpenGL
return false;
}
Lumberyard::OpenGL::ClearErrors();
O3de::OpenGL::ClearErrors();
GLint major = 0, minor = 0;
glGetIntegerv(GL_MAJOR_VERSION, &major);
glGetIntegerv(GL_MINOR_VERSION, &minor);
@@ -2431,7 +2431,7 @@ namespace NCryOpenGL
pAdapter->m_sVersion.m_uMajorVersion = static_cast<uint32>(major);
pAdapter->m_sVersion.m_uMinorVersion = static_cast<uint32>(minor);
return Lumberyard::OpenGL::CheckError() == GL_NO_ERROR;
return O3de::OpenGL::CheckError() == GL_NO_ERROR;
}
bool ParseExtensions(SAdapterPtr& pAdapter)
@@ -2443,7 +2443,7 @@ namespace NCryOpenGL
int num = 0, index;
bool result = true;
Lumberyard::OpenGL::ClearErrors();
O3de::OpenGL::ClearErrors();
glGetIntegerv(GL_NUM_EXTENSIONS, &num);
for (index = 0; index < num; ++index)
{
@@ -2458,7 +2458,7 @@ namespace NCryOpenGL
pAdapter->AddExtension(extension);
}
return result && Lumberyard::OpenGL::CheckError() == GL_NO_ERROR;
return result && O3de::OpenGL::CheckError() == GL_NO_ERROR;
}
bool DetectAdapters(std::vector<SAdapterPtr>& kAdapters)
@@ -2971,7 +2971,7 @@ namespace NCryOpenGL
#endif //DXGL_CHECK_ERRORS
} // namespace NCryOpenGL
namespace Lumberyard
namespace O3de
{
namespace OpenGL
{
@@ -2994,4 +2994,4 @@ namespace Lumberyard
}
#endif
} // namespace OpenGL
} // namespace Lumberyard
} // namespace O3de
Code/CryEngine/RenderDll/XRenderD3D9/DriverD3D.cpp
+4 -6
View File
@@ -4914,7 +4914,6 @@ bool CD3D9Renderer::ScreenShotInternal([[maybe_unused]] const char* filename, [[
// ignore invalid file access for screenshots
CDebugAllowFileAccess ignoreInvalidFileAccess;
bool bRet = true;
#if !defined(_RELEASE) || defined(WIN32) || defined(WIN64) || defined(ENABLE_LW_PROFILERS)
if (m_pRT && !m_pRT->IsRenderThread())
{
@@ -5041,8 +5040,11 @@ bool CD3D9Renderer::ScreenShotInternal([[maybe_unused]] const char* filename, [[
return CaptureFrameBufferToFile(path);
#else
return true;
#endif//_RELEASE
return bRet;
}
bool CD3D9Renderer::ScreenShot(const char* filename, int iPreWidth)
@@ -5656,8 +5658,6 @@ bool CD3D9Renderer::CaptureFrameBufferFast([[maybe_unused]] unsigned char* pDstR
}
SAFE_RELEASE(pSourceTexture);
return bStatus;
#endif
return bStatus;
@@ -5710,8 +5710,6 @@ bool CD3D9Renderer::CopyFrameBufferFast([[maybe_unused]] unsigned char* pDstRGBA
GetDeviceContext().Unmap(pCopyTexture, 0);
bStatus = true;
}
return bStatus;
#endif
return bStatus;
Code/CryEngine/RenderDll/XRenderD3D9/GPUTimer.cpp
+3 -2
View File
@@ -105,8 +105,9 @@ bool CD3DProfilingGPUTimer::Init()
{
#ifdef ENABLE_PROFILING_GPU_TIMERS
return CD3DGPUTimer::Init();
#endif
#else
return false;
#endif
}
CD3DGPUTimer::CD3DGPUTimer()
@@ -264,4 +265,4 @@ bool CD3DGPUTimer::Init()
#endif
return m_bInitialized;
}
}
Code/CryEngine/RenderDll/XRenderD3D9/MultiLayerAlphaBlendPass.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ bool MultiLayerAlphaBlendPass::IsSupported()
}
#else
m_supported = SupportLevel::NOT_SUPPORTED;
AZ_Warning("Rendering", false, "Multi-Layer Alpha Blending requires Lumberyard to have been built with the Windows 10 SDK or higher.");
AZ_Warning("Rendering", false, "Multi-Layer Alpha Blending requires Open 3D Engine to have been built with the Windows 10 SDK or higher.");
#endif
}
Code/CryEngine/RenderDll/XRenderNULL/CryRenderNULL.rc
+1 -1
View File
@@ -84,7 +84,7 @@ BEGIN
VALUE "CompanyName", "Amazon.com, Inc."
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
VALUE "ProductName", "Lumberyard"
VALUE "ProductName", "Open 3D Engine"
VALUE "ProductVersion", "1, 0, 0, 1"
END
END