summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2018-01-11 02:10:25 +0100
committerRoland Scheidegger <[email protected]>2018-01-12 02:52:10 +0100
commit734bef372d80a2ebf5677eb4fbd0e939f2b3cfb4 (patch)
tree6b360647f6492b64f3dcb3a61e8e242f7dcd1c12
parent85377dc55c55d1c5536cdf9a86ce67ebb59b7e77 (diff)
mesa: require at least 14 UBOs for GL 4.3
ARB_ubo requires 12 UBOs (per stage) at least, but this limit has been raised by GL 4.3 to 14, so don't advertize GL 4.3 without it (only checking the vertex stage since all drivers probably have the same limit anyway for other stages). (piglit has minmax tests for that kind of thing, but they go only up to 3.3, so this won't really be noticed.) I think this currently should not affect any driver - r600 until very recently only supported 12 but now advertizes 14 too. Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/main/version.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 90c5c5f84e0..68079f4ebbb 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -352,6 +352,7 @@ compute_version(const struct gl_extensions *extensions,
extensions->ARB_transform_feedback_instanced);
const bool ver_4_3 = (ver_4_2 &&
consts->GLSLVersion >= 430 &&
+ consts->Program[MESA_SHADER_VERTEX].MaxUniformBlocks >= 14 &&
extensions->ARB_ES3_compatibility &&
extensions->ARB_arrays_of_arrays &&
extensions->ARB_compute_shader &&