Merge branch 'master' into mesh_loader
This commit is contained in:
@@ -10,6 +10,7 @@ TYPE(JSONAsset, struct {
|
||||
PTR json_data;
|
||||
})
|
||||
|
||||
|
||||
TYPE(MeshAsset, struct {
|
||||
uint32_t vertexBuferSize;
|
||||
uint32_t vertexCount;
|
||||
@@ -18,4 +19,26 @@ TYPE(MeshAsset, struct {
|
||||
uint32_t indexBuferSize;
|
||||
uint32_t indexCount;
|
||||
uint32_t *indexData;
|
||||
|
||||
TYPE(ShaderAssetStage, enum {
|
||||
EV_SHADERASSETSTAGE_VERTEX,
|
||||
EV_SHADERASSETSTAGE_FRAGMENT,
|
||||
EV_SHADERASSETSTAGE_COMPUTE,
|
||||
EV_SHADERASSETSTAGE_GEOMETRY,
|
||||
|
||||
EV_SHADERASSETSTAGE_DETECT,
|
||||
|
||||
EV_SHADERASSETSTAGE_COUNT
|
||||
})
|
||||
|
||||
TYPE(CompiledShaderType, enum {
|
||||
EV_SHADER_ASM,
|
||||
EV_SHADER_BIN
|
||||
})
|
||||
|
||||
TYPE(ShaderAsset, struct {
|
||||
PTR binary;
|
||||
U64 len;
|
||||
GenericHandle internal_handle;
|
||||
CompiledShaderType type;
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user