cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major improvement: uniforms can now be set to default values. The syntax is the same as for setting any other values, f.ex. 'uniform Scalar a = 1; uniform Scalar b = 0.5 * a;'. Undefined uniforms are still allowed, but in this case the user should load a proper value into it during runtime. Default uniform values can be overwritten by calling any of the uniform loader funcions (like acDeviceLoadScalarUniform). Improved also error checking. Now there are explicit warnings if the user tries to load an invalid value into a device constant.

Browse Source
This commit is contained in:
jpekkila
2020-01-28 18:17:31 +02:00
parent 6dfe3ed4d6
commit 0ccd4e3dbc
9 changed files with 197 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/astaroth.h
View File

@@ -82,7 +82,7 @@ typedef enum {
} Stream;
#define STREAM_ALL (NUM_STREAMS)
#define AC_GEN_ID(X) X
#define AC_GEN_ID(X) X,
typedef enum {
AC_FOR_USER_INT_PARAM_TYPES(AC_GEN_ID) //
NUM_INT_PARAMS
@@ -115,7 +115,7 @@ typedef enum {
#undef AC_GEN_ID
#define _UNUSED __attribute__((unused)) // Does not give a warning if unused
#define AC_GEN_STR(X) #X
#define AC_GEN_STR(X) #X,
static const char* intparam_names[] _UNUSED = {AC_FOR_USER_INT_PARAM_TYPES(AC_GEN_STR)};
static const char* int3param_names[] _UNUSED = {AC_FOR_USER_INT3_PARAM_TYPES(AC_GEN_STR)};
static const char* realparam_names[] _UNUSED = {AC_FOR_USER_REAL_PARAM_TYPES(AC_GEN_STR)};
@@ -451,8 +451,10 @@ AcResult acDeviceLoadScalarArray(const Device device, const Stream stream,
const AcReal* data, const size_t num);
/** */
AcResult acDeviceLoadMeshInfo(const Device device, const Stream stream,
const AcMeshInfo device_config);
AcResult acDeviceLoadMeshInfo(const Device device, const AcMeshInfo device_config);
/** */
AcResult acDeviceLoadDefaultUniforms(const Device device);
/** */
AcResult acDeviceLoadVertexBufferWithOffset(const Device device, const Stream stream,