diff options
| author | Timothy Arceri <[email protected]> | 2018-05-08 10:10:39 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2018-05-09 14:24:36 +1000 |
| commit | 4560aad780b851f855a8adc72ea34ca4eb17634a (patch) | |
| tree | 037809301fbdb831f975b152eec0997119738c8a /src/mesa/main | |
| parent | be3ee9d141b958d41378fa8fd61255b14f5b6e74 (diff) | |
mesa: add GLSLVersionCompat constant
This allows drivers to define what version of GLSL they support
in compat. This will be needed in order to support compat 3.2
without breaking drivers that wont support it.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 2d3eb457f9b..2c87308dd73 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3649,6 +3649,7 @@ struct gl_constants GLuint MaxGeometryTotalOutputComponents; GLuint GLSLVersion; /**< Desktop GLSL version supported (ex: 120 = 1.20) */ + GLuint GLSLVersionCompat; /**< Desktop compat GLSL version supported */ /** * Changes default GLSL extension behavior from "error" to "warn". It's out diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 84babd69e2f..3f3dff0bde3 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -588,9 +588,7 @@ _mesa_get_version(const struct gl_extensions *extensions, /* Disable higher GLSL versions for legacy contexts. * This disallows creation of higher compatibility contexts. */ if (!consts->AllowHigherCompatVersion) { - if (consts->GLSLVersion > 140) { - consts->GLSLVersion = 140; - } + consts->GLSLVersion = consts->GLSLVersionCompat; } /* fall through */ case API_OPENGL_CORE: |