diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp index 52d198bf..fe55d8d0 100644 --- a/neo/framework/common_frame.cpp +++ b/neo/framework/common_frame.cpp @@ -832,6 +832,7 @@ void idCommonLocal::Frame() // foresthale 2014-05-12: also check com_editors as many of them are not particularly thread-safe (editLights for example) if( !com_smp.GetInteger() < 0 ) + { // RB: this is the same as Doom 3 renderSystem->EndFrame() renderSystem->SwapCommandBuffers_FinishRendering( &time_frontend, &time_backend, &time_shadows, &time_gpu ); } diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp index 94778b78..ad6eb727 100644 --- a/neo/renderer/Image_load.cpp +++ b/neo/renderer/Image_load.cpp @@ -241,8 +241,8 @@ void idImage::AllocImage( const idImageOpts& imgOpts, textureFilter_t tf, textur } /* - - + + // foresthale 2014-05-30: give a nice progress display when binarizing commonLocal.LoadPacifierBinarizeFilename( GetName() , "generated image" ); if( opts.numLevels > 1 ) @@ -253,10 +253,10 @@ void idImage::AllocImage( const idImageOpts& imgOpts, textureFilter_t tf, textur { commonLocal.LoadPacifierBinarizeProgressTotal( opts.width * opts.height ); } - + commonLocal.LoadPacifierBinarizeEnd(); - - + + // foresthale 2014-05-30: give a nice progress display when binarizing commonLocal.LoadPacifierBinarizeFilename( GetName(), "generated cube image" ); if( opts.numLevels > 1 ) @@ -267,9 +267,9 @@ void idImage::AllocImage( const idImageOpts& imgOpts, textureFilter_t tf, textur { commonLocal.LoadPacifierBinarizeProgressTotal( opts.width * opts.width * 6 ); } - + commonLocal.LoadPacifierBinarizeEnd(); - + =============== GetGeneratedName diff --git a/neo/renderer/RenderBackend.cpp b/neo/renderer/RenderBackend.cpp index 53243a08..0ec163c5 100644 --- a/neo/renderer/RenderBackend.cpp +++ b/neo/renderer/RenderBackend.cpp @@ -2325,7 +2325,7 @@ void idRenderBackend::AmbientPass( const drawSurf_t* const* drawSurfs, int numDr } // draw the final interaction - DrawSingleInteraction( &inter,!fillGbuffer ); + DrawSingleInteraction( &inter, !fillGbuffer ); renderLog.CloseBlock(); } diff --git a/neo/renderer/RenderBackend.h b/neo/renderer/RenderBackend.h index bdfa27dd..4a8a055c 100644 --- a/neo/renderer/RenderBackend.h +++ b/neo/renderer/RenderBackend.h @@ -292,7 +292,7 @@ private: idVec4 matrix[2], float color[4] ); void DrawInteractions( const viewDef_t* _viewDef ); - void DrawSingleInteraction( drawInteraction_t* din ); + void DrawSingleInteraction( drawInteraction_t* din, bool useIBL ); int DrawShaderPasses( const drawSurf_t* const* const drawSurfs, const int numDrawSurfs, const float guiStereoScreenOffset, const int stereoEye ); diff --git a/neo/renderer/RenderProgs.cpp b/neo/renderer/RenderProgs.cpp index a754f0a8..b4cf3853 100644 --- a/neo/renderer/RenderProgs.cpp +++ b/neo/renderer/RenderProgs.cpp @@ -109,8 +109,10 @@ void idRenderProgManager::Init() { BUILTIN_VERTEX_COLOR, "vertex_color.vfp", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, { BUILTIN_AMBIENT_LIGHTING, "ambient_lighting", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, { BUILTIN_AMBIENT_LIGHTING_SKINNED, "ambient_lighting", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL, "ambient_lighting_IBL", "", 0, false false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, - { BUILTIN_AMBIENT_LIGHTING_IBL_SKINNED, "ambient_lighting_IBL", "_skinned", BIT( USE_GPU_SKINNING ), true false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL, "ambient_lighting_IBL", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_SKINNED, "ambient_lighting_IBL", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_PBR, "ambient_lighting_IBL_PBR", "", BIT( USE_PBR ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, + { BUILTIN_AMBIENT_LIGHTING_IBL_PBR_SKINNED, "ambient_lighting_IBL_PBR", "_skinned", BIT( USE_GPU_SKINNING | USE_PBR ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, { BUILTIN_SMALL_GEOMETRY_BUFFER, "gbuffer", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, { BUILTIN_SMALL_GEOMETRY_BUFFER_SKINNED, "gbuffer", "_skinned", BIT( USE_GPU_SKINNING ), true, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT }, // RB end @@ -665,4 +667,4 @@ void RpPrintState( uint64 stateBits, uint64* stencilBits ) { printStencil( STENCIL_FACE_NUM, stateBits, mask, ref ); } -} \ No newline at end of file +}