Fixed amount of render targets

Author: ivan-ushakov

Source/Render/sokol/SokolImpl.mm

@@ -24,27 +24,29 @@ void StartCapture() {
             return;
         }
 
-        MTLCaptureManager* capture_manager = [MTLCaptureManager sharedCaptureManager];
-        if (![capture_manager supportsDestination:MTLCaptureDestinationGPUTraceDocument]) {
-            fprintf(stderr, "FrameCaptureManager: unsupported destination\n");
-            return;
-        }
-
-        MTLCaptureDescriptor* capture_descriptor = [MTLCaptureDescriptor new];
-        capture_descriptor.captureObject = mtl_device;
-        capture_descriptor.destination = MTLCaptureDestinationGPUTraceDocument;
-        const auto current_time = static_cast<unsigned long>([NSDate date].timeIntervalSince1970);
-        _path = [[NSString stringWithFormat:@"/tmp/Perimeter_%lu.gputrace", current_time] copy];
-        capture_descriptor.outputURL = [NSURL fileURLWithPath:_path];
-
-        NSError* error;
-        BOOL result = [capture_manager startCaptureWithDescriptor:capture_descriptor error:&error];
-        if (!result) {
-            fprintf(stderr, "FrameCaptureManager: start capture error: %s\n", error.localizedDescription.UTF8String);
-            return;
+        @autoreleasepool {
+            MTLCaptureManager* capture_manager = [MTLCaptureManager sharedCaptureManager];
+            if (![capture_manager supportsDestination:MTLCaptureDestinationGPUTraceDocument]) {
+                fprintf(stderr, "FrameCaptureManager: unsupported destination\n");
+                return;
+            }
+
+            MTLCaptureDescriptor* capture_descriptor = [MTLCaptureDescriptor new];
+            capture_descriptor.captureObject = mtl_device;
+            capture_descriptor.destination = MTLCaptureDestinationGPUTraceDocument;
+            const auto current_time = static_cast<unsigned long>([NSDate date].timeIntervalSince1970);
+            _path = [[NSString stringWithFormat:@"/tmp/Perimeter_%lu.gputrace", current_time] copy];
+            capture_descriptor.outputURL = [NSURL fileURLWithPath:_path];
+
+            NSError* error;
+            BOOL result = [capture_manager startCaptureWithDescriptor:capture_descriptor error:&error];
+            if (!result) {
+                fprintf(stderr, "FrameCaptureManager: start capture error: %s\n", error.localizedDescription.UTF8String);
+                return;
+            }
+
+            _is_capturing_frame = true;
         }
-
-        _is_capturing_frame = true;
     }
 
     void StopCapture() {
@@ -59,7 +61,6 @@ void StopCapture() {
         _is_capturing_frame = false;
 
         [_path release];
-        _path = nil;
     }
 
 private:

Source/Render/sokol/SokolRender.cpp

@@ -1,3 +1,4 @@
+#include <array>
 #include <unordered_set>
 #include "StdAfxRD.h"
 #include "xmath.h"
@@ -82,11 +83,10 @@ int cSokolRender::Init(int xScr, int yScr, int mode, SDL_Window* wnd, int Refres
     desc.logger.func = slog_func;
 
     //Setup swapchain and fill color
-    render_targets.emplace_back();
-    auto& swapchain_pass = render_targets[0].render_pass;
-    swapchain_pass.swapchain.width = ScreenSize.x;
-    swapchain_pass.swapchain.height = ScreenSize.y;
-    swapchain_pass.swapchain.sample_count = 1;
+    swapchain = {};
+    swapchain.width = ScreenSize.x;
+    swapchain.height = ScreenSize.y;
+    swapchain.sample_count = 1;
     fill_color = sg_color { 0.0f, 0.0f, 0.0f, 1.0f };
 
     //OpenGL / OpenGLES
@@ -131,8 +131,7 @@ int cSokolRender::Init(int xScr, int yScr, int mode, SDL_Window* wnd, int Refres
     }
     printf("GPU vendor: %s, renderer: %s\n", glGetString(GL_VENDOR), glGetString(GL_RENDER));
 
-    auto& swapchain_pass = render_targets[0].render_pass;
-    swapchain_pass.swapchain.gl.framebuffer = 0;
+    swapchain.gl.framebuffer = 0;
 #endif //PERIMETER_SOKOL_GL
 
     //Direct3D
@@ -215,8 +214,7 @@ int cSokolRender::Init(int xScr, int yScr, int mode, SDL_Window* wnd, int Refres
     dxgiAdapter->Release();
 
     //Create swap chain
-    auto& swapchain_pass = render_targets[0].render_pass;
-    uint32_t sample_count = swapchain_pass.swapchain.sample_count;
+    uint32_t sample_count = swapchain.sample_count;
     DXGI_SWAP_CHAIN_DESC* swap_chain_desc = &d3d_context->swap_chain_desc;
     memset(&d3d_context->swap_chain_desc, 0, sizeof(DXGI_SWAP_CHAIN_DESC));
     swap_chain_desc->BufferDesc.Width = static_cast<uint32_t>(xScr);
@@ -253,7 +251,7 @@ int cSokolRender::Init(int xScr, int yScr, int mode, SDL_Window* wnd, int Refres
     SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, "metal", SDL_HINT_OVERRIDE);
 
     //Setup metal sokol context
-    sokol_metal_setup(sdl_window, &desc, &swapchain_pass.swapchain, ScreenHZ);
+    sokol_metal_setup(sdl_window, &desc, &swapchain, ScreenHZ);
 #endif
 
     const char* render_driver = SDL_GetHint(SDL_HINT_RENDER_DRIVER);
@@ -334,9 +332,8 @@ bool cSokolRender::ChangeSize(int xScr, int yScr, int mode) {
 #endif
 
     //Update swapchain
-    auto& swapchain_pass = render_targets[0].render_pass;
-    swapchain_pass.swapchain.width = ScreenSize.x;
-    swapchain_pass.swapchain.height = ScreenSize.y;
+    swapchain.width = ScreenSize.x;
+    swapchain.height = ScreenSize.y;
 
 #ifdef SOKOL_D3D11
     if (d3d_context->swap_chain && need_resize) {
@@ -391,10 +388,9 @@ int cSokolRender::Done() {
     }
 #endif
 #ifdef SOKOL_METAL
-    auto& swapchain_pass = render_targets[0].render_pass;
-    if (swapchain_pass.swapchain.metal.current_drawable != nullptr) {
+    if (swapchain.metal.current_drawable != nullptr) {
         RenderSubmitEvent(RenderEvent::DONE, "Sokol Metal shutdown");
-        sokol_metal_destroy(&swapchain_pass.swapchain);
+        sokol_metal_destroy(&swapchain);
     }
 #endif
 #ifdef PERIMETER_SOKOL_GL
@@ -461,8 +457,8 @@ void cSokolRender::ClearPooledResources(uint32_t max_life) {
 
 void cSokolRender::ClearCommands() {
     std::unordered_set<SokolResourceBuffer*> pooled;
-    for (auto& render_target : render_targets) {
-        for (SokolCommand* command : render_target.commands) {
+    auto ClearCommands = [&pooled, this](std::vector<SokolCommand*>& commands) {
+        for (SokolCommand* command : commands) {
             //Reclaim resources that can be reused
             SokolResourceBuffer* vertex_buffer = command->vertex_buffer;
             if (vertex_buffer && vertex_buffer->key != SokolResourceKeyNone && pooled.count(vertex_buffer) == 0) {
@@ -487,9 +483,18 @@ void cSokolRender::ClearCommands() {
 
             delete command;
         }
-        render_target.commands.clear();
+    };
+
+    for (auto& target : std::array<SokolRenderTarget*, 2>{shadowMapRenderTarget, lightMapRenderTarget}) {
+        if (target != nullptr) {
+            ClearCommands(target->commands);
+            target->commands.clear();
+        }
     }
 
+    ClearCommands(commands);
+    commands.clear();
+
 #ifdef PERIMETER_DEBUG
     //printf("%ld %ld\n", reclaimed.size(), bufferPool.size());
 #endif
@@ -593,17 +598,15 @@ void cSokolRender::d3d_CreateDefaultRenderTarget() {
     assert(SUCCEEDED(hr) && d3d_context->depth_stencil_view);
 
     //Apply into swapchain pass
-    auto& swapchain_pass = render_targets[0].render_pass;
-    swapchain_pass.swapchain.d3d11.render_view = 1 < sample_count ? d3d_context->msaa_view : d3d_context->render_target_view;
-    swapchain_pass.swapchain.d3d11.resolve_view = 1 < sample_count ? d3d_context->render_target_view : nullptr;
-    swapchain_pass.swapchain.d3d11.depth_stencil_view = d3d_context->depth_stencil_view;
+    swapchain.d3d11.render_view = 1 < sample_count ? d3d_context->msaa_view : d3d_context->render_target_view;
+    swapchain.d3d11.resolve_view = 1 < sample_count ? d3d_context->render_target_view : nullptr;
+    swapchain.d3d11.depth_stencil_view = d3d_context->depth_stencil_view;
 }
 
 void cSokolRender::d3d_DestroyDefaultRenderTarget() {
-    auto& swapchain_pass = render_targets[0].render_pass;
-    swapchain_pass.swapchain.d3d11.render_view = nullptr;
-    swapchain_pass.swapchain.d3d11.resolve_view = nullptr;
-    swapchain_pass.swapchain.d3d11.depth_stencil_view = nullptr;
+    swapchain.d3d11.render_view = nullptr;
+    swapchain.d3d11.resolve_view = nullptr;
+    swapchain.d3d11.depth_stencil_view = nullptr;
     RELEASE(d3d_context->render_target_texture);
     RELEASE(d3d_context->render_target_view);
     RELEASE(d3d_context->depth_stencil_texture);

Source/Render/sokol/SokolRender.h

@@ -41,13 +41,23 @@ struct SokolCommand {
     Vect2i clip[2]; //0 Pos 1 Size
 };
 
+struct SokolRenderTarget final {
+    cTexture* texture = nullptr;
+    sg_pass render_pass{};
+    std::vector<SokolCommand*> commands;
+
+    ~SokolRenderTarget() {
+        RELEASE(texture);
+    }
+};
+
 struct SokolPipelineContext {
     PIPELINE_TYPE pipeline_type;
     PIPELINE_MODE pipeline_mode;
     ePrimitiveType primitive_type;
     vertex_fmt_t vertex_fmt;
     sg_pipeline_desc desc{};
-    struct shader_funcs* shader_funcs;
+    struct shader_funcs* shader_funcs = nullptr;
 
     bool operator==(const SokolPipelineContext& other) const {
         return std::tie(pipeline_type, pipeline_mode, primitive_type, vertex_fmt) 
@@ -84,36 +94,31 @@ class cSokolRender: public cInterfaceRenderDevice {
     friend const void* sokol_d3d_render_target_view_cb();
     friend const void* sokol_d3d_depth_stencil_view_cb();
 #endif
-
-    cTexture* pShadowMap = nullptr;
-    cTexture* pLightMap = nullptr;
-    bool use_shadow = false;
-    cCamera* pShadow = nullptr;
-    float kShadow = 0.25f;
-
+    
     //Stores resources for reusing
     void ClearPooledResources(uint32_t max_life);
     std::unordered_multimap<uint64_t, SokolResourcePooled<sg_buffer>> bufferPool;
 
+    //For swapchain pass that renders into final device
+    sg_swapchain swapchain = {};
     sg_color fill_color = {};
-
+    
     //Renderer state
     bool ActiveScene = false;
     bool isOrthographicProjSet = false;
+    std::vector<SokolCommand*> commands;
     sg_sampler sampler;
     sg_sampler shadow_sampler;
 
 #ifdef PERIMETER_DEBUG
     bool is_capturing_frame = false;
 #endif
 
-    struct RenderTarget final {
-        cTexture* target_texture = nullptr;
-        SokolTexture2D* depth_image = nullptr;
-        sg_pass render_pass{};
-        std::vector<SokolCommand*> commands;
-    };
-    std::vector<RenderTarget> render_targets;
+    SokolRenderTarget* shadowMapRenderTarget = nullptr;
+    SokolRenderTarget* lightMapRenderTarget = nullptr;
+    bool use_shadow = false;
+    cCamera* pShadow = nullptr;
+    float kShadow = 0.25f;
 
     //Empty texture when texture slot is unused
     SokolTexture2D* emptyTexture = nullptr;
@@ -150,7 +155,7 @@ class cSokolRender: public cInterfaceRenderDevice {
     Mat4f activeTextureTransform[PERIMETER_SOKOL_TEXTURES];
 
     //Shadow and Light map rendering
-    size_t activeRenderTarget = 0;
+    SokolRenderTarget* activeRenderTarget = nullptr;
     Mat4f activeShadowMatrix{};
     Vect2f activeWorldSize{};
 

Source/Render/sokol/SokolRenderDraw.cpp

@@ -226,6 +226,9 @@ void cSokolRender::DrawNoMaterialShadow(cObjMesh* mesh) {
 }
 
 void cSokolRender::SetMaterialTilemap(cTileMap *TileMap) {
+    auto pShadowMap = shadowMapRenderTarget->texture;
+    auto pLightMap = lightMapRenderTarget->texture;
+
     float fOffsetX = 0.5f + (0.0f / pShadowMap->GetWidth());
     float fOffsetY = 0.5f + (0.0f / pShadowMap->GetWidth());
     float range = 1;
@@ -279,32 +282,56 @@ bool cSokolRender::CreateShadowTexture(int xysize) {
         texture->dirty = false;
     };
 
-    pShadowMap=GetTexLibrary()->CreateRenderTexture(xysize, xysize, TEXTURE_RENDER16, false);
-    if (!pShadowMap) {
+    shadowMapRenderTarget = new SokolRenderTarget{};
+    shadowMapRenderTarget->texture = GetTexLibrary()->CreateRenderTexture(xysize, xysize, TEXTURE_RENDER16, false);
+    if (!shadowMapRenderTarget->texture) {
         DeleteShadowTexture();
         return false;
     }
-    SetupTexture(pShadowMap->GetFrameImage(0)->sg, SG_PIXELFORMAT_DEPTH);
+    SetupTexture(shadowMapRenderTarget->texture->GetFrameImage(0)->sg, SG_PIXELFORMAT_DEPTH);
+
+    {
+        auto& render_pass = shadowMapRenderTarget->render_pass;
+        render_pass.action.depth.load_action = SG_LOADACTION_CLEAR;
+        render_pass.action.depth.store_action = SG_STOREACTION_STORE;
+        render_pass.action.depth.clear_value = 1.0f;
+
+        sg_attachments_desc description{};
+        description.depth_stencil.image = shadowMapRenderTarget->texture->GetFrameImage(0)->sg->image->res;
+        render_pass.attachments = sg_make_attachments(&description);
+    }
 
-    pLightMap = GetTexLibrary()->CreateRenderTexture(256, 256, TEXTURE_RENDER32, false);
-    if (!pLightMap) {
+    lightMapRenderTarget = new SokolRenderTarget{};
+    lightMapRenderTarget->texture = GetTexLibrary()->CreateRenderTexture(256, 256, TEXTURE_RENDER32, false);
+    if (!lightMapRenderTarget->texture) {
         DeleteShadowTexture();
         return false;
     }
-    SetupTexture(pLightMap->GetFrameImage(0)->sg, SG_PIXELFORMAT_BGRA8);
+    SetupTexture(lightMapRenderTarget->texture->GetFrameImage(0)->sg, SG_PIXELFORMAT_BGRA8);
+
+    {
+        auto& render_pass = lightMapRenderTarget->render_pass;
+        render_pass.action.colors[0].load_action = SG_LOADACTION_CLEAR;
+        render_pass.action.colors[0].store_action = SG_STOREACTION_STORE;
+        render_pass.action.colors[0].clear_value = { 1.0f, 1.0f, 1.0f, 1.0f};
+
+        sg_attachments_desc description{};
+        description.colors[0].image = lightMapRenderTarget->texture->GetFrameImage(0)->sg->image->res;
+        render_pass.attachments = sg_make_attachments(&description);
+    }
 
     return true;
 }
 
 void cSokolRender::DeleteShadowTexture() {
-    RELEASE(pShadowMap);
-    RELEASE(pLightMap);
+    delete shadowMapRenderTarget;
+    delete lightMapRenderTarget;
 }
 
 cTexture* cSokolRender::GetShadowMap() {
-    return pShadowMap;
+    return shadowMapRenderTarget != nullptr ? shadowMapRenderTarget->texture : nullptr;
 }
 
 cTexture* cSokolRender::GetLightMap() {
-    return pLightMap;
+    return lightMapRenderTarget != nullptr ? lightMapRenderTarget->texture : nullptr;
 }