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

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

@ -28,8 +28,6 @@
#pragma once #pragma once
#ifndef GPU_SHADER
#include <type_traits> #include <type_traits>
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@ -728,5 +726,3 @@ void groupMemoryBarrier() {}
/* clang-format on */ /* clang-format on */
/** \} */ /** \} */
#endif