mesa: bump GL_MAX_ELEMENTS_INDICES and GL_MAX_ELEMENTS_VERTICES

same number as our closed GL driver

v2: don't use MaxArrayLockSize

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 6a2f766222a282774e198cbf9f72e25ab818083d..6f5146500098577a1520d83e6ead14bbeb7004f8 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -141,6 +141,9 @@
 /** Maximum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
 
+/** For GL_MAX_ELEMENTS_INDICES and GL_MAX_ELEMENTS_VERTICES. */
+#define MAX_ELEMENTS_VERTICES_INDICES  (512 * 1024 * 1024)
+
 /** Subpixel precision for antialiasing, window coordinate snapping */
 #define SUB_PIXEL_BITS 4
 

diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 5c672a331238b752d31465515b86511bf50f244f..03409daa8e7636f5be36d2713ab4ad59d5ac4ddf 100644 (file)
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -19,8 +19,8 @@ descriptor=[
   [ "GREEN_BITS", "BUFFER_INT(Visual.greenBits), extra_new_buffers" ],
   [ "LINE_WIDTH", "CONTEXT_FLOAT(Line.Width), NO_EXTRA" ],
   [ "ALIASED_LINE_WIDTH_RANGE", "CONTEXT_FLOAT2(Const.MinLineWidth), NO_EXTRA" ],
-  [ "MAX_ELEMENTS_VERTICES", "CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA" ],
-  [ "MAX_ELEMENTS_INDICES", "CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA" ],
+  [ "MAX_ELEMENTS_VERTICES", "CONST(MAX_ELEMENTS_VERTICES_INDICES), NO_EXTRA" ],
+  [ "MAX_ELEMENTS_INDICES", "CONST(MAX_ELEMENTS_VERTICES_INDICES), NO_EXTRA" ],
   [ "MAX_TEXTURE_SIZE", "LOC_CUSTOM, TYPE_INT, offsetof(struct gl_context, Const.MaxTextureLevels), NO_EXTRA" ],
   [ "MAX_VIEWPORT_DIMS", "CONTEXT_INT2(Const.MaxViewportWidth), NO_EXTRA" ],
   [ "PACK_ALIGNMENT", "CONTEXT_INT(Pack.Alignment), NO_EXTRA" ],