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

2
source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh
View File

@ -10,7 +10,7 @@
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_icon) GPU_SHADER_CREATE_INFO(gpu_shader_icon)
DEFINE(DO_CORNER_MASKING) DEFINE("DO_CORNER_MASKING")
VERTEX_OUT(smooth_icon_interp_iface) VERTEX_OUT(smooth_icon_interp_iface)
FRAGMENT_OUT(0, VEC4, fragColor) FRAGMENT_OUT(0, VEC4, fragColor)
PUSH_CONSTANT(MAT4, ModelViewProjectionMatrix) PUSH_CONSTANT(MAT4, ModelViewProjectionMatrix)