Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-26 15:12:39 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-26 15:12:39 +0300
commitdf3ea82b84da7a9b003fd0f9afa26081216e64e9 (patch)
tree567e56a203fe9478277591b660e4a2c61004a171 /source
parent6a0264896b38794ec8242040cf5104c4e06d844e (diff)
Workbench: GLSL layout locations
Added layout locations
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl2
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl8
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
index 6a5d6c71aba..0337662955e 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
@@ -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 */
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
index 09258654072..7ed5ecca45f 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
@@ -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 */