diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-06 00:46:04 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-06 00:46:04 +0300 |
| commit | 29824c6ed3bc8a874309ae76ce6552b45cdd13a0 (patch) | |
| tree | 33dfd3a038e3d6d8812ca08a93062f2065801c99 | |
| parent | e3027906d72f188c4ba8b5671e0213ec4a72b495 (diff) | |
| parent | 26b70fce8ae7c9174f4e410fc1f36075a9b333f3 (diff) | |
Merge branch 'master' into eevee-rewrite
# Conflicts:
# source/blender/gpu/CMakeLists.txt
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_shader_shared.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_shader_shared.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_shader_shared.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_shader_shared_utils.h (renamed from source/blender/gpu/intern/gpu_shader_shared_utils.h) | 0 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.cc | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_shader_shared.h b/source/blender/draw/engines/workbench/workbench_shader_shared.h index 0bfd5957834..c63760a634d 100644 --- a/source/blender/draw/engines/workbench/workbench_shader_shared.h +++ b/source/blender/draw/engines/workbench/workbench_shader_shared.h @@ -1,6 +1,6 @@ #ifndef GPU_SHADER -# include "gpu_shader_shared_utils.h" +# include "GPU_shader_shared_utils.h" #endif #define WORKBENCH_SHADER_SHARED_H diff --git a/source/blender/draw/intern/draw_shader_shared.h b/source/blender/draw/intern/draw_shader_shared.h index c292c9d37bd..b19d4542b22 100644 --- a/source/blender/draw/intern/draw_shader_shared.h +++ b/source/blender/draw/intern/draw_shader_shared.h @@ -1,6 +1,6 @@ #ifndef GPU_SHADER -# include "gpu_shader_shared_utils.h" +# include "GPU_shader_shared_utils.h" #endif #define DRW_SHADER_SHARED_H diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index f33f5a5ae0c..2e802844f71 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -372,7 +372,7 @@ set(GLSL_SRC shaders/gpu_shader_cfg_world_clip_lib.glsl shaders/gpu_shader_colorspace_lib.glsl - intern/gpu_shader_shared_utils.h + GPU_shader_shared_utils.h ) set(GLSL_C) diff --git a/source/blender/gpu/GPU_shader_shared.h b/source/blender/gpu/GPU_shader_shared.h index eeca7ee6caa..636a8f53ba6 100644 --- a/source/blender/gpu/GPU_shader_shared.h +++ b/source/blender/gpu/GPU_shader_shared.h @@ -22,7 +22,7 @@ */ #ifndef USE_GPU_SHADER_CREATE_INFO -# include "intern/gpu_shader_shared_utils.h" +# include "GPU_shader_shared_utils.h" #endif struct NodeLinkData { diff --git a/source/blender/gpu/intern/gpu_shader_shared_utils.h b/source/blender/gpu/GPU_shader_shared_utils.h index 0d283fb1e66..0d283fb1e66 100644 --- a/source/blender/gpu/intern/gpu_shader_shared_utils.h +++ b/source/blender/gpu/GPU_shader_shared_utils.h diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc index 3bf938f10bb..c3842ae2995 100644 --- a/source/blender/gpu/intern/gpu_shader.cc +++ b/source/blender/gpu/intern/gpu_shader.cc @@ -306,7 +306,7 @@ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info) Vector<const char *> typedefs; if (!info.typedef_sources_.is_empty() || !info.typedef_source_generated.empty()) { - typedefs.append(gpu_shader_dependency_get_source("gpu_shader_shared_utils.h").c_str()); + typedefs.append(gpu_shader_dependency_get_source("GPU_shader_shared_utils.h").c_str()); } if (!info.typedef_source_generated.empty()) { typedefs.append(info.typedef_source_generated.c_str()); |