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

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

@ -114,7 +114,7 @@ template<typename T> struct VecBase<T, 2> : VecOp<T, 2>, VecSwizzle2<T> {
explicit VecBase(T, T) {} explicit VecBase(T, T) {}
}; };
template<typename T> struct VecBase<T, 3> : VecOp<T, 2>, VecSwizzle3<T> { template<typename T> struct VecBase<T, 3> : VecOp<T, 3>, VecSwizzle3<T> {
T x, y, z; T x, y, z;
VecBase() = default; VecBase() = default;
@ -125,7 +125,7 @@ template<typename T> struct VecBase<T, 3> : VecOp<T, 2>, VecSwizzle3<T> {
explicit VecBase(T, VecBase<T, 2>) {} explicit VecBase(T, VecBase<T, 2>) {}
}; };
template<typename T> struct VecBase<T, 4> : VecOp<T, 3>, VecSwizzle4<T> { template<typename T> struct VecBase<T, 4> : VecOp<T, 4>, VecSwizzle4<T> {
T x, y, z, w; T x, y, z, w;
VecBase() = default; VecBase() = default;