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

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

@ -403,12 +403,15 @@ TEX_TEMPLATE DataVec textureLod(T, FltCoord, double) {}
#undef TEX_TEMPLATE #undef TEX_TEMPLATE
using samplerBuffer = SamplerBase<double, 1>;
using sampler1D = SamplerBase<double, 1>; using sampler1D = SamplerBase<double, 1>;
using sampler2D = SamplerBase<double, 2>; using sampler2D = SamplerBase<double, 2>;
using sampler3D = SamplerBase<double, 3>; using sampler3D = SamplerBase<double, 3>;
using isamplerBuffer = SamplerBase<int, 1>;
using isampler1D = SamplerBase<int, 1>; using isampler1D = SamplerBase<int, 1>;
using isampler2D = SamplerBase<int, 2>; using isampler2D = SamplerBase<int, 2>;
using isampler3D = SamplerBase<int, 3>; using isampler3D = SamplerBase<int, 3>;
using usamplerBuffer = SamplerBase<uint, 1>;
using usampler1D = SamplerBase<uint, 1>; using usampler1D = SamplerBase<uint, 1>;
using usampler2D = SamplerBase<uint, 2>; using usampler2D = SamplerBase<uint, 2>;
using usampler3D = SamplerBase<uint, 3>; using usampler3D = SamplerBase<uint, 3>;