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/Cry3DEngine/3dEngine.cpp
+3 -1
View File
@@ -1675,9 +1675,11 @@ bool C3DEngine::IsTessellationAllowedForShadowMap(const SRenderingPassInfo& pass
default:
return false;
}
#endif //#ifdef MESH_TESSELLATION_ENGINE
#else
return false;
#endif //#ifdef MESH_TESSELLATION_ENGINE
}
void C3DEngine::SetPhysMaterialEnumerator(IPhysMaterialEnumerator* pPhysMaterialEnumerator)
Code/CryEngine/Cry3DEngine/CZBufferCuller.cpp
+1 -5
View File
@@ -127,10 +127,6 @@ bool CZBufferCuller::IsBoxVisible(const AABB& objBox, [[maybe_unused]] uint32* c
return Rasterize<2>(Verts, 8);
}
return Rasterize<0>(Verts, 8);
++m_ObjectsTestedAndRejected;
return false;
}
static int sh = 8;
@@ -197,4 +193,4 @@ void CZBufferCuller::GetMemoryUsage(ICrySizer* pSizer) const
{
SIZER_COMPONENT_NAME(pSizer, "CoverageBuffer");
pSizer->AddObject(m_ZBuffer, sizeof(TZBZexel) * m_SizeX * m_SizeY);
}
}
Code/CryEngine/Cry3DEngine/CZBufferCuller.h
+16 -4
View File
@@ -97,7 +97,10 @@ protected:
{
return true;
}
MinX = 0;
else
{
MinX = 0;
}
}
if (MaxX > m_SizeX)
{
@@ -105,7 +108,10 @@ protected:
{
return true;
}
MaxX = m_SizeX;
else
{
MaxX = m_SizeX;
}
}
if (MinY < 0)
{
@@ -113,7 +119,10 @@ protected:
{
return true;
}
MinY = 0;
else
{
MinY = 0;
}
}
if (MaxY > m_SizeY)
{
@@ -121,7 +130,10 @@ protected:
{
return true;
}
MaxY = m_SizeY;
else
{
MaxY = m_SizeY;
}
}
if constexpr (ROTATE == 2)
{
Code/CryEngine/Cry3DEngine/MaterialHelpers.cpp
-1
View File
@@ -844,7 +844,6 @@ void MaterialHelpers::MigrateXmlLegacyData(SInputShaderResources& pShaderResourc
CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "Material %s has had legacy GlowAmount automatically converted to Emissive Intensity. The material parameters related to Emittance should be manually adjusted for this material.", materialName.c_str());
}
// In Lumberyard version 1.9 BlendLayer2Specular became a color instead of a single float, so it needs to be updated
XmlNodeRef publicParamsNode = node->findChild("PublicParams");
if (publicParamsNode && publicParamsNode->haveAttr("BlendLayer2Specular"))
{
Code/CryEngine/Cry3DEngine/TimeOfDay.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ CTimeOfDay::CTimeOfDay()
// fill local var list so, sandbox can access var list without level being loaded
// Cryengine supports the notion of environment presets which are set in code that is currently not
// in lumberyard. Therefore, create a default preset here that is used as the only one.
// in Open 3D Engine. Therefore, create a default preset here that is used as the only one.
m_defaultPreset = new CEnvironmentPreset;
for (int i = 0; i < PARAM_TOTAL; ++i)
{
Code/CryEngine/CryCommon/CryAssert_impl.h
+1 -1
View File
@@ -323,7 +323,7 @@ void CryAssertTrace(const char* _pszFormat, ...)
//-----------------------------------------------------------------------------------------------------
static const char* gs_strRegSubKey = "Software\\Amazon\\Lumberyard\\AssertWindow";
static const char* gs_strRegSubKey = "Software\\O3DE\\AssertWindow";
static const char* gs_strRegXValue = "AssertInfoX";
static const char* gs_strRegYValue = "AssertInfoY";
Code/CryEngine/CryCommon/EngineSettingsBackendWin32.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#define REG_SOFTWARE L"Software\\"
#define REG_COMPANY_NAME L"Amazon\\"
#define REG_PRODUCT_NAME L"Lumberyard\\"
#define REG_PRODUCT_NAME L"Open 3D Engine\\"
#define REG_SETTING L"Settings\\"
#define REG_BASE_SETTING_KEY REG_SOFTWARE REG_COMPANY_NAME REG_PRODUCT_NAME REG_SETTING
@@ -181,7 +181,7 @@ bool CEngineSettingsBackendWin32::SetModuleSpecificBoolEntry(const char* key, co
bool CEngineSettingsBackendWin32::GetInstalledBuildRootPathUtf16(const int index, CWCharBuffer name, CWCharBuffer path)
{
RegKey key(REG_BASE_SETTING_KEY L"LumberyardExport\\ProjectBuilds", false);
RegKey key(REG_BASE_SETTING_KEY L"O3DEExport\\ProjectBuilds", false);
if (key.pKey)
{
DWORD type;
Code/CryEngine/CryCommon/HMDBus.h
+1 -1
View File
@@ -61,7 +61,7 @@ namespace AZ
///
/// Attempt to initialize this device. If initialization is initially successful (device exists and is able to startup) then this device should connect to the
/// HMDDeviceRequestBus in order to be used as an HMD from the main Lumberyard system.
/// HMDDeviceRequestBus in order to be used as an HMD from the main Open 3D Engine system.
///
/// @return If true, initialization fully succeeded.
///
Code/CryEngine/CryCommon/ISystem.h
+1 -1
View File
@@ -1470,7 +1470,7 @@ struct ISystem
virtual int GetApplicationInstance() = 0;
// Summary:
// Get log index of the currently running lumberyard application. (0 = first instance, 1 = second instance, etc)
// Get log index of the currently running Open 3D Engine application. (0 = first instance, 1 = second instance, etc)
virtual int GetApplicationLogInstance(const char* logFilePath) = 0;
// Summary:
Code/CryEngine/CryFont/FFont.cpp
+4 -1
View File
@@ -111,7 +111,10 @@ int32 CFFont::Release()
m_pCryFont = nullptr;
}
gEnv->pRenderer->DeleteFont(this);
if (gEnv->pRenderer)
{
gEnv->pRenderer->DeleteFont(this);
}
return 0;
}
return nRef;
Code/CryEngine/CrySystem/CrashHandler.rc
+1 -1
View File
@@ -85,7 +85,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Save",IDB_CONFIRM_SAVE,4,96,68,20
PUSHBUTTON "Cancel",IDB_DONT_SAVE,206,96,68,20
LTEXT "Lumberyard has encountered an error and needs to close.\n\nA backup has been saved to the '_savebackup' subfolder.\n\nIf you are unable to save your file, you can recover by copying the contents of the _savebackup folder over the broken files.",IDC_STATIC,60,8,210,61
LTEXT "Open 3D Engine has encountered an error and needs to close.\n\nA backup has been saved to the '_savebackup' subfolder.\n\nIf you are unable to save your file, you can recover by copying the contents of the _savebackup folder over the broken files.",IDC_STATIC,60,8,210,61
LTEXT "Attempt save?",IDC_STATIC,60,72,180,21
CONTROL 128,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,8,8,48,40
END
Code/CryEngine/CrySystem/CryDLMalloc.c
+16
View File
@@ -4871,7 +4871,9 @@ static void* tmalloc_small(mstate m, size_t nb)
}
CORRUPTION_ERROR_ACTION(m);
#if PROCEED_ON_ERROR
return 0;
#endif
}
/* --------------------------- realloc support --------------------------- */
@@ -4930,7 +4932,9 @@ static void* internal_realloc(mstate m, void* oldmem, size_t bytes)
{
USAGE_ERROR_ACTION(m, oldmem);
POSTACTION(m);
#if PROCEED_ON_ERROR
return 0;
#endif
}
#if DEBUG
if (newp != 0)
@@ -5884,7 +5888,9 @@ void* mspace_malloc(mspace msp, size_t bytes)
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
if (!PREACTION(ms))
{
@@ -6150,7 +6156,9 @@ void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size)
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
if (n_elements != 0)
{
@@ -6193,7 +6201,9 @@ void* mspace_realloc(mspace msp, void* oldmem, size_t bytes)
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
return internal_realloc(ms, oldmem, bytes);
}
@@ -6205,7 +6215,9 @@ void* mspace_memalign(mspace msp, size_t alignment, size_t bytes)
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
return internal_memalign(ms, alignment, bytes);
}
@@ -6218,7 +6230,9 @@ void** mspace_independent_calloc(mspace msp, size_t n_elements,
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
return ialloc(ms, n_elements, &sz, 3, chunks);
}
@@ -6230,7 +6244,9 @@ void** mspace_independent_comalloc(mspace msp, size_t n_elements,
if (!ok_magic(ms))
{
USAGE_ERROR_ACTION(ms, ms);
#if PROCEED_ON_ERROR
return 0;
#endif
}
return ialloc(ms, n_elements, sizes, 0, chunks);
}
Code/CryEngine/CrySystem/IDebugCallStack.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ void IDebugCallStack::FatalError(const char* description)
bShowDebugScreen = bShowDebugScreen && gEnv->mMainThreadId == CryGetCurrentThreadId();
if (bShowDebugScreen)
{
EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Lumberyard Fatal Error", description, false);
EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Open 3D Engine Fatal Error", description, false);
}
#endif
Code/CryEngine/CrySystem/MemoryManager.cpp
+14 -6
View File
@@ -98,14 +98,18 @@ bool CCryMemoryManager::GetProcessMemInfo(SProcessMemInfo& minfo)
}
return false;
#else
#define AZ_RESTRICTED_SECTION_IMPLEMENTED
#elif defined(AZ_RESTRICTED_PLATFORM)
#define AZ_RESTRICTED_SECTION MEMORYMANAGER_CPP_SECTION_1
#include AZ_RESTRICTED_FILE(MemoryManager_cpp)
#if defined(AZ_RESTRICTED_PLATFORM)
#define AZ_RESTRICTED_SECTION MEMORYMANAGER_CPP_SECTION_1
#include AZ_RESTRICTED_FILE(MemoryManager_cpp)
#endif
bool retVal = true;
#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
#elif defined(LINUX)
MEMORYSTATUS MemoryStatus;
@@ -143,11 +147,15 @@ bool CCryMemoryManager::GetProcessMemInfo(SProcessMemInfo& minfo)
return false;
}
minfo.WorkingSetSize = kTaskInfo.resident_size;
#else
return false;
retVal = false;
#endif
return true;
return retVal;
#endif
}
//////////////////////////////////////////////////////////////////////////
Code/CryEngine/CrySystem/System.cpp
+1 -11
View File
@@ -1451,20 +1451,12 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
//bool bPause = false;
bool bNoUpdate = false;
#ifndef EXCLUDE_UPDATE_ON_CONSOLE
//check what is the current process
IProcess* pProcess = GetIProcess();
if (!pProcess)
{
return (true); //should never happen
}
if (m_sysNoUpdate && m_sysNoUpdate->GetIVal())
{
bNoUpdate = true;
updateFlags = ESYSUPDATE_IGNORE_PHYSICS;
}
//if ((pProcess->GetFlags() & PROC_MENU) || (m_sysNoUpdate && m_sysNoUpdate->GetIVal()))
// bPause = true;
m_bNoUpdate = bNoUpdate;
#endif //EXCLUDE_UPDATE_ON_CONSOLE
@@ -1537,7 +1529,7 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
}
//////////////////////////////////////////////////////////////////////////
if (m_env.pRenderer->GetIStereoRenderer()->IsRenderingToHMD())
if (m_env.pRenderer && m_env.pRenderer->GetIStereoRenderer()->IsRenderingToHMD())
{
EBUS_EVENT(AZ::VR::HMDDeviceRequestBus, UpdateInternalState);
}
@@ -2860,8 +2852,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam
default:
return false;
}
return true;
}
#endif
Code/CryEngine/CrySystem/SystemInit.cpp
+5 -5
View File
@@ -248,7 +248,7 @@ CUNIXConsole* pUnixConsole;
#define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
#define LOAD_LEGACY_RENDERER_FOR_EDITOR true // If you set this to false you must for now also set 'ed_useAtomNativeViewport' to true (see /Code/Sandbox/Editor/ViewManager.cpp)
#define LOAD_LEGACY_RENDERER_FOR_LAUNCHER true
#define LOAD_LEGACY_RENDERER_FOR_LAUNCHER false
//////////////////////////////////////////////////////////////////////////
// Where possible, these are defaults used to initialize cvars
@@ -1256,7 +1256,7 @@ bool CSystem::OpenRenderLibrary(int type, const SSystemInitParams& initParams)
if (allowPrompts)
{
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Asking user if they wish to continue...");
const int mbRes = MessageBoxW(0, GetErrorStringUnsupportedGPU(gpuName, gpuVendorId, gpuDeviceId).c_str(), L"Lumberyard", MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2 | MB_DEFAULT_DESKTOP_ONLY);
const int mbRes = MessageBoxW(0, GetErrorStringUnsupportedGPU(gpuName, gpuVendorId, gpuDeviceId).c_str(), L"Open 3D Engine", MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2 | MB_DEFAULT_DESKTOP_ONLY);
if (mbRes == IDCANCEL)
{
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "User chose to cancel startup due to unsupported GPU.");
@@ -2093,7 +2093,7 @@ static bool CheckCPURequirements([[maybe_unused]] CCpuFeatures* pCpu, [[maybe_un
if (allowPrompts)
{
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Asking user if they wish to continue...");
const int mbRes = MessageBoxW(0, GetErrorStringUnsupportedCPU().c_str(), L"Lumberyard", MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2 | MB_DEFAULT_DESKTOP_ONLY);
const int mbRes = MessageBoxW(0, GetErrorStringUnsupportedCPU().c_str(), L"Open 3D Engine", MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2 | MB_DEFAULT_DESKTOP_ONLY);
if (mbRes == IDCANCEL)
{
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "User chose to cancel startup.");
@@ -2305,7 +2305,7 @@ AZ_POP_DISABLE_WARNING
if (!bIsWindowsXPorLater)
{
AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Lumberyard requires an OS version of Windows XP or later.");
AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Open 3D Engine requires an OS version of Windows XP or later.");
return false;
}
}
@@ -2420,7 +2420,7 @@ AZ_POP_DISABLE_WARNING
azstrcpy(
headerString,
AZ_ARRAY_SIZE(headerString),
"Lumberyard - "
"Open 3D Engine - "
#if defined(LINUX)
"Linux "
#elif defined(MAC)
Code/CryEngine/CrySystem/SystemRender.cpp
+1 -1
View File
@@ -626,7 +626,7 @@ void CSystem::RenderStats()
float nTextPosX = 101 - 20, nTextPosY = -2, nTextStepY = 3;
m_env.p3DEngine->DisplayInfo(nTextPosX, nTextPosY, nTextStepY, iDisplayInfo != 1);
// Dump Lumberyard CPU and GPU memory statistics to screen
// Dump Open 3D Engine CPU and GPU memory statistics to screen
m_env.p3DEngine->DisplayMemoryStatistics();
#if defined(ENABLE_LW_PROFILERS)
Code/CryEngine/CrySystem/SystemWin32.cpp
+1 -1
View File
@@ -1091,7 +1091,7 @@ void CSystem::FatalError(const char* format, ...)
{
::ShowWindow((HWND)gEnv->pRenderer->GetHWND(), SW_MINIMIZE);
}
::MessageBox(NULL, szBuffer, "Lumberyard Error", MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
::MessageBox(NULL, szBuffer, "Open 3D Engine Error", MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
}
// Dump callstack.
Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp
+1 -23
View File
@@ -193,34 +193,12 @@ bool IsOptionalReadXML(const SParseParams& parseParams, XmlNodeRef& definition)
return optional;
}
bool CheckEnum([[maybe_unused]] const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data)
bool CheckEnum([[maybe_unused]] const SParseParams& parseParams, [[maybe_unused]] const char* name, XmlNodeRef& definition, [[maybe_unused]] XmlNodeRef& data)
{
if (XmlNodeRef enumNode = definition->findChild("Enum"))
{
// If strict mode is off, then no need to check the enum value
return true;
// if restrictive attribute set to false, check always succeeds
if (enumNode->haveAttr("restrictive"))
{
bool res = true;
enumNode->getAttr("restrictive", res);
if (!res)
{
return true;
}
}
// else check enum values
const char* val = data->getAttr(name);
for (int i = 0; i < enumNode->getChildCount(); ++i)
{
if (0 == strcmp(enumNode->getChild(i)->getContent(), val))
{
return true;
}
}
return false;
}
return true;
}
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