Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -23,8 +23,6 @@
|
||||
|
||||
void CNULLRenderer::EF_Init()
|
||||
{
|
||||
bool nv = 0;
|
||||
|
||||
m_RP.m_MaxVerts = 600;
|
||||
m_RP.m_MaxTris = 300;
|
||||
|
||||
@@ -47,10 +45,9 @@ void CNULLRenderer::EF_Init()
|
||||
m_RP.m_ObjectsPool = (CRenderObject*)CryModuleMemalign(sizeof(CRenderObject) * (m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT), 16);
|
||||
for (int j = 0; j < (int)(m_RP.m_nNumObjectsInPool * RT_COMMAND_BUF_COUNT); j++)
|
||||
{
|
||||
CRenderObject* pRendObj = new(&m_RP.m_ObjectsPool[j])CRenderObject();
|
||||
new(&m_RP.m_ObjectsPool[j])CRenderObject();
|
||||
}
|
||||
|
||||
|
||||
CRenderObject** arrPrefill = (CRenderObject**)(alloca(m_RP.m_nNumObjectsInPool * sizeof(CRenderObject*)));
|
||||
for (int j = 0; j < RT_COMMAND_BUF_COUNT; j++)
|
||||
{
|
||||
|
||||
@@ -42,13 +42,6 @@ bool CNULLRenderer::EF_PrecacheResource([[maybe_unused]] ITexture* pTP, [[maybe_
|
||||
return false;
|
||||
}
|
||||
|
||||
#if AZ_RENDER_TO_TEXTURE_GEM_ENABLED
|
||||
bool CTexture::RenderToTexture(int handle, const CCamera& camera, AzRTT::RenderContextId contextId)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#endif // if AZ_RENDER_TO_TEXTURE_GEM_ENABLED
|
||||
|
||||
bool CTexture::RenderEnvironmentCMHDR([[maybe_unused]] int size, [[maybe_unused]] Vec3& Pos, [[maybe_unused]] TArray<unsigned short>& vecData)
|
||||
{
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user