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 +31 -25
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 20d11b10e4 - Show all commits

34
source/blender/gpu/shaders/gpu_glsl_cpp_stubs.hh
View File

@ -2,7 +2,11 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include <type_traits> #pragma once
#if defined(__cplusplus) && !defined(GPU_SHADER)
# include <type_traits>
template<typename T, int Sz> struct VecBase {}; template<typename T, int Sz> struct VecBase {};
@ -39,7 +43,7 @@ template<typename T, int Sz> struct VecOp {
friend VecT operator/(T, VecT) {} friend VecT operator/(T, VecT) {}
friend VecT operator*(T, VecT) {} friend VecT operator*(T, VecT) {}
#define INT_OP \ # define INT_OP \
template<typename U = _T, typename std::enable_if_t<std::is_integral_v<U>> * = nullptr> template<typename U = _T, typename std::enable_if_t<std::is_integral_v<U>> * = nullptr>
INT_OP VecT operator%(VecT) const {} INT_OP VecT operator%(VecT) const {}
@ -67,7 +71,7 @@ template<typename T, int Sz> struct VecOp {
INT_OP friend VecT operator|(T, VecT) {} INT_OP friend VecT operator|(T, VecT) {}
INT_OP friend VecT operator^(T, VecT) {} INT_OP friend VecT operator^(T, VecT) {}
#undef INT_OP # undef INT_OP
}; };
template<typename T> struct VecSwizzle2 { template<typename T> struct VecSwizzle2 {
@ -330,11 +334,11 @@ template<int D> bool any(VecBase<bool, D>) {}
template<int D> bool all(VecBase<bool, D>) {} template<int D> bool all(VecBase<bool, D>) {}
/* `not` is a C++ keyword. Use dirty macro to allow this. */ /* `not` is a C++ keyword. Use dirty macro to allow this. */
template<int D> VecBase<bool, D> not_impl(VecBase<bool, D>) {} template<int D> VecBase<bool, D> not_impl(VecBase<bool, D>) {}
#define not not_impl # define not not_impl
#define inout # define inout
#define in # define in
#define out # define out
template<typename T> using Vec4 = VecBase<T, 4>; template<typename T> using Vec4 = VecBase<T, 4>;
template<int D> using VecInt = VecBase<int, D>; template<int D> using VecInt = VecBase<int, D>;
@ -352,7 +356,7 @@ template<typename T, int Dimensions, bool Cube = false, bool Array = false> stru
using size_vec_type = VecBase<int, extent_dim>; using size_vec_type = VecBase<int, extent_dim>;
}; };
#define TEX_TEMPLATE \ # define TEX_TEMPLATE \
template<typename T, \ template<typename T, \
typename IntCoord = typename T::int_coord_type, \ typename IntCoord = typename T::int_coord_type, \
typename FltCoord = typename T::flt_coord_type, \ typename FltCoord = typename T::flt_coord_type, \
@ -368,7 +372,7 @@ TEX_TEMPLATE DataVec textureGather(T, FltCoord) {}
TEX_TEMPLATE DataVec textureGrad(T, FltCoord, DerivVec, DerivVec) {} TEX_TEMPLATE DataVec textureGrad(T, FltCoord, DerivVec, DerivVec) {}
TEX_TEMPLATE DataVec textureLod(T, FltCoord, double) {} TEX_TEMPLATE DataVec textureLod(T, FltCoord, double) {}
#undef TEX_TEMPLATE # undef TEX_TEMPLATE
using sampler1D = SamplerBase<double, 1>; using sampler1D = SamplerBase<double, 1>;
using sampler2D = SamplerBase<double, 2>; using sampler2D = SamplerBase<double, 2>;
@ -405,7 +409,7 @@ template<typename T, int Dimensions, bool Array = false> struct ImageBase {
using size_vec_type = VecBase<int, extent_dim>; using size_vec_type = VecBase<int, extent_dim>;
}; };
#define IMG_TEMPLATE \ # define IMG_TEMPLATE \
template<typename T, \ template<typename T, \
typename IntCoord = typename T::int_coord_type, \ typename IntCoord = typename T::int_coord_type, \
typename DataVec = typename T::data_vec_type, \ typename DataVec = typename T::data_vec_type, \
@ -415,10 +419,10 @@ IMG_TEMPLATE SizeVec imageSize(T) {}
IMG_TEMPLATE DataVec imageLoad(T, IntCoord) {} IMG_TEMPLATE DataVec imageLoad(T, IntCoord) {}
IMG_TEMPLATE void imageStore(T, IntCoord, DataVec) {} IMG_TEMPLATE void imageStore(T, IntCoord, DataVec) {}
IMG_TEMPLATE void imageFence(T) {} IMG_TEMPLATE void imageFence(T) {}
#define imageLoadFast imageLoad # define imageLoadFast imageLoad
#define imageStoreFast imageStore # define imageStoreFast imageStore
#undef IMG_TEMPLATE # undef IMG_TEMPLATE
using sampler1D = SamplerBase<double, 1>; using sampler1D = SamplerBase<double, 1>;
using sampler2D = SamplerBase<double, 2>; using sampler2D = SamplerBase<double, 2>;
@ -524,7 +528,7 @@ double mix(double, double, double) {}
template<int D> VecBase<double, D> mix(VecBase<double, D>, VecBase<double, D>, double) {} template<int D> VecBase<double, D> mix(VecBase<double, D>, VecBase<double, D>, double) {}
template<typename T, int D> VecBase<T, D> mix(VecBase<T, D>, VecBase<T, D>, VecBase<bool, D>) {} template<typename T, int D> VecBase<T, D> mix(VecBase<T, D>, VecBase<T, D>, VecBase<bool, D>) {}
#define select(A, B, C) mix(A, B, C) # define select(A, B, C) mix(A, B, C)
VecBase<double, 3> cross(VecBase<double, 3>, VecBase<double, 3>) {} VecBase<double, 3> cross(VecBase<double, 3>, VecBase<double, 3>) {}
template<int D> float dot(VecBase<double, D>, VecBase<double, D>) {} template<int D> float dot(VecBase<double, D>, VecBase<double, D>) {}
@ -613,3 +617,5 @@ bool is_zero(vec4) {}
#define bool3_array(...) { __VA_ARGS__ } #define bool3_array(...) { __VA_ARGS__ }
#define bool4_array(...) { __VA_ARGS__ } #define bool4_array(...) { __VA_ARGS__ }
/* clang-format on */ /* clang-format on */
#endif