diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-05-23 18:19:37 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-05-23 18:19:37 +0300 |
| commit | bce37bc52a54709c3672b38d924e91d40b374b6d (patch) | |
| tree | 701a0a220064d1ce21084e5f88daac7461de61ce | |
| parent | 7542dc460f338b7683290cdf94133f54ed98ce99 (diff) | |
Cleanup: GPU: Remove `gpu_shader_common_obinfos_lib.glsl`
This has been replaced by `draw_object_infos`.
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_shaders.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_common_obinfos_lib.glsl | 23 |
3 files changed, 0 insertions, 27 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c index 105600d2333..6fd5d97089d 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.c +++ b/source/blender/draw/engines/eevee/eevee_shaders.c @@ -169,7 +169,6 @@ extern char datatoc_common_hair_lib_glsl[]; extern char datatoc_common_math_lib_glsl[]; extern char datatoc_common_math_geom_lib_glsl[]; extern char datatoc_common_view_lib_glsl[]; -extern char datatoc_gpu_shader_common_obinfos_lib_glsl[]; extern char datatoc_gpu_shader_codegen_lib_glsl[]; extern char datatoc_ambient_occlusion_lib_glsl[]; @@ -278,7 +277,6 @@ static void eevee_shader_library_ensure(void) DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_view_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_uniforms_lib); - DRW_SHADER_LIB_ADD(e_data.lib, gpu_shader_common_obinfos_lib); DRW_SHADER_LIB_ADD(e_data.lib, gpu_shader_codegen_lib); DRW_SHADER_LIB_ADD(e_data.lib, random_lib); DRW_SHADER_LIB_ADD(e_data.lib, renderpass_lib); diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 7c6390971dd..6d84f71d92f 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -403,8 +403,6 @@ set(GLSL_SRC shaders/gpu_shader_cfg_world_clip_lib.glsl shaders/gpu_shader_colorspace_lib.glsl - shaders/gpu_shader_common_obinfos_lib.glsl - GPU_shader_shared_utils.h ) diff --git a/source/blender/gpu/shaders/gpu_shader_common_obinfos_lib.glsl b/source/blender/gpu/shaders/gpu_shader_common_obinfos_lib.glsl deleted file mode 100644 index f5b6de4899f..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_common_obinfos_lib.glsl +++ /dev/null @@ -1,23 +0,0 @@ - -#pragma BLENDER_REQUIRE(common_view_lib.glsl) - -#ifndef GPU_OBINFOS_UBO -# define GPU_OBINFOS_UBO -struct ObjectInfos { - vec4 drw_OrcoTexCoFactors[2]; - vec4 drw_ObjectColor; - vec4 drw_Infos; -}; - -# ifndef USE_GPU_SHADER_CREATE_INFO -layout(std140) uniform infoBlock -{ - /* DRW_RESOURCE_CHUNK_LEN = 512 */ - ObjectInfos drw_infos[512]; -}; -# endif - -# define OrcoTexCoFactors (drw_infos[resource_id].drw_OrcoTexCoFactors) -# define ObjectInfo (drw_infos[resource_id].drw_Infos) -# define ObjectColor (drw_infos[resource_id].drw_ObjectColor) -#endif |