Browse Source

Move ApplyIrradianceToReflection to the new format

Panagiotis Christopoulos Charitos 5 years ago
parent
commit
b75e7f2bb2

+ 0 - 0
shaders/ApplyIrradianceToReflection.glslp → shaders/ApplyIrradianceToReflection.ankiprog


+ 5 - 4
src/anki/renderer/ProbeReflections.cpp

@@ -176,11 +176,12 @@ Error ProbeReflections::initIrradiance(const ConfigSet& config)
 Error ProbeReflections::initIrradianceToRefl(const ConfigSet& cfg)
 {
 	// Create program
-	ANKI_CHECK(
-		m_r->getResourceManager().loadResource("shaders/ApplyIrradianceToReflection.glslp", m_irradianceToRefl.m_prog));
+	ANKI_CHECK(m_r->getResourceManager().loadResource(
+		"shaders/ApplyIrradianceToReflection.ankiprog", m_irradianceToRefl.m_prog));
 
-	const ShaderProgramResourceVariant* variant;
-	m_irradianceToRefl.m_prog->getOrCreateVariant(variant);
+	const ShaderProgramResourceVariant2* variant;
+	m_irradianceToRefl.m_prog->getOrCreateVariant(
+		ShaderProgramResourceVariantInitInfo2(m_irradianceToRefl.m_prog), variant);
 	m_irradianceToRefl.m_grProg = variant->getProgram();
 
 	return Error::NONE;

+ 1 - 1
src/anki/renderer/ProbeReflections.h

@@ -89,7 +89,7 @@ private:
 	class
 	{
 	public:
-		ShaderProgramResourcePtr m_prog;
+		ShaderProgramResource2Ptr m_prog;
 		ShaderProgramPtr m_grProg;
 	} m_irradianceToRefl; ///< Apply irradiance back to the reflection.
 

+ 0 - 1
src/anki/util/Serializer.cpp

@@ -10,7 +10,6 @@ namespace anki
 
 Error BinarySerializer::doDynamicArrayBasicType(const void* arr, PtrSize size, U32 alignment, PtrSize memberOffset)
 {
-	ANKI_ASSERT(arr);
 	check();
 
 	if(size == 0)

+ 1 - 1
src/anki/util/Serializer.h

@@ -120,7 +120,7 @@ public:
 	template<typename T>
 	void doPointer(CString varName, PtrSize memberOffset, const T* ptr)
 	{
-		doDynamicArray(varName, memberOffset, ptr, 1);
+		doDynamicArray(varName, memberOffset, ptr, (ptr) ? 1 : 0);
 	}
 
 	/// Write a dynamic array of complex types. Can't call this directly.