Mesa (master): Revert "mesa: bump GL_MAX_ELEMENTS_INDICES and GL_MAX_ELEMENTS_VERTICES"

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 93e8e17fa414d95af517581e152f95ec96e0c4d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=93e8e17fa414d95af517581e152f95ec96e0c4d3

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Aug 24 00:32:09 2018 -0700

Revert "mesa: bump GL_MAX_ELEMENTS_INDICES and GL_MAX_ELEMENTS_VERTICES"

This reverts commit 095515e16ca3cb2c9f1813b6602ee57ae28325a8.

This breaks KHR-GL46.map_buffer_alignment.functional on i965.

This code was apparently not reviewed and I don't know why we would
move from a driver configurable constant to a hardcoded value for all
drivers.  This really looks like an accidental hack push.

---

 src/mesa/main/config.h           | 3 ---
 src/mesa/main/get_hash_params.py | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 6f51465000..6a2f766222 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -141,9 +141,6 @@
 /** 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 5e89a869f3..ed5328df7c 100644
--- 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", "CONST(MAX_ELEMENTS_VERTICES_INDICES), NO_EXTRA" ],
-  [ "MAX_ELEMENTS_INDICES", "CONST(MAX_ELEMENTS_VERTICES_INDICES), NO_EXTRA" ],
+  [ "MAX_ELEMENTS_VERTICES", "CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA" ],
+  [ "MAX_ELEMENTS_INDICES", "CONTEXT_INT(Const.MaxArrayLockSize), 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" ],