diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-01-24 17:09:18 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-01-26 18:35:59 +0300 |
| commit | fdb55e3719b20ef7e4f47cbd674c9f3aabf4520f (patch) | |
| tree | 0f8ade432187d0c2591ce1cd86474037e761d273 /source/blender/gpu/intern/gpu_codegen.c | |
| parent | 6cfc55c4f95f0fdf73a570d199004f5ad6c18fe2 (diff) | |
Code cleanup: use an enum for GPUNodeLink.image
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D1026
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index ee81abec2c3..ff94258028e 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -88,9 +88,6 @@ typedef struct GPUFunction { static const char *GPU_DATATYPE_STR[17] = {"", "float", "vec2", "vec3", "vec4", NULL, NULL, NULL, NULL, "mat3", NULL, NULL, NULL, NULL, NULL, NULL, "mat4"}; -#define LINK_IMAGE_BLENDER 1 -#define LINK_IMAGE_PREVIEW 2 - /* GLSL code parsing for finding function definitions. * These are stored in a hash for lookup when creating a material. */ @@ -993,7 +990,7 @@ static void gpu_node_input_link(GPUNode *node, GPUNodeLink *link, const GPUType input->type = GPU_VEC4; input->source = GPU_SOURCE_TEX; - if (link->image == LINK_IMAGE_PREVIEW) + if (link->image == GPU_NODE_LINK_IMAGE_PREVIEW) input->prv = link->ptr1; else { input->ima = link->ptr1; @@ -1198,7 +1195,7 @@ GPUNodeLink *GPU_image(Image *ima, ImageUser *iuser, bool is_data) { GPUNodeLink *link = GPU_node_link_create(); - link->image = LINK_IMAGE_BLENDER; + link->image = GPU_NODE_LINK_IMAGE_BLENDER; link->ptr1 = ima; link->ptr2 = iuser; link->image_isdata = is_data; @@ -1210,7 +1207,7 @@ GPUNodeLink *GPU_image_preview(PreviewImage *prv) { GPUNodeLink *link = GPU_node_link_create(); - link->image= LINK_IMAGE_PREVIEW; + link->image= GPU_NODE_LINK_IMAGE_PREVIEW; link->ptr1= prv; return link; |