diff options
| author | Marek Olšák <[email protected]> | 2018-08-06 08:13:35 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-08-23 16:56:17 -0400 |
| commit | 095515e16ca3cb2c9f1813b6602ee57ae28325a8 (patch) | |
| tree | f3fee3164ab98bc7979c81ea2f9c34f6881d8f26 | |
| parent | 356ff963ecd998aec9136441e0c4a45dadbde355 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/mesa/main/config.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 6a2f766222a..6f514650009 100644 --- 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 5c672a33123..03409daa8e7 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", "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" ], |