fclem/blender
2
1
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

GPU: Shader Create Info GLSL-C++ stubs #3

Closed
Clément Foucault wants to merge 90 commits from create-info-cpp-macros into glsl-include
pull from: create-info-cpp-macros
merge into: fclem:glsl-include

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 90 Files Changed 158 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f6493ba3e - Show all commits

16
source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
View File

@ -8,7 +8,14 @@
* language. * language.
*/ */
#ifndef USE_GPU_SHADER_CREATE_INFO /* __cplusplus is true when compiling with MSL, so ensure we are not inside a shader. */
#if defined(GPU_SHADER) || defined(GLSL_CPP_STUBS)
# define IS_CPP 0
#else
# define IS_CPP 1
#endif
#if IS_CPP
# pragma once # pragma once
# include "BLI_math_bits.h" # include "BLI_math_bits.h"
@ -34,13 +41,6 @@ constexpr GPUSamplerState no_filter = GPUSamplerState::default_sampler();
constexpr GPUSamplerState with_filter = {GPU_SAMPLER_FILTERING_LINEAR}; constexpr GPUSamplerState with_filter = {GPU_SAMPLER_FILTERING_LINEAR};
#endif #endif
/* __cplusplus is true when compiling with MSL, so ensure we are not inside a shader. */
#ifdef GPU_SHADER
# define IS_CPP 0
#else
# define IS_CPP 1
#endif
/** WORKAROUND(@fclem): This is because this file is included before common_math_lib.glsl. */ /** WORKAROUND(@fclem): This is because this file is included before common_math_lib.glsl. */
#ifndef M_PI #ifndef M_PI
# define EEVEE_PI # define EEVEE_PI