archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

GPU: move gpu_shader_shared_utils.h to the public section of the module

Browse Source 
This is then easier to include in other modules.
This commit is contained in:
Clément Foucault
2022-02-05 22:41:08 +01:00
parent 2ee81bf285
commit 26b70fce8a
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/workbench/workbench_shader_shared.h
View File

@@ -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

2
source/blender/draw/intern/draw_shader_shared.h
View File

@@ -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

2
source/blender/gpu/CMakeLists.txt
View File

@@ -375,7 +375,7 @@ set(GLSL_SRC
shaders/gpu_shader_common_obinfos_lib.glsl
intern/gpu_shader_shared_utils.h
GPU_shader_shared_utils.h
)
set(GLSL_C)

2
source/blender/gpu/GPU_shader_shared.h
View File

@@ -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 {

0
source/blender/gpu/intern/gpu_shader_shared_utils.h → source/blender/gpu/GPU_shader_shared_utils.h
View File

2
source/blender/gpu/intern/gpu_shader.cc
View File

@@ -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());