From 4df19ef970ba76d6f99d0b07b44048e2e148e4ff Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 30 Jan 2019 17:45:54 +0100 Subject: [PATCH] Format --- Shaders/debug_draw/line_deferred.frag.glsl | 2 +- blender/arm/material/make_decal.py | 2 +- blender/arm/material/make_mesh.py | 6 +++--- blender/arm/material/make_transluc.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Shaders/debug_draw/line_deferred.frag.glsl b/Shaders/debug_draw/line_deferred.frag.glsl index 8c7a17b1..2a2e8d8e 100644 --- a/Shaders/debug_draw/line_deferred.frag.glsl +++ b/Shaders/debug_draw/line_deferred.frag.glsl @@ -1,7 +1,7 @@ #version 450 in vec3 color; -out vec4[2] fragColor; +out vec4 fragColor[2]; void main() { fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0); diff --git a/blender/arm/material/make_decal.py b/blender/arm/material/make_decal.py index 3add8d57..cce3a706 100644 --- a/blender/arm/material/make_decal.py +++ b/blender/arm/material/make_decal.py @@ -35,7 +35,7 @@ def make(context_id): frag.add_uniform('sampler2D gbufferD') frag.add_uniform('mat4 invVP', '_inverseViewProjectionMatrix') frag.add_uniform('mat4 invW', '_inverseWorldMatrix') - frag.add_out('vec4[2] fragColor') + frag.add_out('vec4 fragColor[2]') frag.write_attrib(' vec3 n = normalize(wnormal);') diff --git a/blender/arm/material/make_mesh.py b/blender/arm/material/make_mesh.py index 168eb695..e872af51 100644 --- a/blender/arm/material/make_mesh.py +++ b/blender/arm/material/make_mesh.py @@ -205,7 +205,7 @@ def make_deferred(con_mesh, rpasses): gapi = arm.utils.get_gapi() if '_gbuffer2' in wrd.world_defs: - frag.add_out('vec4[3] fragColor') + frag.add_out('vec4 fragColor[3]') if '_Veloc' in wrd.world_defs: if tese == None: vert.add_uniform('mat4 prevWVP', link='_prevWorldViewProjectionMatrix') @@ -236,9 +236,9 @@ def make_deferred(con_mesh, rpasses): elif gapi.startswith('direct3d'): vert.add_out('vec4 wvpposition') vert.write('wvpposition = gl_Position;') - frag.add_out('vec4[2] fragColor') + frag.add_out('vec4 fragColor[2]') else: - frag.add_out('vec4[2] fragColor') + frag.add_out('vec4 fragColor[2]') # Pack gbuffer frag.add_include('std/gbuffer.glsl') diff --git a/blender/arm/material/make_transluc.py b/blender/arm/material/make_transluc.py index 3bb1c1cc..65ca83a9 100644 --- a/blender/arm/material/make_transluc.py +++ b/blender/arm/material/make_transluc.py @@ -15,7 +15,7 @@ def make(context_id): frag = con_transluc.frag tese = con_transluc.tese - frag.add_out('vec4[2] fragColor') + frag.add_out('vec4 fragColor[2]') sh = tese if tese != None else vert sh.add_out('vec4 wvpposition')