Revision 9b2b34d2
Added by Leszek Koltunski 6 days ago
| src/main/res/raw/main_vertex_shader.glsl | ||
|---|---|---|
| 47 | 47 |
}; |
| 48 | 48 |
#endif |
| 49 | 49 |
|
| 50 |
#ifdef BUGGY_UBOS |
|
| 51 |
layout (packed) uniform componentAssociation |
|
| 52 |
{
|
|
| 53 |
ivec2 vComAssoc[MAX_COMPON]; // component 'AND' and 'EQU' Associations |
|
| 54 |
}; |
|
| 55 |
#else |
|
| 56 |
layout (std140) uniform componentAssociation |
|
| 57 |
{
|
|
| 58 |
ivec4 vComAssoc[MAX_COMPON]; // component 'AND' and 'EQU' Associations |
|
| 59 |
}; |
|
| 60 |
#endif |
|
| 61 |
|
|
| 50 | 62 |
#if NUM_VERTEX>0 |
| 51 | 63 |
uniform int vNumEffects; // total number of vertex effects |
| 52 | 64 |
|
| ... | ... | |
| 66 | 78 |
// second vec4: first float - cache, next 3: Center, the third - the Region. |
| 67 | 79 |
}; |
| 68 | 80 |
|
| 69 |
#ifdef BUGGY_UBOS |
|
| 70 |
layout (packed) uniform componentAssociation |
|
| 71 |
{
|
|
| 72 |
ivec2 vComAssoc[MAX_COMPON]; // component 'AND' and 'EQU' Associations |
|
| 73 |
}; |
|
| 74 |
#else |
|
| 75 |
layout (std140) uniform componentAssociation |
|
| 76 |
{
|
|
| 77 |
ivec4 vComAssoc[MAX_COMPON]; // component 'AND' and 'EQU' Associations |
|
| 78 |
}; |
|
| 79 |
#endif |
|
| 80 |
|
|
| 81 | 81 |
////////////////////////////////////////////////////////////////////////////////////////////// |
| 82 | 82 |
// HELPER FUNCTIONS |
| 83 | 83 |
////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Bugfix in the main vertex shader: now the 'component association' buffers might be needed even if there are no vertex effects.