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

2
source/blender/draw/intern/draw_shader_shared.hh
View File

@ -59,7 +59,7 @@ struct ObjectRef;
/** \name Views /** \name Views
* \{ */ * \{ */
#ifndef DRW_VIEW_LEN #if !defined(DRW_VIEW_LEN) && !defined(GLSL_CPP_STUBS)
/* Single-view case (default). */ /* Single-view case (default). */
# define drw_view_id 0 # define drw_view_id 0
# define DRW_VIEW_LEN 1 # define DRW_VIEW_LEN 1

2
source/blender/draw/intern/shaders/draw_view_lib.glsl
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#ifndef DRAW_VIEW_CREATE_INFO #if !defined(DRAW_VIEW_CREATE_INFO) && !defined(GLSL_CPP_STUBS)
# error Missing draw_view additional create info on shader create info # error Missing draw_view additional create info on shader create info
#endif #endif