Move BatchGroup to material template compilation.

There is no longer a need to build a table of unique batch IDs since we now compile our materials. This also simplifies the batch lookup process and debugging slightly.

code/foundation/util/string.h

@@ -46,7 +46,6 @@ namespace Math
 namespace Util
 {
 class Blob;
-
 class String
 {
 public:
@@ -353,6 +352,8 @@ class String
     static String FromBase64(const String&);
     /// convert from "anything"
     template<typename T> static String From(const T& t);
+    /// Hash a string
+    static constexpr uint Hash(const char* c, std::size_t s);
 
     /// construct a hex string from an int
     template<typename INTEGER>
@@ -691,20 +692,8 @@ String::IsValid() const
 inline uint32_t
 String::HashCode() const
 {
-    uint32_t hash = 0;
     const char* ptr = this->AsCharPtr();
-    SizeT len = this->strLen;
-    SizeT i;
-    for (i = 0; i < len; i++)
-    {
-        hash += ptr[i];
-        hash += hash << 10;
-        hash ^= hash >>  6;
-    }
-    hash += hash << 3;
-    hash ^= hash >> 11;
-    hash += hash << 15;
-    return hash;
+    return Hash(ptr, this->strLen);
 }
 
 //------------------------------------------------------------------------------
@@ -1190,6 +1179,27 @@ String::AppendMat4(const Math::mat4& val)
     this->Append(FromMat4(val));
 }
 #endif
+
+
+//------------------------------------------------------------------------------
+/**
+*/
+constexpr uint
+String::Hash(const char* c, std::size_t s)
+{
+    uint hash = 0;
+    std::size_t i;
+    for (i = 0; i < s; i++)
+    {
+        hash += c[i];
+        hash += hash << 10;
+        hash ^= hash >> 6;
+    }
+    hash += hash << 3;
+    hash ^= hash >> 11;
+    hash += hash << 15;
+    return hash;
+}
 
 inline auto Format = &String::Sprintf;
 
@@ -1209,22 +1219,8 @@ Util::String operator ""_str(const char* c, std::size_t s);
 constexpr uint
 operator ""_hash(const char* c, std::size_t s)
 {
-    uint hash = 0;
-    const char* ptr = c;
-    std::size_t len = s;
-    std::size_t i;
-    for (i = 0; i < len; i++)
-    {
-        hash += ptr[i];
-        hash += hash << 10;
-        hash ^= hash >> 6;
-    }
-    hash += hash << 3;
-    hash ^= hash >> 11;
-    hash += hash << 15;
-    return hash;
+    return Util::String::Hash(c, s);
 }
 
-
 //------------------------------------------------------------------------------
 

code/render/CMakeLists.txt

@@ -124,8 +124,6 @@ ENDIF()
                 antialiasquality.cc
                 antialiasquality.h
                 barrier.h
-                batchgroup.cc
-                batchgroup.h
                 buffer.cc
                 buffer.h
                 gpubuffertypes.h

code/render/frame/framescriptloader.cc

@@ -1138,9 +1138,9 @@ void
 FrameScriptLoader::ParseSubpassBatch(const Ptr<Frame::FrameScript>& script, Frame::FrameSubpass* subpass, JzonValue* node)
 {
     JzonValue* name = jzon_get(node, "name");
-    CoreGraphics::BatchGroup::Code batch = CoreGraphics::BatchGroup::FromName(name->string_value);
+    MaterialTemplates::BatchGroup batch = MaterialTemplates::BatchGroupFromName(name->string_value);
     n_assert(name != nullptr);
-    if (MaterialTemplates::Configs.FindIndex(batch) == InvalidIndex)
+    if (batch == MaterialTemplates::BatchGroup::Invalid)
     {
         n_warning("[FrameScript] - Skipping, batch with name '%s' because it's not rendered by any material\n", name->string_value);
         return;
@@ -1158,7 +1158,7 @@ FrameScriptLoader::ParseSubpassBatch(const Ptr<Frame::FrameScript>& script, Fram
         ParseResourceDependencies(script, op, inputs);
     }
 
-    op->batch = CoreGraphics::BatchGroup::FromName(name->string_value);
+    op->batch = batch;
     subpass->AddChild(op);
 }
 
@@ -1169,9 +1169,9 @@ void
 FrameScriptLoader::ParseSubpassSortedBatch(const Ptr<Frame::FrameScript>& script, Frame::FrameSubpass* subpass, JzonValue* node)
 {
     JzonValue* name = jzon_get(node, "name");
-    CoreGraphics::BatchGroup::Code batch = CoreGraphics::BatchGroup::FromName(name->string_value);
+    MaterialTemplates::BatchGroup batch = MaterialTemplates::BatchGroupFromName(name->string_value);
     n_assert(name != nullptr);
-    if (MaterialTemplates::Configs.FindIndex(batch) == InvalidIndex)
+    if (batch == MaterialTemplates::BatchGroup::Invalid)
     {
         n_warning("Skipping, batch with name '%s' because it's not rendered by any material\n", name->string_value);
         return;

code/render/frame/framesubpassbatch.cc

@@ -58,11 +58,11 @@ FrameSubpassBatch::AllocCompiled(Memory::ArenaAllocator<BIG_CHUNK>& allocator)
 /**
 */
 void
-FrameSubpassBatch::DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, CoreGraphics::BatchGroup::Code batch, const Graphics::GraphicsEntityId id, const IndexT bufferIndex)
+FrameSubpassBatch::DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, MaterialTemplates::BatchGroup batch, const Graphics::GraphicsEntityId id, const IndexT bufferIndex)
 {
     // get current view and visibility draw list
     const Visibility::ObserverContext::VisibilityDrawList* drawList = Visibility::ObserverContext::GetVisibilityDrawList(id);
-    const Util::Array<MaterialTemplates::Entry*>& types = MaterialTemplates::Configs[batch];
+    const Util::Array<MaterialTemplates::Entry*>& types = MaterialTemplates::Configs[(uint)batch];
     if (types.Size() != 0 && (drawList != nullptr))
     {
         for (IndexT typeIdx = 0; typeIdx < types.Size(); typeIdx++)
@@ -153,11 +153,11 @@ FrameSubpassBatch::DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, CoreGraphic
 /**
 */
 void
-FrameSubpassBatch::DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, CoreGraphics::BatchGroup::Code batch, const Graphics::GraphicsEntityId id, const SizeT numInstances, const IndexT baseInstance, const IndexT bufferIndex)
+FrameSubpassBatch::DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, MaterialTemplates::BatchGroup batch, const Graphics::GraphicsEntityId id, const SizeT numInstances, const IndexT baseInstance, const IndexT bufferIndex)
 {
     // get current view and visibility draw list
     const Visibility::ObserverContext::VisibilityDrawList* drawList = Visibility::ObserverContext::GetVisibilityDrawList(id);
-    const Util::Array<MaterialTemplates::Entry*>& types = MaterialTemplates::Configs[batch];
+    const Util::Array<MaterialTemplates::Entry*>& types = MaterialTemplates::Configs[(uint)batch];
     if (types.Size() != 0 && (drawList != nullptr))
     {
         for (IndexT typeIdx = 0; typeIdx < types.Size(); typeIdx++)

code/render/frame/framesubpassbatch.h

@@ -8,7 +8,7 @@
 */
 //------------------------------------------------------------------------------
 #include "frameop.h"
-#include "coregraphics/batchgroup.h"
+#include "materials/materialtemplates.h"
 #include "graphics/graphicsentity.h"
 namespace Frame
 {
@@ -24,16 +24,16 @@ class FrameSubpassBatch : public FrameOp
     {
         void Run(const CoreGraphics::CmdBufferId cmdBuf, const IndexT frameIndex, const IndexT bufferIndex) override;
 
-        CoreGraphics::BatchGroup::Code batch;
+        MaterialTemplates::BatchGroup batch;
     };
 
     FrameOp::Compiled* AllocCompiled(Memory::ArenaAllocator<BIG_CHUNK>& allocator);
-    CoreGraphics::BatchGroup::Code batch;
+    MaterialTemplates::BatchGroup batch;
 
     /// Do the actual drawing
-    static void DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, CoreGraphics::BatchGroup::Code batch, const Graphics::GraphicsEntityId id, const IndexT bufferIndex);
+    static void DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, MaterialTemplates::BatchGroup batch, const Graphics::GraphicsEntityId id, const IndexT bufferIndex);
     /// Do the actual drawing, but with duplicate instances
-    static void DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, CoreGraphics::BatchGroup::Code batch, const Graphics::GraphicsEntityId id, const SizeT numInstances, const IndexT baseInstance, const IndexT bufferIndex);
+    static void DrawBatch(const CoreGraphics::CmdBufferId cmdBuf, MaterialTemplates::BatchGroup batch, const Graphics::GraphicsEntityId id, const SizeT numInstances, const IndexT baseInstance, const IndexT bufferIndex);
 };
 
 } // namespace Frame2

code/render/frame/framesubpassorderedbatch.h

@@ -9,7 +9,6 @@
 */
 //------------------------------------------------------------------------------
 #include "frameop.h"
-#include "coregraphics/batchgroup.h"
 namespace Frame
 {
 class FrameSubpassOrderedBatch : public FrameOp
@@ -24,12 +23,12 @@ class FrameSubpassOrderedBatch : public FrameOp
     {
         void Run(const CoreGraphics::CmdBufferId cmdBuf, const IndexT frameIndex, const IndexT bufferIndex) override;
 
-        CoreGraphics::BatchGroup::Code batch;
+        MaterialTemplates::BatchGroup batch;
     };
 
     FrameOp::Compiled* AllocCompiled(Memory::ArenaAllocator<BIG_CHUNK>& allocator);
 
-    CoreGraphics::BatchGroup::Code batch;
+    MaterialTemplates::BatchGroup batch;
 };
 
 } // namespace Frame2

code/render/graphics/graphicsserver.h

@@ -15,7 +15,6 @@
 #include "framesync/framesynctimer.h"
 #include "util/stringatom.h"
 #include "ids/idgenerationpool.h"
-#include "coregraphics/batchgroup.h"
 #include "stage.h"
 #include "graphicsentity.h"
 #include "coregraphics/graphicsdevice.h"
@@ -123,7 +122,6 @@ class GraphicsServer : public Core::RefCounted
     void OnWindowResized(CoreGraphics::WindowId wndId);
 
 private:
-    friend class CoreGraphics::BatchGroup;
 
     Ids::IdGenerationPool entityPool;
 
@@ -136,7 +134,6 @@ class GraphicsServer : public Core::RefCounted
 
     Util::Array<Ptr<Stage>> stages;
     Util::Array<Ptr<View>> views;
-    CoreGraphics::BatchGroup batchGroupRegistry;
     Ptr<View> currentView;
 
     Ptr<CoreGraphics::DisplayDevice> displayDevice;

code/render/lighting/lightcontext.cc

@@ -57,8 +57,8 @@ struct
     CoreGraphics::TextureId terrainShadowMap = CoreGraphics::InvalidTextureId;
     uint terrainShadowMapSize;
     uint terrainSize;
-    CoreGraphics::BatchGroup::Code spotlightsBatchCode;
-    CoreGraphics::BatchGroup::Code globalLightsBatchCode;
+    MaterialTemplates::BatchGroup spotlightsBatchCode;
+    MaterialTemplates::BatchGroup globalLightsBatchCode;
 
     CSMUtil csmUtil{ Shared::NUM_CASCADES };
 
@@ -153,8 +153,8 @@ LightContext::Create(const Ptr<Frame::FrameScript>& frameScript)
 #endif
 
     // create shadow mapping frame script
-    lightServerState.spotlightsBatchCode = CoreGraphics::BatchGroup::FromName("SpotLightShadow");
-    lightServerState.globalLightsBatchCode = CoreGraphics::BatchGroup::FromName("GlobalShadow");
+    lightServerState.spotlightsBatchCode = MaterialTemplates::BatchGroupFromName("SpotLightShadow");
+    lightServerState.globalLightsBatchCode = MaterialTemplates::BatchGroupFromName("GlobalShadow");
     lightServerState.globalLightShadowMap = frameScript->GetTexture("SunShadowDepth");
     lightServerState.localLightShadows = frameScript->GetTexture("LocalLightShadow");
     if (lightServerState.terrainShadowMap == CoreGraphics::InvalidTextureId)
@@ -580,7 +580,6 @@ LightContext::SetupAreaLight(
 
     const MaterialTemplates::MaterialTemplateValue& value = MaterialTemplates::base::__AreaLight.__EmissiveColor;
     void* mem = Materials::MaterialLoader::AllocateConstantMemory(value.GetSize());
-    const Materials::ShaderConfigBatchConstant* batchConstant = &MaterialTemplates::base::__AreaLight.__LightMeshes_EmissiveColor;
 
     MaterialInterfaces::ArealightMaterial* data = (MaterialInterfaces::ArealightMaterial*)StackAlloc(matTemplate->bufferSize);
     (color * intensity).store(data->EmissiveColor);

code/render/materials/material.cc

@@ -310,9 +310,9 @@ MaterialGetTemplate(const MaterialId mat)
 /**
 */
 const Materials::BatchIndex
-MaterialGetBatchIndex(const MaterialId mat, const CoreGraphics::BatchGroup::Code code)
+MaterialGetBatchIndex(const MaterialId mat, const MaterialTemplates::BatchGroup batch)
 {
-    return materialAllocator.Get<Material_Template>(mat.id)->passes[code]->index;
+    return materialAllocator.Get<Material_Template>(mat.id)->passes[batch]->index;
 }
 
 //------------------------------------------------------------------------------