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

GPU: GLSL-C++ compilation stubs #4

Closed
Clément Foucault wants to merge 38 commits from glsl-cpp-stubs-2 into glsl-include
pull from: glsl-cpp-stubs-2
merge into: fclem:glsl-include

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

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

@ -105,6 +105,14 @@ template<typename T> struct VecSwizzle4 : VecSwizzle3<T> {
wwxw, wwyx, wwyy, wwyz, wwyw, wwzx, wwzy, wwzz, wwzw, wwwx, wwwy, wwwz, wwww; wwxw, wwyx, wwyy, wwyz, wwyw, wwzx, wwzy, wwzz, wwzw, wwwx, wwwy, wwwz, wwww;
}; };
template<typename T> struct VecBase<T, 1> {
T x;
VecBase() = default;
VecBase(VecOp<T, 1>) {}
operator T() const {}
};
template<typename T> struct VecBase<T, 2> : VecOp<T, 2>, VecSwizzle2<T> { template<typename T> struct VecBase<T, 2> : VecOp<T, 2>, VecSwizzle2<T> {
T x, y; T x, y;