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

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

@ -110,6 +110,7 @@ template<typename T> struct VecBase<T, 1> {
VecBase() = default; VecBase() = default;
VecBase(VecOp<T, 1>) {} VecBase(VecOp<T, 1>) {}
template<typename U> explicit VecBase(VecBase<U, 1>) {}
operator T() const {} operator T() const {}
}; };
@ -118,6 +119,7 @@ template<typename T> struct VecBase<T, 2> : VecOp<T, 2>, VecSwizzle2<T> {
VecBase() = default; VecBase() = default;
VecBase(VecOp<T, 2>) {} VecBase(VecOp<T, 2>) {}
template<typename U> explicit VecBase(VecBase<U, 2>) {}
explicit VecBase(T) {} explicit VecBase(T) {}
explicit VecBase(T, T) {} explicit VecBase(T, T) {}
}; };
@ -127,6 +129,7 @@ template<typename T> struct VecBase<T, 3> : VecOp<T, 3>, VecSwizzle3<T> {
VecBase() = default; VecBase() = default;
VecBase(VecOp<T, 3>) {} VecBase(VecOp<T, 3>) {}
template<typename U> explicit VecBase(VecBase<U, 3>) {}
explicit VecBase(T) {} explicit VecBase(T) {}
explicit VecBase(T, T, T) {} explicit VecBase(T, T, T) {}
explicit VecBase(VecBase<T, 2>, T) {} explicit VecBase(VecBase<T, 2>, T) {}
@ -138,6 +141,7 @@ template<typename T> struct VecBase<T, 4> : VecOp<T, 4>, VecSwizzle4<T> {
VecBase() = default; VecBase() = default;
VecBase(VecOp<T, 4>) {} VecBase(VecOp<T, 4>) {}
template<typename U> explicit VecBase(VecBase<U, 4>) {}
explicit VecBase(T) {} explicit VecBase(T) {}
explicit VecBase(T, T, T, T) {} explicit VecBase(T, T, T, T) {}
explicit VecBase(VecBase<T, 2>, T, T) {} explicit VecBase(VecBase<T, 2>, T, T) {}