mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-16 22:30:42 +02:00
Fixing shaders to only have used vertex inputs
This commit is contained in:
parent
8f1c08a02e
commit
60ec906637
13 changed files with 59 additions and 14 deletions
|
@ -10,7 +10,12 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_NORMAL) in vec4 inNormal;
|
||||
layout(location=GPU_ATTR_COLOR) in vec4 inColor;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
<@include gpu/Color.slh@>
|
||||
<@include gpu/Transform.slh@>
|
||||
<$declareStandardTransform()$>
|
||||
|
|
|
@ -9,7 +9,10 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_NORMAL) in vec4 inNormal;
|
||||
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
|
@ -27,6 +30,7 @@
|
|||
<@endif@>
|
||||
|
||||
void main(void) {
|
||||
// standard transform
|
||||
TransformCamera cam = getTransformCamera();
|
||||
TransformObject obj = getTransformObject();
|
||||
|
||||
|
|
|
@ -8,7 +8,10 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_COLOR) in vec4 inColor;
|
||||
|
||||
<@include gpu/Color.slh@>
|
||||
<@include gpu/Transform.slh@>
|
||||
<$declareStandardTransform()$>
|
||||
|
|
|
@ -12,7 +12,9 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
|
||||
|
||||
layout(location=0) out vec2 uv;
|
||||
|
||||
|
|
|
@ -13,7 +13,9 @@
|
|||
//
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
<$declareStandardTransform()$>
|
||||
|
|
|
@ -14,7 +14,9 @@
|
|||
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
|
||||
<@include graphics/Light.slh@>
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
|
|
|
@ -12,7 +12,9 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
<@include graphics/Light.slh@>
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
|
|
@ -12,7 +12,10 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
|
||||
|
|
|
@ -12,7 +12,10 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
|
|
|
@ -11,7 +11,13 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_NORMAL) in vec4 inNormal;
|
||||
layout(location=GPU_ATTR_COLOR) in vec4 inColor;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
layout(location=GPU_ATTR_TEXCOORD1) in vec4 inTexCoord1;
|
||||
|
||||
<@include gpu/Color.slh@>
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
|
|
|
@ -10,8 +10,11 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/Color.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
<@include render-utils/ShaderConstants.h@>
|
||||
|
||||
<@include gpu/Transform.slh@>
|
||||
|
|
|
@ -10,7 +10,12 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_NORMAL) in vec4 inNormal;
|
||||
layout(location=GPU_ATTR_COLOR) in vec4 inColor;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
<@include gpu/Color.slh@>
|
||||
<@include gpu/Transform.slh@>
|
||||
<$declareStandardTransform()$>
|
||||
|
|
|
@ -12,7 +12,12 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
<@include gpu/Inputs.slh@>
|
||||
<@include gpu/ShaderConstants.h@>
|
||||
layout(location=GPU_ATTR_POSITION) in vec4 inPosition;
|
||||
layout(location=GPU_ATTR_NORMAL) in vec4 inNormal;
|
||||
layout(location=GPU_ATTR_COLOR) in vec4 inColor;
|
||||
layout(location=GPU_ATTR_TEXCOORD0) in vec4 inTexCoord0;
|
||||
|
||||
<@include gpu/Color.slh@>
|
||||
<@include gpu/Transform.slh@>
|
||||
<$declareStandardTransform()$>
|
||||
|
|
Loading…
Reference in a new issue