diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-01-24 17:50:03 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-01-26 18:36:07 +0300 |
| commit | c5f5012c5a1b30ee757244782584cab087e22999 (patch) | |
| tree | 72b78c749cf7cd6576a1af75bdbef9935d21dbce /source/blender/gpu/intern/gpu_codegen.h | |
| parent | 8174ea2684b8d144de10508c1766117abe4b6a9a (diff) | |
Code cleanup: use GPUDynamicType instead of int
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D1026
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.h')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index 8b63af925a6..c76341afa00 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -94,7 +94,7 @@ struct GPUNodeLink { void *ptr1, *ptr2; bool dynamic; - int dynamictype; + GPUDynamicType dynamictype; GPUType type; @@ -131,7 +131,7 @@ typedef struct GPUInput { int attribid; /* id for vertex attributes */ bool bindtex; /* input is responsible for binding the texture? */ bool definetex; /* input is responsible for defining the pixel? */ - int textarget; /* GL_TEXTURE_* */ + int textarget; /* GL texture target, e.g. GL_TEXTURE_2D */ GPUType textype; /* datatype */ struct Image *ima; /* image */ @@ -139,7 +139,7 @@ typedef struct GPUInput { struct PreviewImage *prv; /* preview images & icons */ bool image_isdata; /* image does not contain color data */ float *dynamicvec; /* vector data in case it is dynamic */ - int dynamictype; /* origin of the dynamic uniform (GPUDynamicType) */ + GPUDynamicType dynamictype; /* origin of the dynamic uniform */ void *dynamicdata; /* data source of the dynamic uniform */ struct GPUTexture *tex; /* input texture, only set at runtime */ int shaderloc; /* id from opengl */ |