Skip to content

Commit 162f2d6

Browse files
Merge pull request #77 from Przemog1/mesh_packer
Temporary Merge to try things out.
2 parents b4c0d1c + e740765 commit 162f2d6

File tree

3 files changed

+356
-219
lines changed

3 files changed

+356
-219
lines changed

examples_tests/20.Megatexture/main.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,14 @@ struct PCstruct
6464
float Ni;
6565
uint extra; //flags copied from MTL metadata
6666
};
67+
#define nbl_glsl_MaterialParametersStruct PCstruct
68+
#define _NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
69+
6770
layout (push_constant) uniform Block {
68-
PCstruct params;
71+
nbl_glsl_MaterialParametersStruct params;
6972
} PC;
7073
#define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
7174
72-
7375
#ifndef _NO_UV
7476
uint nbl_glsl_VT_layer2pid(in uint layer)
7577
{

0 commit comments

Comments
 (0)