diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-05-24 10:13:53 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-05-24 11:41:18 +0300 |
| commit | bd083f50691e35ac0ab572ebc92fe15dae2f2989 (patch) | |
| tree | df632e92d0182b126d4a656a5ff31d9da0f50f4d /tests | |
| parent | f8eec0839b432d6d33b01ce748e47df5dfeda680 (diff) | |
Do not add fragOutput for custom materialsv2.4.0-beta2v2.4.0-beta1
Also do not require users to leave the main function open for custom
shaders.
Task-number: QT3DS-3544
Change-Id: I81a8969bb39d6716746b3172402bd9150461df67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/customvertex/materials/simple-pos.material | 5 | ||||
| -rw-r--r-- | tests/scenes/customvertex/materials/simple-pos2.material | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/scenes/customvertex/materials/simple-pos.material b/tests/scenes/customvertex/materials/simple-pos.material index 6a76694..0d695b0 100644 --- a/tests/scenes/customvertex/materials/simple-pos.material +++ b/tests/scenes/customvertex/materials/simple-pos.material @@ -11,10 +11,13 @@ void main() { gl_Position = modelViewProjection * vec4(attr_pos, test_vertex); + } </VertexShader> <FragmentShader> + out vec4 fragColor; void main() { - fragOutput = vec4(1.0, test_fragment, 0.0, 1.0); + fragColor = vec4(1.0, test_fragment, 0.0, 1.0); + } </FragmentShader> </Shader> </Shaders> diff --git a/tests/scenes/customvertex/materials/simple-pos2.material b/tests/scenes/customvertex/materials/simple-pos2.material index 8d14185..abfad31 100644 --- a/tests/scenes/customvertex/materials/simple-pos2.material +++ b/tests/scenes/customvertex/materials/simple-pos2.material @@ -11,10 +11,13 @@ void main() { gl_Position = modelViewProjection * vec4(attr_pos2, test_vertex); + } </VertexShader> <FragmentShader> + out vec4 fragColor; void main() { - fragOutput = vec4(1.0, test_fragment, 0.0, 1.0); + fragColor = vec4(1.0, test_fragment, 0.0, 1.0); + } </FragmentShader> </Shader> </Shaders> |