blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Workbench: GLSL layout locations 

Added layout locations
This commit is contained in:
Jeroen Bakker 2018-04-26 14:12:39 +02:00
parent 6a0264896b
commit df3ea82b84
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
View File

@ -1,7 +1,7 @@
out vec4 fragColor;
uniform usampler2D objectId;
uniform sampler2D depthBuffer;
uniform usampler2D objectId;
uniform sampler2D colorBuffer;
uniform sampler2D normalBuffer;
/* normalBuffer contains viewport normals */

8
source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
View File

@ -5,13 +5,13 @@ uniform vec3 object_color = vec3(1.0, 0.0, 1.0);
in vec3 normal_viewport;
#endif /* V3D_LIGHTING_STUDIO */
out uint objectId;
out vec4 diffuseColor;
layout(location=0) out uint objectId;
layout(location=1) out vec4 diffuseColor;
#ifdef V3D_LIGHTING_STUDIO
#ifdef WORKBENCH_ENCODE_NORMALS
out vec2 normalViewport;
layout(location=2) out vec2 normalViewport;
#else /* WORKBENCH_ENCODE_NORMALS */
out vec3 normalViewport;
layout(location=2) out vec3 normalViewport;
#endif /* WORKBENCH_ENCODE_NORMALS */
#endif /* V3D_LIGHTING_STUDIO */