sokol: Tweaks

IonAgorria · May 24, 2024 · d53e10d · d53e10d
1 parent a256fc8
commit d53e10d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/Source/Render/sokol/SokolRender.h b/Source/Render/sokol/SokolRender.h
@@ -106,8 +106,8 @@ class cSokolRender: public cInterfaceRenderDevice {
     struct RenderTarget final {
         cTexture* target_texture = nullptr;
         SokolTexture2D* depth_image = nullptr;
-        sg_pass render_pass{};
-        std::vector<SokolCommand*> commands;
+        sg_pass render_pass {};
+        std::vector<SokolCommand*> commands {};
     };
     std::vector<RenderTarget> render_targets;
 

diff --git a/Source/Render/sokol/SokolRenderPipeline.h b/Source/Render/sokol/SokolRenderPipeline.h
@@ -3,17 +3,6 @@
 
 #include "VertexFormat.h"
 
-const uint32_t PIPELINE_ID_MODE_MASK = 0xFFFF;
-const uint32_t PIPELINE_ID_MODE_BITS = 8;
-static_assert((1 << PIPELINE_ID_MODE_BITS) - 1 < PIPELINE_ID_MODE_MASK);
-const uint32_t PIPELINE_ID_VERTEX_FMT_BITS = (VERTEX_FMT_BITS - 1); //Remove 1 dedicated for Dot3 flag in D3D
-const uint32_t PIPELINE_ID_VERTEX_FMT_MASK = (1 << PIPELINE_ID_VERTEX_FMT_BITS) - 1;
-const uint32_t PIPELINE_ID_TYPE_MASK = 0xF;
-
-const uint32_t PIPELINE_ID_MODE_SHIFT = 0;
-const uint32_t PIPELINE_ID_VERTEX_FMT_SHIFT = 16;
-const uint32_t PIPELINE_ID_TYPE_SHIFT = PIPELINE_ID_VERTEX_FMT_SHIFT + PIPELINE_ID_VERTEX_FMT_BITS;
-
 const uint32_t PERIMETER_SOKOL_PIPELINES_MAX = 128;
 
 struct SokolPipeline {

diff --git a/Source/Render/sokol/SokolRenderState.cpp b/Source/Render/sokol/SokolRenderState.cpp
@@ -138,7 +138,7 @@ void cSokolRender::DoSokolRendering(sg_pass& render_pass, const std::vector<Soko
         const SokolPipeline* pipeline = command->pipeline;
         if (pipeline == nullptr) {
             //Not implemented vertex format
-            xxassert(0, "cSokolRender::EndScene missing pipeline for " + std::to_string(command->pipeline_id));
+            xxassert(0, "cSokolRender::EndScene missing pipeline");
             continue;
         }
 #if defined(PERIMETER_DEBUG) && 0
@@ -476,7 +476,7 @@ void cSokolRender::CreateCommandEmpty() {
     render_targets[0].commands.emplace_back(cmd);
 
 #ifdef PERIMETER_RENDER_TRACKER_COMMANDS
-    label = "Submit - Pipeline: " + std::to_string(pipeline_id)
+    label = "Submit"
             + " Vtxs: " + std::to_string(cmd->vertices)
             + " Idxs: " + std::to_string(cmd->indices)
             + " Tex0: " + std::to_string(reinterpret_cast<size_t>(cmd->sokol_textures[0]))
@@ -504,8 +504,7 @@ void cSokolRender::CreateCommand(VertexBuffer* vb, size_t vertices, IndexBuffer*
     }
 
 #ifdef PERIMETER_RENDER_TRACKER_COMMANDS
-    std::string label = "Pipeline: " + std::to_string(pipeline_id);
-    RenderSubmitEvent(RenderEvent::CREATE_COMMAND, label.c_str());
+    RenderSubmitEvent(RenderEvent::CREATE_COMMAND, "Start");
 #endif
 
 #ifdef PERIMETER_DEBUG
@@ -629,7 +628,7 @@ void cSokolRender::CreateCommand(VertexBuffer* vb, size_t vertices, IndexBuffer*
     render_targets[activeRenderTarget].commands.emplace_back(cmd);
 
 #ifdef PERIMETER_RENDER_TRACKER_COMMANDS
-    label = "Submit - Pipeline: " + std::to_string(pipeline_id)
+    label = "Submit"
             + " Vtxs: " + std::to_string(cmd->vertices)
             + " Idxs: " + std::to_string(cmd->indices)
             + " Tex0: " + std::to_string(reinterpret_cast<size_t>(cmd->sokol_textures[0]))