mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-05-04 15:10:49 +00:00
Disabled FullscreenFXManager::Process() post processing effects #647
This commit is contained in:
parent
cf128e42c8
commit
144ce1dab9
6 changed files with 18 additions and 9 deletions
|
@ -1947,6 +1947,9 @@ void FullscreenFXManager::Process( const renderView_t* view )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RB: skip for now so the game is playable. These old effects really suck with modern APIs
|
||||||
|
#if !defined( USE_NVRHI )
|
||||||
|
|
||||||
// do the process
|
// do the process
|
||||||
for( int i = 0; i < fx.Num(); i++ )
|
for( int i = 0; i < fx.Num(); i++ )
|
||||||
{
|
{
|
||||||
|
@ -1988,6 +1991,7 @@ void FullscreenFXManager::Process( const renderView_t* view )
|
||||||
Blendback( pfx->GetFadeAlpha() );
|
Blendback( pfx->GetFadeAlpha() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -89,8 +89,8 @@ idGuiModel::BeginFrame
|
||||||
*/
|
*/
|
||||||
void idGuiModel::BeginFrame( nvrhi::ICommandList* commandList )
|
void idGuiModel::BeginFrame( nvrhi::ICommandList* commandList )
|
||||||
{
|
{
|
||||||
vertexBlock = vertexCache.AllocVertex( NULL, MAX_VERTS, sizeof( idDrawVert ), commandList );
|
vertexBlock = vertexCache.AllocVertex( NULL, MAX_VERTS );
|
||||||
indexBlock = vertexCache.AllocIndex( NULL, MAX_INDEXES, sizeof( idTriList ), commandList );
|
indexBlock = vertexCache.AllocIndex( NULL, MAX_INDEXES );
|
||||||
vertexPointer = ( idDrawVert* )vertexCache.MappedVertexBuffer( vertexBlock );
|
vertexPointer = ( idDrawVert* )vertexCache.MappedVertexBuffer( vertexBlock );
|
||||||
indexPointer = ( triIndex_t* )vertexCache.MappedIndexBuffer( indexBlock );
|
indexPointer = ( triIndex_t* )vertexCache.MappedIndexBuffer( indexBlock );
|
||||||
numVerts = 0;
|
numVerts = 0;
|
||||||
|
|
|
@ -812,8 +812,8 @@ drawSurf_t* idRenderModelDecal::CreateDecalDrawSurf( const viewEntity_t* space,
|
||||||
newTri->numVerts = maxVerts;
|
newTri->numVerts = maxVerts;
|
||||||
newTri->numIndexes = maxIndexes;
|
newTri->numIndexes = maxIndexes;
|
||||||
|
|
||||||
newTri->ambientCache = vertexCache.AllocVertex( NULL, maxVerts, sizeof( idDrawVert ), nullptr );
|
newTri->ambientCache = vertexCache.AllocVertex( NULL, maxVerts );
|
||||||
newTri->indexCache = vertexCache.AllocIndex( NULL, maxIndexes, sizeof( triIndex_t ), nullptr );
|
newTri->indexCache = vertexCache.AllocIndex( NULL, maxIndexes );
|
||||||
|
|
||||||
idDrawVert* mappedVerts = ( idDrawVert* )vertexCache.MappedVertexBuffer( newTri->ambientCache );
|
idDrawVert* mappedVerts = ( idDrawVert* )vertexCache.MappedVertexBuffer( newTri->ambientCache );
|
||||||
triIndex_t* mappedIndexes = ( triIndex_t* )vertexCache.MappedIndexBuffer( newTri->indexCache );
|
triIndex_t* mappedIndexes = ( triIndex_t* )vertexCache.MappedIndexBuffer( newTri->indexCache );
|
||||||
|
|
|
@ -706,8 +706,8 @@ drawSurf_t* idRenderModelOverlay::CreateOverlayDrawSurf( const viewEntity_t* spa
|
||||||
srfTriangles_t* newTri = ( srfTriangles_t* )R_ClearedFrameAlloc( sizeof( *newTri ), FRAME_ALLOC_SURFACE_TRIANGLES );
|
srfTriangles_t* newTri = ( srfTriangles_t* )R_ClearedFrameAlloc( sizeof( *newTri ), FRAME_ALLOC_SURFACE_TRIANGLES );
|
||||||
newTri->staticModelWithJoints = ( staticModel->jointsInverted != NULL ) ? const_cast< idRenderModelStatic* >( staticModel ) : NULL; // allow GPU skinning
|
newTri->staticModelWithJoints = ( staticModel->jointsInverted != NULL ) ? const_cast< idRenderModelStatic* >( staticModel ) : NULL; // allow GPU skinning
|
||||||
|
|
||||||
newTri->ambientCache = vertexCache.AllocVertex( NULL, maxVerts, sizeof( idDrawVert ), nullptr );
|
newTri->ambientCache = vertexCache.AllocVertex( NULL, maxVerts );
|
||||||
newTri->indexCache = vertexCache.AllocIndex( NULL, maxIndexes, sizeof( idDrawVert ), nullptr );
|
newTri->indexCache = vertexCache.AllocIndex( NULL, maxIndexes );
|
||||||
|
|
||||||
idDrawVert* mappedVerts = ( idDrawVert* )vertexCache.MappedVertexBuffer( newTri->ambientCache );
|
idDrawVert* mappedVerts = ( idDrawVert* )vertexCache.MappedVertexBuffer( newTri->ambientCache );
|
||||||
triIndex_t* mappedIndexes = ( triIndex_t* )vertexCache.MappedIndexBuffer( newTri->indexCache );
|
triIndex_t* mappedIndexes = ( triIndex_t* )vertexCache.MappedIndexBuffer( newTri->indexCache );
|
||||||
|
|
|
@ -2001,7 +2001,7 @@ void idRenderBackend::DBG_TestImage()
|
||||||
|
|
||||||
float scale[16] = { 0 };
|
float scale[16] = { 0 };
|
||||||
scale[0] = w; // scale
|
scale[0] = w; // scale
|
||||||
scale[5] = -h; // scale
|
scale[5] = h; // scale
|
||||||
scale[12] = halfScreenWidth - ( halfScreenWidth * w ); // translate
|
scale[12] = halfScreenWidth - ( halfScreenWidth * w ); // translate
|
||||||
scale[13] = halfScreenHeight - ( halfScreenHeight * h ); // translate
|
scale[13] = halfScreenHeight - ( halfScreenHeight * h ); // translate
|
||||||
scale[10] = 1.0f;
|
scale[10] = 1.0f;
|
||||||
|
|
|
@ -6234,12 +6234,17 @@ void idRenderBackend::DrawViewInternal( const viewDef_t* _viewDef, const int ste
|
||||||
|
|
||||||
// resolve the screen
|
// resolve the screen
|
||||||
#if defined( USE_NVRHI )
|
#if defined( USE_NVRHI )
|
||||||
|
|
||||||
|
renderLog.OpenBlock( "Blit to _currentRender" );
|
||||||
|
|
||||||
BlitParameters blitParms;
|
BlitParameters blitParms;
|
||||||
nvrhi::IFramebuffer* currentFB = ( nvrhi::IFramebuffer* )currentFrameBuffer->GetApiObject();
|
nvrhi::IFramebuffer* currentFB = ( nvrhi::IFramebuffer* )currentFrameBuffer->GetApiObject();
|
||||||
blitParms.sourceTexture = currentFB->getDesc().colorAttachments[0].texture;
|
blitParms.sourceTexture = currentFB->getDesc().colorAttachments[0].texture;
|
||||||
blitParms.targetFramebuffer = globalFramebuffers.postProcFBO->GetApiObject();
|
blitParms.targetFramebuffer = globalFramebuffers.postProcFBO->GetApiObject(); // _currentRender image
|
||||||
blitParms.targetViewport = nvrhi::Viewport( renderSystem->GetWidth(), renderSystem->GetHeight() );;
|
blitParms.targetViewport = nvrhi::Viewport( renderSystem->GetWidth(), renderSystem->GetHeight() );
|
||||||
commonPasses.BlitTexture( commandList, blitParms, &bindingCache );
|
commonPasses.BlitTexture( commandList, blitParms, &bindingCache );
|
||||||
|
|
||||||
|
renderLog.CloseBlock();
|
||||||
#else
|
#else
|
||||||
globalImages->currentRenderImage->CopyFramebuffer( x, y, w, h );
|
globalImages->currentRenderImage->CopyFramebuffer( x, y, w, h );
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue