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

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

@ -28,9 +28,7 @@
#pragma once #pragma once
#ifndef GPU_SHADER #include <type_traits>
# include <type_traits>
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Vector Types /** \name Vector Types
@ -71,7 +69,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 {}
@ -99,7 +97,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 {
@ -355,7 +353,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, \
@ -371,7 +369,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>;
@ -412,7 +410,7 @@ template<typename T, int Dimensions, bool Array = false> struct ImageBase {
using size_vec_type = VecBase<int, coord_dim>; using size_vec_type = VecBase<int, coord_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, \
@ -422,8 +420,8 @@ 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
IMG_TEMPLATE uint imageAtomicAdd(T, IntCoord, uint); IMG_TEMPLATE uint imageAtomicAdd(T, IntCoord, uint);
IMG_TEMPLATE uint imageAtomicMin(T, IntCoord, uint); IMG_TEMPLATE uint imageAtomicMin(T, IntCoord, uint);
@ -433,7 +431,7 @@ IMG_TEMPLATE uint imageAtomicXor(T, IntCoord, uint);
IMG_TEMPLATE uint imageAtomicExchange(T, IntCoord, uint); IMG_TEMPLATE uint imageAtomicExchange(T, IntCoord, uint);
IMG_TEMPLATE uint imageAtomicCompSwap(T, IntCoord, uint, uint); IMG_TEMPLATE uint imageAtomicCompSwap(T, IntCoord, uint, uint);
# undef IMG_TEMPLATE #undef IMG_TEMPLATE
using image1D = ImageBase<double, 1>; using image1D = ImageBase<double, 1>;
using image2D = ImageBase<double, 2>; using image2D = ImageBase<double, 2>;
@ -461,7 +459,7 @@ using uimage2DArray = ImageBase<uint, 2, true>;
* \{ */ * \{ */
/* Some compilers complain about lack of return values. Keep it short. */ /* Some compilers complain about lack of return values. Keep it short. */
# define RET \ #define RET \
{ \ { \
return {}; \ return {}; \
} }
@ -556,7 +554,7 @@ double mix(double, double, double) RET;
template<int D> VecBase<double, D> mix(VecBase<double, D>, VecBase<double, D>, double) RET; template<int D> VecBase<double, D> mix(VecBase<double, D>, VecBase<double, D>, double) RET;
template<typename T, int D> VecBase<T, D> mix(VecBase<T, D>, VecBase<T, D>, VecBase<bool, D>) RET; template<typename T, int D> VecBase<T, D> mix(VecBase<T, D>, VecBase<T, D>, VecBase<bool, D>) RET;
# 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>) RET; VecBase<double, 3> cross(VecBase<double, 3>, VecBase<double, 3>) RET;
template<int D> float dot(VecBase<double, D>, VecBase<double, D>) RET; template<int D> float dot(VecBase<double, D>, VecBase<double, D>) RET;
@ -625,7 +623,7 @@ bool is_zero(vec2) RET;
bool is_zero(vec3) RET; bool is_zero(vec3) RET;
bool is_zero(vec4) RET; bool is_zero(vec4) RET;
# undef RET #undef RET
/** \} */ /** \} */
@ -680,17 +678,17 @@ const uint gl_LocalInvocationIndex;
/* Note: Cannot easily mutate them. Pass every by copy for now. */ /* Note: Cannot easily mutate them. Pass every by copy for now. */
/* Pass argument by reference. */ /* Pass argument by reference. */
# define inout #define inout
/* Pass argument by reference but only write to it. Its initial value is undefined. */ /* Pass argument by reference but only write to it. Its initial value is undefined. */
# define out #define out
/* Pass argument by copy (default). */ /* Pass argument by copy (default). */
# define in #define in
/* Discards the output of the current fragment shader invocation and halts its execution. */ /* Discards the output of the current fragment shader invocation and halts its execution. */
# define discard #define discard
/* Decorate a variable in global scope that is common to all threads in a threadgroup. */ /* Decorate a variable in global scope that is common to all threads in a threadgroup. */
# define shared #define shared
namespace gl_ComputeShader { namespace gl_ComputeShader {
void barrier() {} void barrier() {}
@ -728,5 +726,3 @@ void groupMemoryBarrier() {}
/* clang-format on */ /* clang-format on */
/** \} */ /** \} */
#endif