mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add GL_OES_texture_3D extension. Also, minor tweaks to extension adding infrastructure.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24001 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-11-11 18:50:06 +00:00
parent df81ce90c3
commit 115a0adc29
8 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Test/100.frag
View File

@@ -76,3 +76,16 @@ struct sp {
uniform float h; // ERROR
invariant float i; // ERROR
};
uniform sampler3D s3D; // ERROR
#extension GL_OES_texture_3D : enable
precision highp sampler3D;
uniform sampler3D s3D2;
void foo234()
{
texture3D(s3D2, vec3(0.2), 0.2);
texture3DProj(s3D2, v[1], 0.4);
}

25
Test/baseResults/100.frag.out
View File

@@ -40,7 +40,9 @@ ERROR: 0:71: 'sampler2D' : sampler/image types can only be used in uniform varia
ERROR: 0:75: 'g' : cannot use storage or interpolation qualifiers on structure members
ERROR: 0:76: 'h' : cannot use storage or interpolation qualifiers on structure members
ERROR: 0:77: 'i' : cannot use invariant qualifier on structure members
ERROR: 35 compilation errors. No code generated.
ERROR: 0:80: 'sampler3D' : Reserved word.
ERROR: 0:80: 'sampler/image' : type requires declaration of default precision qualifier
ERROR: 37 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:3 Sequence
@@ -121,6 +123,25 @@ ERROR: node is still EOpNull!
0:67 Function Definition: f11(s21; (void)
0:67 Function Parameters:
0:67 'p2d' (in lowp sampler2D)
0:87 Function Definition: foo234( (void)
0:87 Function Parameters:
0:89 Sequence
0:89 Function Call: texture3D(s31;vf3;f1; (highp 4-component vector of float)
0:89 's3D2' (uniform highp sampler3D)
0:89 Constant:
0:89 0.200000
0:89 0.200000
0:89 0.200000
0:89 Constant:
0:89 0.200000
0:90 Function Call: texture3DProj(s31;vf4;f1; (highp 4-component vector of float)
0:90 's3D2' (uniform highp sampler3D)
0:90 direct index (smooth mediump 4-component vector of float)
0:90 'v' (smooth in 3-element array of mediump 4-component vector of float)
0:90 Constant:
0:90 1 (const int)
0:90 Constant:
0:90 0.400000
0:? Linker Objects
0:? 'a' (3-element array of mediump int)
0:? 'uint' (mediump int)
@@ -135,4 +156,6 @@ ERROR: node is still EOpNull!
0:? 'uv3' (invariant uniform mediump 3-component vector of float)
0:? 'glob2D' (lowp sampler2D)
0:? 'vary2D' (smooth in lowp sampler2D)
0:? 's3D' (uniform mediump sampler3D)
0:? 's3D2' (uniform highp sampler3D)