id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 18:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smaller merge changes with master

Browse source
This commit is contained in:
Robert Beckebans 2022-03-06 08:32:26 +01:00
parent 4bdaca627f
commit 67a5e99597
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/renderer/Image_load.cpp
View file

@ -89,8 +89,8 @@ int BitsForFormat( textureFormat_t format )
return 16;
case FMT_Y16_X16:
return 32;
// TODO case FMT_F8:
// return 32;
case FMT_R8:
return 4;
default:
assert( 0 );
return 0;

7
neo/renderer/Model_ColladaParser.cpp
View file

@ -2489,8 +2489,9 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, idList<InputChannel>& pPerIndex
numPrimitives = 1;
}
pMesh->mFaceSize.AssureSize( numPrimitives );
//pMesh->mFacePosIndices.AssureSize( indices.Num() / numOffsets );
const int startFaceSize = pMesh->mFaceSize.Num();
pMesh->mFaceSize.AssureSize( Max( pMesh->mFaceSize.Size(), numPrimitives ) );
size_t appendedVerts = 0;
for( size_t a = 0; a < numPrimitives; a++ )
@ -2519,7 +2520,7 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, idList<InputChannel>& pPerIndex
}
// store the face size to later reconstruct the face from
pMesh->mFaceSize[a] = numPoints;
pMesh->mFaceSize[startFaceSize + a] = numPoints;
// gather that number of vertices
for( size_t b = 0; b < numPoints; b++ )

10
neo/renderer/RenderLog.cpp
View file

@ -108,6 +108,11 @@ FIXME: this is not thread safe on the PC
*/
void PC_BeginNamedEvent( const char* szName, const idVec4& color )
{
if( r_logLevel.GetInteger() <= 0 )
{
return;
}
#if defined( USE_VULKAN )
// start an annotated group of calls under the this name
@ -191,6 +196,11 @@ PC_EndNamedEvent
*/
void PC_EndNamedEvent()
{
if( r_logLevel.GetInteger() <= 0 )
{
return;
}
#if defined( USE_VULKAN )
// SRS - Prefer VK_EXT_debug_utils over VK_EXT_debug_marker/VK_EXT_debug_report (deprecated by VK_EXT_debug_utils)
if( vkcontext.debugUtilsSupportAvailable )