Merge branch 'master' into feature/prelude-fix

2 files changed, 5 insertions, 10 deletions

diff --git a/prelude/slang-cpp-prelude.h b/prelude/slang-cpp-prelude.h
index d476676ed..d47b0463c 100644
--- a/prelude/slang-cpp-prelude.h
+++ b/prelude/slang-cpp-prelude.h
@@ -49,6 +49,4 @@
 #   define SLANG_UNROLL
 #endif
 
-#endif
-
-struct Context;
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/prelude/slang-cpp-types.h b/prelude/slang-cpp-types.h
index 311fa667d..7e951fd63 100644
--- a/prelude/slang-cpp-types.h
+++ b/prelude/slang-cpp-types.h
@@ -822,14 +822,11 @@ struct ComputeVaryingInput
     uint3 endGroupID;       ///< Non inclusive end groupID
 };
 
-/* Type that defines the uniform entry point params. The actual content of this type is dependent on the entry point parameters, and can be
-found via reflection or defined such that it matches the shader appropriately.
-*/
-struct UniformEntryPointParams;
-struct UniformState;
+// The uniformEntryPointParams and uniformState must be set to structures that match layout that the kernel expects.
+// This can be determined via reflection for example.
 
-typedef void(*ComputeThreadFunc)(ComputeThreadVaryingInput* varyingInput, UniformEntryPointParams* uniformEntryPointParams, UniformState* uniformState);
-typedef void(*ComputeFunc)(ComputeVaryingInput* varyingInput, UniformEntryPointParams* uniformEntryPointParams, UniformState* uniformState);
+typedef void(*ComputeThreadFunc)(ComputeThreadVaryingInput* varyingInput, void* uniformEntryPointParams, void* uniformState);
+typedef void(*ComputeFunc)(ComputeVaryingInput* varyingInput, void* uniformEntryPointParams, void* uniformState);
 
 #ifdef SLANG_PRELUDE_NAMESPACE
 }