diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-04-19 16:14:33 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-04-19 20:03:40 +0300 |
commit | 37d298391e281ae301ee59e7614d836587c9931d (patch) | |
tree | b2887f12624891830c8980289af11a7b1fc973ed | |
parent | 2890c11cd7b008c3c261b6aa833c826c85cac504 (diff) |
Cleanup: GPUMaterial: Remove GPU_material_is_volume_shader
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_shaders_extra.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_material.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc index 7df26a95cfe..499c78723df 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc +++ b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc @@ -151,7 +151,7 @@ void eevee_shader_material_create_info_amend(GPUMaterial *gpumat, } frag_gen << "Closure nodetree_exec()\n"; frag_gen << "{\n"; - if (GPU_material_is_volume_shader(gpumat)) { + if (is_volume) { frag_gen << ((codegen.volume) ? codegen.volume : "return CLOSURE_DEFAULT;\n"); } else { diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 55fbe3f981f..57791b400d4 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -239,7 +239,6 @@ struct GPUUniformBuf *GPU_material_uniform_buffer_get(GPUMaterial *material); void GPU_material_uniform_buffer_create(GPUMaterial *material, ListBase *inputs); struct GPUUniformBuf *GPU_material_create_sss_profile_ubo(void); -bool GPU_material_is_volume_shader(GPUMaterial *mat); bool GPU_material_has_surface_output(GPUMaterial *mat); bool GPU_material_has_volume_output(GPUMaterial *mat); diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 21e40a67d5e..3d5e9723103 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -594,11 +594,6 @@ void GPU_material_status_set(GPUMaterial *mat, eGPUMaterialStatus status) /* Code generation */ -bool GPU_material_is_volume_shader(GPUMaterial *mat) -{ - return mat->is_volume_shader; -} - bool GPU_material_has_surface_output(GPUMaterial *mat) { return mat->has_surface_output; |