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

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

@ -8,7 +8,12 @@
* The goal of this header is to make the GLSL source file compile using a modern C++ compiler. * The goal of this header is to make the GLSL source file compile using a modern C++ compiler.
* This allows for linting and IDE functionalities to work. * This allows for linting and IDE functionalities to work.
* *
* This is why the implementation of each function is not needed. * This is why the implementation of each function is not needed. However, we make sure that type
* casting is always explicit. This is because implicit casts are not always supported on all
* implementations.
*
* Float types are set to double to accept float literals without trailing f and avoid casting
* issues.
* *
* Some of the features of GLSL are omitted by design. They are either: * Some of the features of GLSL are omitted by design. They are either:
* - not needed (e.g. per component matrix multiplication) * - not needed (e.g. per component matrix multiplication)
@ -302,26 +307,31 @@ template<int R> struct MatBase<2, R> : MatOp<2, R> {
MatBase() = default; MatBase() = default;
explicit MatBase(T) {} explicit MatBase(T) {}
explicit MatBase(T, T, T, T) {}
explicit MatBase(ColT, ColT) {} explicit MatBase(ColT, ColT) {}
template<typename OtherC, typename OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {} template<typename OtherC, typename OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {}
}; };
template<int R> struct MatBase<3, R> : MatOp<3, R> { template<int R> struct MatBase<3, R> : MatOp<3, R> {
using T = double;
using ColT = VecBase<double, R>; using ColT = VecBase<double, R>;
ColT x, y, z; ColT x, y, z;
MatBase() = default; MatBase() = default;
explicit MatBase(double) {} explicit MatBase(T) {}
explicit MatBase(T, T, T, T, T, T, T, T, T) {}
explicit MatBase(ColT, ColT, ColT) {} explicit MatBase(ColT, ColT, ColT) {}
template<int OtherC, int OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {} template<int OtherC, int OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {}
}; };
template<int R> struct MatBase<4, R> : MatOp<4, R> { template<int R> struct MatBase<4, R> : MatOp<4, R> {
using T = double;
using ColT = VecBase<double, R>; using ColT = VecBase<double, R>;
ColT x, y, z, w; ColT x, y, z, w;
MatBase() = default; MatBase() = default;
explicit MatBase(double) {} explicit MatBase(T) {}
explicit MatBase(T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) {}
explicit MatBase(ColT, ColT, ColT, ColT) {} explicit MatBase(ColT, ColT, ColT, ColT) {}
template<int OtherC, int OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {} template<int OtherC, int OtherR> explicit MatBase(const MatBase<OtherC, OtherR> &) {}
}; };