- rhi: refactor defs, remove pipeline constants

Author: SoapyMan

core/materialsystem1/Renderers/WGPU/WGPURenderAPI.cpp

@@ -832,16 +832,6 @@ IGPURenderPipelinePtr CWGPURenderAPI::CreateRenderPipeline(const RenderPipelineD
 	//    - primitiveTopology
 	//
 
-	// pipeline-overridable constants
-	Array<WGPUConstantEntry> rhiVertexPipelineConstants(PP_SL);
-	Array<WGPUConstantEntry> rhiFragmentPipelineConstants(PP_SL);
-
-	for (const PipelineConst& constant : pipelineDesc.vertex.constants)
-		rhiVertexPipelineConstants.append({ nullptr, _WSTR(constant.name), constant.value});
-
-	for (const PipelineConst& constant : pipelineDesc.fragment.constants)
-		rhiFragmentPipelineConstants.append({ nullptr, _WSTR(constant.name), constant.value });
-
 	WGPURenderPipelineDescriptor rhiRenderPipelineDesc = {};
 	if (pipelineLayout)
 	{
@@ -929,8 +919,6 @@ IGPURenderPipelinePtr CWGPURenderAPI::CreateRenderPipeline(const RenderPipelineD
 		rhiVertexState.entryPoint = _WSTR(pipelineDesc.vertex.shaderEntryPoint);
 		rhiVertexState.bufferCount = rhiVertexBufferLayoutList.numElem();
 		rhiVertexState.buffers = rhiVertexBufferLayoutList.ptr();
-		rhiVertexState.constants = rhiVertexPipelineConstants.ptr();
-		rhiVertexState.constantCount = rhiVertexPipelineConstants.numElem();
 
 		if (!rhiVertexState.module)
 		{
@@ -1020,8 +1008,6 @@ IGPURenderPipelinePtr CWGPURenderAPI::CreateRenderPipeline(const RenderPipelineD
 		rhiFragmentState.entryPoint = _WSTR(pipelineDesc.fragment.shaderEntryPoint);
 		rhiFragmentState.targetCount = rhiColorTargets.numElem();
 		rhiFragmentState.targets = rhiColorTargets.ptr();
-		rhiFragmentState.constants = rhiFragmentPipelineConstants.ptr();
-		rhiFragmentState.constantCount = rhiFragmentPipelineConstants.numElem();
 
 		if(!rhiFragmentState.module)
 		{
@@ -1260,14 +1246,7 @@ IGPUComputePipelinePtr CWGPURenderAPI::CreateComputePipeline(const ComputePipeli
 		}
 	}
 
-	Array<WGPUConstantEntry> rhiComputePipelineConstants(PP_SL);
-
-	for (const PipelineConst& constant : pipelineDesc.constants)
-		rhiComputePipelineConstants.append({ nullptr, _WSTR(constant.name), constant.value});
-
 	WGPUComputePipelineDescriptor rhiComputePipelineDesc = {};
-	rhiComputePipelineDesc.compute.constantCount = rhiComputePipelineConstants.numElem();
-	rhiComputePipelineDesc.compute.constants = rhiComputePipelineConstants.ptr();
 	rhiComputePipelineDesc.compute.entryPoint = _WSTR(pipelineDesc.shaderEntryPoint);
 	rhiComputePipelineDesc.compute.module = rhiComputeShaderModule;
 

public/materialsystem1/MeshBuilder.h

@@ -694,6 +694,15 @@ inline void CMeshBuilder::TexturedQuad3(const Vector3D& v1, const Vector3D& v2,
 	}
 }
 
+// EVertAttribFormat
+static const int s_attributeSize[] =
+{
+	0,
+	sizeof(ubyte),
+	sizeof(half),
+	sizeof(float)
+};
+
 inline void CMeshBuilder::CopyVertData(VertData& vert, bool isNormal)
 {
 	if(!vert.count)

public/materialsystem1/RenderDefs.h

@@ -246,14 +246,6 @@ struct RenderDrawCmd
 		return *this;
 	}
 
-	RenderDrawCmd& SetInstanceFormat(const MeshInstanceFormat& meshInst)
-	{
-		instanceInfo.instFormat.name = meshInst.name;
-		instanceInfo.instFormat.formatId = meshInst.nameHash;
-		instanceInfo.instFormat.layout = meshInst.layout;
-		return *this;
-	}
-
 	// DEPRECATED
 	RenderDrawCmd& SetInstanceFormat(const IVertexFormat* vertFormat)
 	{

public/materialsystem1/renderers/ShaderAPICaps.h

@@ -9,6 +9,7 @@
 #include "imaging/textureformats.h"
 
 static constexpr const int MAX_BINDGROUPS = 4;
+static constexpr const int MAX_BINDGROUP_BINDINGS = 64;	// be in this limit or use bindless
 static constexpr const int MAX_RENDERTARGETS = 8;
 static constexpr const int MAX_VERTEXSTREAM = 8;
 static constexpr const int MAX_TEXTUREUNIT = 16;