RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2025-03-04 08:37:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement GL_ARB_derivative_control.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@27713 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-08-13 04:15:56 +00:00
parent 265f5fb80e
commit 13fd6c9dd7
12 changed files with 331 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Test/400.frag
View File

@ -61,4 +61,25 @@ void foo24()
{
dvec3 df, di;
df = modf(outp.xyz, di);
}
}
in float in1;
in vec2 in2;
in vec3 in3;
in vec4 in4;
void foodc1()
{
vec2 v2 = dFdxFine(in2); // ERROR
vec3 v3 = dFdyCoarse(in3); // ERROR
vec4 v4 = fwidthCoarse(in4) + fwidthFine(in4); // ERROR
}
#extension GL_ARB_derivative_control : enable
void foodc2()
{
vec2 v2 = dFdxFine(in2);
vec3 v3 = dFdyCoarse(in3);
vec4 v4 = fwidthCoarse(in4) + fwidthFine(in4);
}

17
Test/450.frag Normal file
View File

@ -0,0 +1,17 @@
#version 450 core
in float in1;
in vec2 in2;
in vec3 in3;
in vec4 in4;
void main()
{
vec2 v2 = dFdxFine(in2);
vec3 v3 = dFdyCoarse(in3);
vec4 v4 = fwidth(in4);
v4 = dFdyFine(in4);
v3 = dFdyFine(in3);
float f = dFdx(in1) + dFdxFine(in1) + dFdxCoarse(in1);
v4 = fwidthCoarse(in4) + fwidthFine(in4);
}

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

@ -15,10 +15,15 @@ ERROR: 0:54: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset,
ERROR: 0:54: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:57: 'patch' : not supported in this stage: fragment
ERROR: 0:58: 'patch' : not supported in this stage: fragment
ERROR: 15 compilation errors. No code generated.
ERROR: 0:73: 'dFdxFine' : required extension not requested: GL_ARB_derivative_control
ERROR: 0:74: 'dFdyCoarse' : required extension not requested: GL_ARB_derivative_control
ERROR: 0:75: 'fwidthCoarse' : required extension not requested: GL_ARB_derivative_control
ERROR: 0:75: 'fwidthFine' : required extension not requested: GL_ARB_derivative_control
ERROR: 19 compilation errors. No code generated.
Shader version: 400
Requested GL_ARB_derivative_control
Requested GL_ARB_separate_shader_objects
gl_FragCoord pixel center is integer
gl_FragCoord origin is upper left
@ -217,6 +222,48 @@ ERROR: node is still EOpNull!
0:63 Convert float to double (3-component vector of double)
0:63 'tempArg' (3-component vector of float)
0:63 'tempReturn' (3-component vector of float)
0:71 Function Definition: foodc1( (void)
0:71 Function Parameters:
0:73 Sequence
0:73 Sequence
0:73 move second child to first child (2-component vector of float)
0:73 'v2' (2-component vector of float)
0:73 dPdxFine (2-component vector of float)
0:73 'in2' (smooth in 2-component vector of float)
0:74 Sequence
0:74 move second child to first child (3-component vector of float)
0:74 'v3' (3-component vector of float)
0:74 dPdyCoarse (3-component vector of float)
0:74 'in3' (smooth in 3-component vector of float)
0:75 Sequence
0:75 move second child to first child (4-component vector of float)
0:75 'v4' (4-component vector of float)
0:75 add (4-component vector of float)
0:75 fwidthCoarse (4-component vector of float)
0:75 'in4' (smooth in 4-component vector of float)
0:75 fwidthFine (4-component vector of float)
0:75 'in4' (smooth in 4-component vector of float)
0:80 Function Definition: foodc2( (void)
0:80 Function Parameters:
0:82 Sequence
0:82 Sequence
0:82 move second child to first child (2-component vector of float)
0:82 'v2' (2-component vector of float)
0:82 dPdxFine (2-component vector of float)
0:82 'in2' (smooth in 2-component vector of float)
0:83 Sequence
0:83 move second child to first child (3-component vector of float)
0:83 'v3' (3-component vector of float)
0:83 dPdyCoarse (3-component vector of float)
0:83 'in3' (smooth in 3-component vector of float)
0:84 Sequence
0:84 move second child to first child (4-component vector of float)
0:84 'v4' (4-component vector of float)
0:84 add (4-component vector of float)
0:84 fwidthCoarse (4-component vector of float)
0:84 'in4' (smooth in 4-component vector of float)
0:84 fwidthFine (4-component vector of float)
0:84 'in4' (smooth in 4-component vector of float)
0:? Linker Objects
0:? 'c2D' (smooth in 2-component vector of float)
0:? 'i' (flat in int)
@ -235,12 +282,17 @@ ERROR: node is still EOpNull!
0:? 'u2drs' (uniform sampler2DRectShadow)
0:? 'patchIn' (smooth patch in 4-component vector of float)
0:? 'patchOut' (patch out 4-component vector of float)
0:? 'in1' (smooth in float)
0:? 'in2' (smooth in 2-component vector of float)
0:? 'in3' (smooth in 3-component vector of float)
0:? 'in4' (smooth in 4-component vector of float)
Linked fragment stage:
Shader version: 400
Requested GL_ARB_derivative_control
Requested GL_ARB_separate_shader_objects
gl_FragCoord pixel center is integer
gl_FragCoord origin is upper left
@ -439,6 +491,48 @@ ERROR: node is still EOpNull!
0:63 Convert float to double (3-component vector of double)
0:63 'tempArg' (3-component vector of float)
0:63 'tempReturn' (3-component vector of float)
0:71 Function Definition: foodc1( (void)
0:71 Function Parameters:
0:73 Sequence
0:73 Sequence
0:73 move second child to first child (2-component vector of float)
0:73 'v2' (2-component vector of float)
0:73 dPdxFine (2-component vector of float)
0:73 'in2' (smooth in 2-component vector of float)
0:74 Sequence
0:74 move second child to first child (3-component vector of float)
0:74 'v3' (3-component vector of float)
0:74 dPdyCoarse (3-component vector of float)
0:74 'in3' (smooth in 3-component vector of float)
0:75 Sequence
0:75 move second child to first child (4-component vector of float)
0:75 'v4' (4-component vector of float)
0:75 add (4-component vector of float)
0:75 fwidthCoarse (4-component vector of float)
0:75 'in4' (smooth in 4-component vector of float)
0:75 fwidthFine (4-component vector of float)
0:75 'in4' (smooth in 4-component vector of float)
0:80 Function Definition: foodc2( (void)
0:80 Function Parameters:
0:82 Sequence
0:82 Sequence
0:82 move second child to first child (2-component vector of float)
0:82 'v2' (2-component vector of float)
0:82 dPdxFine (2-component vector of float)
0:82 'in2' (smooth in 2-component vector of float)
0:83 Sequence
0:83 move second child to first child (3-component vector of float)
0:83 'v3' (3-component vector of float)
0:83 dPdyCoarse (3-component vector of float)
0:83 'in3' (smooth in 3-component vector of float)
0:84 Sequence
0:84 move second child to first child (4-component vector of float)
0:84 'v4' (4-component vector of float)
0:84 add (4-component vector of float)
0:84 fwidthCoarse (4-component vector of float)
0:84 'in4' (smooth in 4-component vector of float)
0:84 fwidthFine (4-component vector of float)
0:84 'in4' (smooth in 4-component vector of float)
0:? Linker Objects
0:? 'c2D' (smooth in 2-component vector of float)
0:? 'i' (flat in int)
@ -457,4 +551,8 @@ ERROR: node is still EOpNull!
0:? 'u2drs' (uniform sampler2DRectShadow)
0:? 'patchIn' (smooth patch in 4-component vector of float)
0:? 'patchOut' (patch out 4-component vector of float)
0:? 'in1' (smooth in float)
0:? 'in2' (smooth in 2-component vector of float)
0:? 'in3' (smooth in 3-component vector of float)
0:? 'in4' (smooth in 4-component vector of float)

111
Test/baseResults/450.frag.out Normal file
View File

@ -0,0 +1,111 @@
450.frag
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
Shader version: 450
0:? Sequence
0:8 Function Definition: main( (void)
0:8 Function Parameters:
0:10 Sequence
0:10 Sequence
0:10 move second child to first child (2-component vector of float)
0:10 'v2' (2-component vector of float)
0:10 dPdxFine (2-component vector of float)
0:10 'in2' (smooth in 2-component vector of float)
0:11 Sequence
0:11 move second child to first child (3-component vector of float)
0:11 'v3' (3-component vector of float)
0:11 dPdyCoarse (3-component vector of float)
0:11 'in3' (smooth in 3-component vector of float)
0:12 Sequence
0:12 move second child to first child (4-component vector of float)
0:12 'v4' (4-component vector of float)
0:12 fwidth (4-component vector of float)
0:12 'in4' (smooth in 4-component vector of float)
0:13 move second child to first child (4-component vector of float)
0:13 'v4' (4-component vector of float)
0:13 dPdyFine (4-component vector of float)
0:13 'in4' (smooth in 4-component vector of float)
0:14 move second child to first child (3-component vector of float)
0:14 'v3' (3-component vector of float)
0:14 dPdyFine (3-component vector of float)
0:14 'in3' (smooth in 3-component vector of float)
0:15 Sequence
0:15 move second child to first child (float)
0:15 'f' (float)
0:15 add (float)
0:15 add (float)
0:15 dPdx (float)
0:15 'in1' (smooth in float)
0:15 dPdxFine (float)
0:15 'in1' (smooth in float)
0:15 dPdxCoarse (float)
0:15 'in1' (smooth in float)
0:16 move second child to first child (4-component vector of float)
0:16 'v4' (4-component vector of float)
0:16 add (4-component vector of float)
0:16 fwidthCoarse (4-component vector of float)
0:16 'in4' (smooth in 4-component vector of float)
0:16 fwidthFine (4-component vector of float)
0:16 'in4' (smooth in 4-component vector of float)
0:? Linker Objects
0:? 'in1' (smooth in float)
0:? 'in2' (smooth in 2-component vector of float)
0:? 'in3' (smooth in 3-component vector of float)
0:? 'in4' (smooth in 4-component vector of float)
Linked fragment stage:
Shader version: 450
0:? Sequence
0:8 Function Definition: main( (void)
0:8 Function Parameters:
0:10 Sequence
0:10 Sequence
0:10 move second child to first child (2-component vector of float)
0:10 'v2' (2-component vector of float)
0:10 dPdxFine (2-component vector of float)
0:10 'in2' (smooth in 2-component vector of float)
0:11 Sequence
0:11 move second child to first child (3-component vector of float)
0:11 'v3' (3-component vector of float)
0:11 dPdyCoarse (3-component vector of float)
0:11 'in3' (smooth in 3-component vector of float)
0:12 Sequence
0:12 move second child to first child (4-component vector of float)
0:12 'v4' (4-component vector of float)
0:12 fwidth (4-component vector of float)
0:12 'in4' (smooth in 4-component vector of float)
0:13 move second child to first child (4-component vector of float)
0:13 'v4' (4-component vector of float)
0:13 dPdyFine (4-component vector of float)
0:13 'in4' (smooth in 4-component vector of float)
0:14 move second child to first child (3-component vector of float)
0:14 'v3' (3-component vector of float)
0:14 dPdyFine (3-component vector of float)
0:14 'in3' (smooth in 3-component vector of float)
0:15 Sequence
0:15 move second child to first child (float)
0:15 'f' (float)
0:15 add (float)
0:15 add (float)
0:15 dPdx (float)
0:15 'in1' (smooth in float)
0:15 dPdxFine (float)
0:15 'in1' (smooth in float)
0:15 dPdxCoarse (float)
0:15 'in1' (smooth in float)
0:16 move second child to first child (4-component vector of float)
0:16 'v4' (4-component vector of float)
0:16 add (4-component vector of float)
0:16 fwidthCoarse (4-component vector of float)
0:16 'in4' (smooth in 4-component vector of float)
0:16 fwidthFine (4-component vector of float)
0:16 'in4' (smooth in 4-component vector of float)
0:? Linker Objects
0:? 'in1' (smooth in float)
0:? 'in2' (smooth in 2-component vector of float)
0:? 'in3' (smooth in 3-component vector of float)
0:? 'in4' (smooth in 4-component vector of float)

1
Test/testlist
View File

@ -71,6 +71,7 @@ numeral.frag
430.comp
440.vert
440.frag
450.frag
dce.frag
atomic_uint.frag
../../LunarGLASS/test/aggOps.frag

6
glslang/Include/intermediate.h
View File

@ -208,6 +208,12 @@ enum TOperator {
EOpDPdx, // Fragment only
EOpDPdy, // Fragment only
EOpFwidth, // Fragment only
EOpDPdxFine, // Fragment only
EOpDPdyFine, // Fragment only
EOpFwidthFine, // Fragment only
EOpDPdxCoarse, // Fragment only
EOpDPdyCoarse, // Fragment only
EOpFwidthCoarse, // Fragment only
EOpMatrixTimesMatrix,
EOpOuterProduct,

6
glslang/MachineIndependent/Constant.cpp
View File

@ -451,6 +451,12 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
case EOpDPdx:
case EOpDPdy:
case EOpFwidth:
case EOpDPdxFine:
case EOpDPdyFine:
case EOpFwidthFine:
case EOpDPdxCoarse:
case EOpDPdyCoarse:
case EOpFwidthCoarse:
// The derivatives are all mandated to create a constant 0.
newConstArray[i].setDConst(0.0);
break;

57
glslang/MachineIndependent/Initialize.cpp
View File

@ -933,6 +933,45 @@ void TBuiltIns::initialize(int version, EProfile profile)
"\n");
// GL_ARB_derivative_control
if (profile != EEsProfile && version >= 400) {
stageBuiltins[EShLangFragment].append(
"float dFdxFine(float p);"
"vec2 dFdxFine(vec2 p);"
"vec3 dFdxFine(vec3 p);"
"vec4 dFdxFine(vec4 p);"
"float dFdyFine(float p);"
"vec2 dFdyFine(vec2 p);"
"vec3 dFdyFine(vec3 p);"
"vec4 dFdyFine(vec4 p);"
"float fwidthFine(float p);"
"vec2 fwidthFine(vec2 p);"
"vec3 fwidthFine(vec3 p);"
"vec4 fwidthFine(vec4 p);"
"\n");
stageBuiltins[EShLangFragment].append(
"float dFdxCoarse(float p);"
"vec2 dFdxCoarse(vec2 p);"
"vec3 dFdxCoarse(vec3 p);"
"vec4 dFdxCoarse(vec4 p);"
"float dFdyCoarse(float p);"
"vec2 dFdyCoarse(vec2 p);"
"vec3 dFdyCoarse(vec3 p);"
"vec4 dFdyCoarse(vec4 p);"
"float fwidthCoarse(float p);"
"vec2 fwidthCoarse(vec2 p);"
"vec3 fwidthCoarse(vec3 p);"
"vec4 fwidthCoarse(vec4 p);"
"\n");
}
//============================================================================
//
// Standard Uniforms
@ -2383,6 +2422,16 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
symbolTable.setFunctionExtensions("atomicCounter" , 1, &GL_ARB_shader_atomic_counters);
}
// GL_ARB_derivative_control
if (profile != EEsProfile && version < 450) {
symbolTable.setFunctionExtensions("dFdxFine", 1, &GL_ARB_derivative_control);
symbolTable.setFunctionExtensions("dFdyFine", 1, &GL_ARB_derivative_control);
symbolTable.setFunctionExtensions("fwidthFine", 1, &GL_ARB_derivative_control);
symbolTable.setFunctionExtensions("dFdxCoarse", 1, &GL_ARB_derivative_control);
symbolTable.setFunctionExtensions("dFdyCoarse", 1, &GL_ARB_derivative_control);
symbolTable.setFunctionExtensions("fwidthCoarse", 1, &GL_ARB_derivative_control);
}
symbolTable.setVariableExtensions("gl_FragDepthEXT", 1, &GL_EXT_frag_depth);
break;
@ -2512,6 +2561,14 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
symbolTable.relateToOperator("dFdx", EOpDPdx);
symbolTable.relateToOperator("dFdy", EOpDPdy);
symbolTable.relateToOperator("fwidth", EOpFwidth);
if (profile != EEsProfile && version >= 400) {
symbolTable.relateToOperator("dFdxFine", EOpDPdxFine);
symbolTable.relateToOperator("dFdyFine", EOpDPdyFine);
symbolTable.relateToOperator("fwidthFine", EOpFwidthFine);
symbolTable.relateToOperator("dFdxCoarse", EOpDPdxCoarse);
symbolTable.relateToOperator("dFdyCoarse", EOpDPdyCoarse);
symbolTable.relateToOperator("fwidthCoarse", EOpFwidthCoarse);
}
break;
case EShLangCompute:

2
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -3347,7 +3347,7 @@ void TParseContext::layoutObjectCheck(TSourceLoc loc, const TSymbol& symbol)
error(loc, "cannot specify on a variable declaration", "offset", "");
if (qualifier.hasOffset() && ! qualifier.hasBinding() && type.getBasicType() == EbtAtomicUint)
error(loc, "a binding is required", "offset", "");
if (qualifier.hasBinding() && qualifier.layoutBinding >= resources.maxAtomicCounterBindings && type.getBasicType() == EbtAtomicUint)
if (qualifier.hasBinding() && (int)qualifier.layoutBinding >= resources.maxAtomicCounterBindings && type.getBasicType() == EbtAtomicUint)
error(loc, "cannot be greater-than-or-equal to gl_MaxAtomicCounterBindings", "binding", "");
// "The align qualifier can only be used on blocks or block members..."
if (qualifier.hasAlign())

5
glslang/MachineIndependent/Versions.cpp
View File

@ -168,6 +168,7 @@ void TParseContext::initializeExtensionBehavior()
extensionBehavior[GL_ARB_explicit_attrib_location] = EBhDisablePartial; // "index" for fragment outputs is missing
extensionBehavior[GL_ARB_shader_image_load_store] = EBhDisable;
extensionBehavior[GL_ARB_shader_atomic_counters] = EBhDisable;
extensionBehavior[GL_ARB_derivative_control] = EBhDisable;
}
// Get code that is not part of a shared symbol table, is specific to this shader,
@ -207,7 +208,9 @@ const char* TParseContext::getPreamble()
"#define GL_ARB_shader_texture_lod 1\n"
"#define GL_ARB_explicit_attrib_location 1\n"
"#define GL_ARB_shader_image_load_store 1\n"
"#define GL_ARB_shader_atomic_counters 1\n";
"#define GL_ARB_shader_atomic_counters 1\n"
"#define GL_ARB_derivative_control 1\n"
;
}
}

1
glslang/MachineIndependent/Versions.h
View File

@ -92,6 +92,7 @@ const char* const GL_ARB_shader_texture_lod = "GL_ARB_shader_texture_lod";
const char* const GL_ARB_explicit_attrib_location = "GL_ARB_explicit_attrib_location";
const char* const GL_ARB_shader_image_load_store = "GL_ARB_shader_image_load_store";
const char* const GL_ARB_shader_atomic_counters = "GL_ARB_shader_atomic_counters";
const char* const GL_ARB_derivative_control = "GL_ARB_derivative_control";
} // end namespace glslang

6
glslang/MachineIndependent/intermOut.cpp
View File

@ -250,6 +250,12 @@ bool TOutputTraverser::visitUnary(TVisit /* visit */, TIntermUnary* node)
case EOpDPdx: out.debug << "dPdx"; break;
case EOpDPdy: out.debug << "dPdy"; break;
case EOpFwidth: out.debug << "fwidth"; break;
case EOpDPdxFine: out.debug << "dPdxFine"; break;
case EOpDPdyFine: out.debug << "dPdyFine"; break;
case EOpFwidthFine: out.debug << "fwidthFine"; break;
case EOpDPdxCoarse: out.debug << "dPdxCoarse"; break;
case EOpDPdyCoarse: out.debug << "dPdyCoarse"; break;
case EOpFwidthCoarse: out.debug << "fwidthCoarse"; break;
case EOpDeterminant: out.debug << "determinant"; break;
case EOpMatrixInverse: out.debug << "inverse"; break;
case EOpTranspose: out.debug << "transpose"; break;