diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-09-14 02:02:10 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-09-14 02:03:19 +0300 |
| commit | 3b080c3f66c05751f02af9a3f509c1a46b34ba20 (patch) | |
| tree | 088047279fa0fde5815cbea609e45b2e2239d91b /source/blender/gpu/GPU_material.h | |
| parent | a01fbc66897b440589a86ce1e1008a91bc28b14d (diff) | |
GPUCodegen: Add New GPU_SOURCE_STRUCT to be used for Closure Sockets
This way we dont rely on the static array of chars that was causing T52385.
That fixes T52385.
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 47035c8c64e..7bc256a70fa 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -70,6 +70,7 @@ typedef struct GPUParticleInfo GPUParticleInfo; /* Functions to create GPU Materials nodes */ typedef enum GPUType { + /* Keep in sync with GPU_DATATYPE_STR */ /* The value indicates the number of elements in each type */ GPU_NONE = 0, GPU_FLOAT = 1, @@ -79,11 +80,15 @@ typedef enum GPUType { GPU_MAT3 = 9, GPU_MAT4 = 16, - GPU_CLOSURE = 17, - + /* Values not in GPU_DATATYPE_STR */ GPU_TEX2D = 1002, GPU_SHADOW2D = 1003, GPU_TEXCUBE = 1004, + + /* GLSL Struct types */ + GPU_CLOSURE = 1005, + + /* Opengl Attributes */ GPU_ATTRIB = 3001 } GPUType; |