From f5b2c06b32f3ec31f35ec8595ac4ceb36a37d5d7 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Tue, 18 Aug 2015 01:35:08 -0600 Subject: [PATCH] Turn on the gpu_shader5 of the AEP .tesc test. --- Test/310.tesc | 24 ++++++++++----------- Test/baseResults/310.tesc.out | 40 +++++++++++++++++++++++++++++++++++ glslang/Include/revision.h | 4 ++-- 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/Test/310.tesc b/Test/310.tesc index 4f37f882..8220021e 100644 --- a/Test/310.tesc +++ b/Test/310.tesc @@ -115,18 +115,18 @@ void pointSize2() gl_out[1].gl_PointSize = ps; } -// for testing with gpu_shader5 -//precise vec3 pv3; -// -//void foop() -//{ -// precise double d; -// -// pv3 *= pv3; -// pv3 = fma(pv3, pv3, pv3); -// d = fma(d, d, d); -//} -// +#extension GL_OES_gpu_shader5 : enable + +precise vec3 pv3; + +void goodfoop() +{ + precise float d; + + pv3 *= pv3; + pv3 = fma(pv3, pv3, pv3); + d = fma(d, d, d); +} void bbBad() { diff --git a/Test/baseResults/310.tesc.out b/Test/baseResults/310.tesc.out index 9b23825a..42afc61c 100644 --- a/Test/baseResults/310.tesc.out +++ b/Test/baseResults/310.tesc.out @@ -46,6 +46,7 @@ ERROR: 33 compilation errors. No code generated. Shader version: 310 Requested GL_ARB_separate_shader_objects +Requested GL_OES_gpu_shader5 Requested GL_OES_primitive_bounding_box Requested GL_OES_shader_io_blocks Requested GL_OES_tessellation_point_size @@ -221,6 +222,24 @@ ERROR: node is still EOpNull! 0:115 Constant: 0:115 1 (const int) 0:115 'ps' (temp highp float) +0:122 Function Definition: goodfoop( (global void) +0:122 Function Parameters: +0:? Sequence +0:126 multiply second child into first child (temp highp 3-component vector of float) +0:126 'pv3' (temp highp 3-component vector of float) +0:126 'pv3' (temp highp 3-component vector of float) +0:127 move second child to first child (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 Function Call: fma(vf3;vf3;vf3; (global highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:128 move second child to first child (temp highp float) +0:128 'd' (temp highp float) +0:128 Function Call: fma(f1;f1;f1; (global highp float) +0:128 'd' (temp highp float) +0:128 'd' (temp highp float) +0:128 'd' (temp highp float) 0:131 Function Definition: bbBad( (global void) 0:131 Function Parameters: 0:133 Sequence @@ -281,6 +300,7 @@ ERROR: node is still EOpNull! 0:? 'badlay' (out 4-element array of highp float) 0:? 'misSized' (out 5-element array of highp float) 0:? 'okaySize' (out 4-element array of highp float) +0:? 'pv3' (temp highp 3-component vector of float) Linked tessellation control stage: @@ -288,6 +308,7 @@ Linked tessellation control stage: Shader version: 310 Requested GL_ARB_separate_shader_objects +Requested GL_OES_gpu_shader5 Requested GL_OES_primitive_bounding_box Requested GL_OES_shader_io_blocks Requested GL_OES_tessellation_point_size @@ -463,6 +484,24 @@ ERROR: node is still EOpNull! 0:115 Constant: 0:115 1 (const int) 0:115 'ps' (temp highp float) +0:122 Function Definition: goodfoop( (global void) +0:122 Function Parameters: +0:? Sequence +0:126 multiply second child into first child (temp highp 3-component vector of float) +0:126 'pv3' (temp highp 3-component vector of float) +0:126 'pv3' (temp highp 3-component vector of float) +0:127 move second child to first child (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 Function Call: fma(vf3;vf3;vf3; (global highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:127 'pv3' (temp highp 3-component vector of float) +0:128 move second child to first child (temp highp float) +0:128 'd' (temp highp float) +0:128 Function Call: fma(f1;f1;f1; (global highp float) +0:128 'd' (temp highp float) +0:128 'd' (temp highp float) +0:128 'd' (temp highp float) 0:131 Function Definition: bbBad( (global void) 0:131 Function Parameters: 0:133 Sequence @@ -523,4 +562,5 @@ ERROR: node is still EOpNull! 0:? 'badlay' (out 4-element array of highp float) 0:? 'misSized' (out 5-element array of highp float) 0:? 'okaySize' (out 4-element array of highp float) +0:? 'pv3' (temp highp 3-component vector of float) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 13626c92..05af79b8 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "2.3.720" -#define GLSLANG_DATE "16-Aug-2015" +#define GLSLANG_REVISION "2.3.721" +#define GLSLANG_DATE "18-Aug-2015"