Skip to content
This repository has been archived by the owner on Oct 4, 2022. It is now read-only.

Assorted: Remove 'Igor' from comments throughout LY #225

Open
wants to merge 1 commit into
base: 1.14
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/Code/CryEngine/Cry3DEngine/3dEngineLoad.cpp
Expand Up @@ -763,15 +763,15 @@ bool C3DEngine::LoadLevel(const char* szFolderName, const char* szMissionName)

LoadDefaultAssets();

// Confetti BEGIN: Igor Lobanchikov

if (m_pSkyLightManager)
{
m_pSkyLightManager->InitSkyDomeMesh();
// Igor: set default render parameters.
// set default render parameters.
// for some reason this is not done later???
m_pSkyLightManager->UpdateRenderParams();
}
// Confetti End: Igor Lobanchikov


// Load LevelData.xml File.
XmlNodeRef xmlLevelData = GetSystem()->LoadXmlFromFile(GetLevelFilePath(LEVEL_DATA_FILE));
Expand Down
4 changes: 2 additions & 2 deletions dev/Code/CryEngine/Cry3DEngine/SkyLightManager.h
Expand Up @@ -80,11 +80,11 @@ class CSkyLightManager
int GetFrontBuffer() const;
int GetBackBuffer() const;
void ToggleBuffer();
// Confetti BEGIN: Igor Lobanchikov

public:
void UpdateRenderParams();
private:
// Confetti End: Igor Lobanchikov

void PushUpdateParams();

private:
Expand Down
4 changes: 2 additions & 2 deletions dev/Code/CryEngine/CryCommon/IRenderer.h
Expand Up @@ -427,13 +427,13 @@ enum PublicRenderPrimitiveType
#define RFT_FREE_0x2000 0x2000
#define RFT_OCCLUSIONTEST 0x8000 // Support hardware occlusion test.

// Confetti BEGIN: Igor Lobanchikov :END

#define RFT_HW_ARM_MALI 0x04000 // Unclassified ARM (MALI) hardware.
#define RFT_HW_INTEL 0x10000 // Unclassified intel hardware.
#define RFT_HW_QUALCOMM 0x10000 // Unclassified Qualcomm hardware
#define RFT_HW_ATI 0x20000 // Unclassified ATI hardware.
#define RFT_HW_NVIDIA 0x40000 // Unclassified NVidia hardware.
// Confetti BEGIN: Igor Lobanchikov :END

#define RFT_HW_MASK 0x74000 // Graphics chip mask.

#define RFT_HW_HDR 0x80000 // Hardware supports high dynamic range rendering.
Expand Down
4 changes: 2 additions & 2 deletions dev/Code/CryEngine/CryCommon/ITexture.h
Expand Up @@ -127,7 +127,7 @@ enum eTEX_Format
eTF_PVRTC2,
eTF_PVRTC4,

// Confetti BEGIN: Igor Lobanchikov

eTF_ASTC_4x4,
eTF_ASTC_5x4,
eTF_ASTC_5x5,
Expand All @@ -147,7 +147,7 @@ enum eTEX_Format
eTF_R16U,
eTF_R16G16U,
eTF_R10G10B10A2UI,
// Confetti End: Igor Lobanchikov


eTF_MaxFormat // unused, must be always the last in the list
};
Expand Down
42 changes: 21 additions & 21 deletions dev/Code/CryEngine/CryCommon/ImageExtensionHelper.h
Expand Up @@ -384,14 +384,14 @@ namespace CImageExtensionHelper
return 0; // chunk does not exist
}

// Confetti BEGIN: Igor Lobanchikov

static ILINE Vec2i GetBlockDim(const ETEX_Format eTF)
{
if (eTF == eTF_BC1 || eTF == eTF_BC2 || eTF == eTF_BC3 || eTF == eTF_BC5U || eTF == eTF_BC5S || eTF == eTF_BC4U || eTF == eTF_BC4S || eTF == eTF_CTX1 || eTF == eTF_BC6UH || eTF == eTF_BC6SH || eTF == eTF_BC7 || eTF == eTF_EAC_R11 || eTF == eTF_EAC_RG11 || eTF == eTF_ETC2 || eTF == eTF_ETC2A)
{
return Vec2i(4, 4);
}
// Igor: Apple requires the following for the texture:
// Apple requires the following for the texture:
// Height and width must be a power of 2
// Height and width must be at least 8
// Must be square
Expand Down Expand Up @@ -451,14 +451,14 @@ namespace CImageExtensionHelper
return 8 / 8;
case eTF_R16:
return 16 / 8;
// Confetti BEGIN: Igor Lobanchikov

case eTF_R16U:
return 16 / 8;
case eTF_R16G16U:
return 32 / 8;
case eTF_R10G10B10A2UI:
return 32 / 8;
// Confetti End: Igor Lobanchikov

case eTF_R16F:
return 16 / 8;
case eTF_R32F:
Expand Down Expand Up @@ -564,7 +564,7 @@ namespace CImageExtensionHelper
return 0;
}

// Confetti End: Igor Lobanchikov


inline bool IsBlockCompressed(ETEX_Format eTF)
{
Expand All @@ -585,7 +585,7 @@ namespace CImageExtensionHelper
eTF == eTF_EAC_RG11 ||
eTF == eTF_PVRTC2 ||
eTF == eTF_PVRTC4 ||
// Confetti BEGIN: Igor Lobanchikov

eTF == eTF_ASTC_4x4 ||
eTF == eTF_ASTC_5x4 ||
eTF == eTF_ASTC_5x5 ||
Expand All @@ -600,7 +600,7 @@ namespace CImageExtensionHelper
eTF == eTF_ASTC_10x10 ||
eTF == eTF_ASTC_12x10 ||
eTF == eTF_ASTC_12x12
// Confetti End: Igor Lobanchikov

);
}

Expand Down Expand Up @@ -639,7 +639,7 @@ namespace CImageExtensionHelper
eTF == eTF_EAC_RG11 ||
eTF == eTF_PVRTC2 ||
eTF == eTF_PVRTC4 ||
// Confetti BEGIN: Igor Lobanchikov

eTF == eTF_ASTC_4x4 ||
eTF == eTF_ASTC_5x4 ||
eTF == eTF_ASTC_5x5 ||
Expand All @@ -654,7 +654,7 @@ namespace CImageExtensionHelper
eTF == eTF_ASTC_10x10 ||
eTF == eTF_ASTC_12x10 ||
eTF == eTF_ASTC_12x12
// Confetti End: Igor Lobanchikov

);
}

Expand Down Expand Up @@ -762,7 +762,7 @@ namespace CImageExtensionHelper
case eTF_PVRTC4:
return "PVRTC4";

// Confetti BEGIN: Igor Lobanchikov

case eTF_ASTC_4x4:
return "ASTC_4x4";
case eTF_ASTC_5x4:
Expand Down Expand Up @@ -791,7 +791,7 @@ namespace CImageExtensionHelper
return "ASTC_12x10";
case eTF_ASTC_12x12:
return "ASTC_12x12";
// Confetti End: Igor Lobanchikov


case eTF_A8L8:
return "A8L8";
Expand Down Expand Up @@ -1007,7 +1007,7 @@ namespace CImageExtensionHelper
return eTF_PVRTC4;
}

// Confetti BEGIN: Igor Lobanchikov

if (!stricmp(sETF, "ASTC_4x4"))
{
return eTF_ASTC_4x4;
Expand Down Expand Up @@ -1064,7 +1064,7 @@ namespace CImageExtensionHelper
{
return eTF_ASTC_12x12;
}
// Confetti End: Igor Lobanchikov


if (!stricmp(sETF, "A8L8"))
{
Expand Down Expand Up @@ -1429,7 +1429,7 @@ namespace DDSFormats
const CImageExtensionHelper::DDS_PIXELFORMAT DDSPF_ETC2A =
{ sizeof(CImageExtensionHelper::DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('E', 'T', '2', 'A'), 0, 0, 0, 0, 0 };

// Confetti BEGIN: Igor Lobanchikov

const CImageExtensionHelper::DDS_PIXELFORMAT DDSPF_PVRTC2 =
{ sizeof(CImageExtensionHelper::DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('P', 'V', 'R', '2'), 0, 0, 0, 0, 0 };

Expand Down Expand Up @@ -1477,7 +1477,7 @@ namespace DDSFormats

const CImageExtensionHelper::DDS_PIXELFORMAT DDSPF_ASTC_12x12 =
{ sizeof(CImageExtensionHelper::DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('A', 'S', 'C', 'C'), 0, 0, 0, 0, 0 };
// Confetti End: Igor Lobanchikov


const CImageExtensionHelper::DDS_PIXELFORMAT DDSPF_R32F =
{ sizeof(CImageExtensionHelper::DDS_PIXELFORMAT), DDS_FOURCC, DDS_FOURCC_R32F, 32, 0, 0, 0, 0 };
Expand Down Expand Up @@ -1663,7 +1663,7 @@ namespace DDSFormats
{
return eTF_A8;
}
// Confetti BEGIN: Igor Lobanchikov

else if (ddspf.dwFourCC == DDSPF_PVRTC2.dwFourCC)
{
return eTF_PVRTC2;
Expand Down Expand Up @@ -1728,7 +1728,7 @@ namespace DDSFormats
{
return eTF_ASTC_12x12;
}
// Confetti End: Igor Lobanchikov


assert(0);
return eTF_Unknown;
Expand Down Expand Up @@ -1884,7 +1884,7 @@ namespace DDSFormats
case DXGI_FORMAT_PVRTC4_UNORM_SRGB:
return eTF_PVRTC4;
#endif
// Confetti BEGIN: Igor Lobanchikov

#if defined(ANDROID) //|| defined(CRY_USE_METAL)
case DXGI_FORMAT_ASTC_4x4_TYPELESS:
return eTF_ASTC_4x4;
Expand Down Expand Up @@ -1971,7 +1971,7 @@ namespace DDSFormats
case DXGI_FORMAT_ASTC_12x12_UNORM_SRGB:
return eTF_ASTC_12x12;
#endif
// Confetti End: Igor Lobanchikov

// only available as hardware format under DX9
case DXGI_FORMAT_B8G8R8A8_TYPELESS:
return eTF_B8G8R8A8;
Expand Down Expand Up @@ -2086,7 +2086,7 @@ namespace DDSFormats
case eTF_PVRTC4:
return DDSPF_PVRTC4;

// Confetti BEGIN: Igor Lobanchikov

case eTF_ASTC_4x4:
return DDSPF_ASTC_4x4;
case eTF_ASTC_5x4:
Expand Down Expand Up @@ -2115,7 +2115,7 @@ namespace DDSFormats
return DDSPF_ASTC_12x10;
case eTF_ASTC_12x12:
return DDSPF_ASTC_12x12;
// Confetti End: Igor Lobanchikov

default:
assert(0);
return DDSPF_A8B8G8R8;
Expand Down
Expand Up @@ -53,7 +53,7 @@ bool SPostEffectsUtils::Create()
static ICVar* DolbyCvar = gEnv->pConsole->GetCVar("r_HDRDolby");
int DolbyCvarValue = DolbyCvar ? DolbyCvar->GetIVal() : eDVM_Disabled;

// Confetti BEGIN: Igor Lobanchikov :END

ETEX_Format nHDRReducedFormat = gRenDev->UseHalfFloatRenderTargets() ? eTF_R11G11B10F : eTF_R10G10B10A2;

ETEX_Format taaFormat = eTF_R8G8B8A8;
Expand Down Expand Up @@ -107,12 +107,12 @@ bool SPostEffectsUtils::Create()

CreateRenderTarget("$BackBufferScaledTemp_d2", CTexture::s_ptexBackBufferScaledTemp[0], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);

// Confetti BEGIN: Igor Lobanchikov

CreateRenderTarget("$WaterVolumeRefl", CTexture::s_ptexWaterVolumeRefl[0], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, true, nHDRReducedFormat, TO_WATERVOLUMEREFLMAP, FT_DONT_RELEASE);
//CTexture::s_ptexWaterVolumeRefl[0]->DisableMgpuSync();
CreateRenderTarget("$WaterVolumeReflPrev", CTexture::s_ptexWaterVolumeRefl[1], nWidth >> 1, nHeight >> 1, Clr_Unknown, 1, true, nHDRReducedFormat, TO_WATERVOLUMEREFLMAPPREV, FT_DONT_RELEASE);
//CTexture::s_ptexWaterVolumeRefl[1]->DisableMgpuSync();
// Confetti End: Igor Lobanchikov


CreateRenderTarget("$BackBufferScaled_d4", CTexture::s_ptexBackBufferScaled[1], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, 0, eTF_R8G8B8A8, TO_BACKBUFFERSCALED_D4, FT_DONT_RELEASE);
CreateRenderTarget("$BackBufferScaledTemp_d4", CTexture::s_ptexBackBufferScaledTemp[1], nWidth >> 2, nHeight >> 2, Clr_Unknown, 1, 0, eTF_R8G8B8A8, -1, FT_DONT_RELEASE);
Expand All @@ -130,7 +130,7 @@ bool SPostEffectsUtils::Create()
// Water phys simulation requires data overframes, need to handle for each GPU in MGPU mode
CreateRenderTarget("$WaterRipplesDDN_0", CTexture::s_ptexWaterRipplesDDN, 256, 256, Clr_Unknown, 1, true, eTF_R8G8B8A8, TO_WATERRIPPLESMAP);
//CTexture::s_ptexWaterRipplesDDN->DisableMgpuSync();
// Confetti BEGIN: Igor Lobanchikov

if (gRenDev->UseHalfFloatRenderTargets())
{
CreateRenderTarget("$WaterVolumeDDN", CTexture::s_ptexWaterVolumeDDN, 64, 64, Clr_Unknown, 1, true, eTF_R16G16B16A16F, TO_WATERVOLUMEMAP);
Expand All @@ -139,7 +139,7 @@ bool SPostEffectsUtils::Create()
{
CreateRenderTarget("$WaterVolumeDDN", CTexture::s_ptexWaterVolumeDDN, 64, 64, Clr_Unknown, 1, true, eTF_R8G8B8A8, TO_WATERVOLUMEMAP);
}
// Confetti End: Igor Lobanchikov

//CTexture::s_ptexWaterVolumeDDN->DisableMgpuSync();

if (CRenderer::CV_r_watervolumecaustics && CRenderer::CV_r_watercaustics) //@NOTE: CV_r_watercaustics will be removed when the infinite ocean component feature toggle is removed.
Expand Down
2 changes: 1 addition & 1 deletion dev/Code/CryEngine/RenderDll/Common/RenderCapabilities.h
Expand Up @@ -25,7 +25,7 @@ namespace RenderCapabilities
static const unsigned int s_gpuVendorIdIntel = 0x8086;
static const unsigned int s_gpuVendorIdQualcomm = 0x5143;
static const unsigned int s_gpuVendorIdSamsung = 0x1099;
// Confetti BEGIN: Igor Lobanchikov :END

static const unsigned int s_gpuVendorIdARM = 0x13B5;

//Note that for platforms that don't support texture views, you are still allowed to create a single view, that view must "match" the creation parameters of
Expand Down
12 changes: 6 additions & 6 deletions dev/Code/CryEngine/RenderDll/Common/RenderThread.cpp
Expand Up @@ -2180,7 +2180,7 @@ void SRenderThread::ProcessCommands()
gcpRendD3D->BindContextToThread(CryGetCurrentThreadId());
}
# endif
// Confetti BEGIN: Igor Lobanchikov

#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
if (CRenderer::CV_r_multithreaded)
{
Expand All @@ -2191,7 +2191,7 @@ void SRenderThread::ProcessCommands()
m_kDXGLDeviceContextHandle.Set(&gcpRendD3D->GetDeviceContext(), !CRenderer::CV_r_multithreaded);
}
#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
// Confetti End: Igor Lobanchikov



#ifdef DO_RENDERSTATS
Expand Down Expand Up @@ -3315,12 +3315,12 @@ void SRenderThread::Process()
const uint64 elapsed = CryGetTicks() - start;
gEnv->pSystem->GetCurrentUpdateTimeStats().RenderTime = elapsed;
}
// Confetti BEGIN: Igor Lobanchikov

#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
m_kDXGLDeviceContextHandle.Set(NULL, !CRenderer::CV_r_multithreaded);
m_kDXGLContextHandle.Set(NULL);
#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
// Confetti End: Igor Lobanchikov

}

void SRenderThread::ProcessLoading()
Expand Down Expand Up @@ -3355,12 +3355,12 @@ void SRenderThread::ProcessLoading()
SwitchMode(false);
}
}
// Confetti BEGIN: Igor Lobanchikov

#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
m_kDXGLDeviceContextHandle.Set(NULL, !CRenderer::CV_r_multithreaded);
m_kDXGLContextHandle.Set(NULL);
#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
// Confetti End: Igor Lobanchikov

}

#ifndef STRIP_RENDER_THREAD
Expand Down
4 changes: 2 additions & 2 deletions dev/Code/CryEngine/RenderDll/Common/RenderThread.h
Expand Up @@ -265,12 +265,12 @@ struct SRenderThread
#include AZ_RESTRICTED_FILE(RenderThread_h, AZ_RESTRICTED_PLATFORM)
#endif
HRESULT m_hResult;
// Confetti BEGIN: Igor Lobanchikov

#if defined(OPENGL) && !DXGL_FULL_EMULATION && !defined(CRY_USE_METAL)
SDXGLContextThreadLocalHandle m_kDXGLContextHandle;
SDXGLDeviceContextThreadLocalHandle m_kDXGLDeviceContextHandle;
#endif //defined(OPENGL) && !DXGL_FULL_EMULATION
// Confetti End: Igor Lobanchikov

float m_fTimeIdleDuringLoading;
float m_fTimeBusyDuringLoading;
TArray<byte> m_Commands[RT_COMMAND_BUF_COUNT]; // m_nCurThreadFill shows which commands are filled by main thread
Expand Down