diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-23 06:15:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-23 06:16:03 +0300 |
| commit | 2e4f1b592f7d1b63ec012528997fab64f16c0416 (patch) | |
| tree | e53da8d758e3f3454afd27064d2382260653e210 /source/blender/gpu/intern/gpu_material.c | |
| parent | 14d947dcadea7c9debe6c8a078a571eba6cb828c (diff) | |
Cleanup: use eGPU prefix for GPU enum types
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 1137c382593..d1062f70c24 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -70,7 +70,7 @@ struct GPUMaterial { Scene *scene; /* DEPRECATED was only useful for lamps */ Material *ma; - GPUMaterialStatus status; + eGPUMaterialStatus status; const void *engine_type; /* attached engine type */ int options; /* to identify shader variations (shadow, probe, world background...) */ @@ -215,7 +215,7 @@ void GPU_material_free(ListBase *gpumaterial) BLI_freelistN(gpumaterial); } -GPUBuiltin GPU_get_material_builtins(GPUMaterial *material) +eGPUBuiltin GPU_get_material_builtins(GPUMaterial *material) { return material->builtins; } @@ -586,7 +586,7 @@ void gpu_material_add_node(GPUMaterial *material, GPUNode *node) } /* Return true if the material compilation has not yet begin or begin. */ -GPUMaterialStatus GPU_material_status(GPUMaterial *mat) +eGPUMaterialStatus GPU_material_status(GPUMaterial *mat) { return mat->status; } @@ -611,12 +611,12 @@ bool GPU_material_use_domain_volume(GPUMaterial *mat) return (mat->domain & GPU_DOMAIN_VOLUME); } -void GPU_material_flag_set(GPUMaterial *mat, GPUMatFlag flag) +void GPU_material_flag_set(GPUMaterial *mat, eGPUMatFlag flag) { mat->flag |= flag; } -bool GPU_material_flag_get(GPUMaterial *mat, GPUMatFlag flag) +bool GPU_material_flag_get(GPUMaterial *mat, eGPUMatFlag flag) { return (mat->flag & flag); } |