diff options
| author | Kevin Rogovin <[email protected]> | 2018-08-15 14:29:28 +0300 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2018-08-20 13:32:43 -0700 |
| commit | 7ec308d978019dd9aa0e7a756b5919e34431196d (patch) | |
| tree | 19fd9ffcc40041ed33576307e15bb0512cc34e4d /src/compiler/glsl/glsl_parser.yy | |
| parent | 44df06211cf2c301f6ef9520c657ead369f99aeb (diff) | |
Add NV_fragment_shader_interlock support.
The main purpose for having NV_fragment_shader_interlock
extension is because that extension is also for GLES31 while
the ARB extension is for GL only.
Reviewed-by: Plamena Manolova <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glsl_parser.yy')
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index cb7376995d2..bc2571b6844 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -1450,10 +1450,12 @@ layout_qualifier_id: "only valid in fragment shader input layout declaration."); } else if (pixel_interlock_ordered + pixel_interlock_unordered + sample_interlock_ordered + sample_interlock_unordered > 0 && - !state->ARB_fragment_shader_interlock_enable) { + !state->ARB_fragment_shader_interlock_enable && + !state->NV_fragment_shader_interlock_enable) { _mesa_glsl_error(& @1, state, "interlock layout qualifier present, but the " - "GL_ARB_fragment_shader_interlock extension is not " + "GL_ARB_fragment_shader_interlock or " + "GL_NV_fragment_shader_interlock extension is not " "enabled."); } else { $$.flags.q.pixel_interlock_ordered = pixel_interlock_ordered; |