From: Marek Olšák <[email protected]>
---
src/mesa/main/get_hash_params.py | 12 ++++++------
src/mesa/main/mtypes.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index dcfeac39190..ed5328df7cb 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -415,22 +415,22 @@ descriptor=[
[ "TRANSFORM_FEEDBACK_BUFFER_PAUSED", "LOC_CUSTOM, TYPE_BOOLEAN, 0,
extra_ARB_transform_feedback2_api_es3" ],
[ "TRANSFORM_FEEDBACK_BUFFER_ACTIVE", "LOC_CUSTOM, TYPE_BOOLEAN, 0,
extra_ARB_transform_feedback2_api_es3" ],
[ "TRANSFORM_FEEDBACK_BINDING", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_transform_feedback2_api_es3" ],
# GL_ARB_uniform_buffer_object
[ "MAX_VERTEX_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_VERTEX].MaxUniformBlocks),
extra_ARB_uniform_buffer_object" ],
[ "MAX_FRAGMENT_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_FRAGMENT].MaxUniformBlocks),
extra_ARB_uniform_buffer_object" ],
[ "MAX_COMBINED_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.MaxCombinedUniformBlocks), extra_ARB_uniform_buffer_object"
],
[ "MAX_UNIFORM_BLOCK_SIZE", "CONTEXT_INT(Const.MaxUniformBlockSize),
extra_ARB_uniform_buffer_object" ],
[ "MAX_UNIFORM_BUFFER_BINDINGS",
"CONTEXT_INT(Const.MaxUniformBufferBindings), extra_ARB_uniform_buffer_object"
],
- [ "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_VERTEX].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object" ],
- [ "MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_FRAGMENT].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object" ],
+ [ "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_VERTEX].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object" ],
+ [ "MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_FRAGMENT].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object" ],
[ "UNIFORM_BUFFER_OFFSET_ALIGNMENT",
"CONTEXT_INT(Const.UniformBufferOffsetAlignment),
extra_ARB_uniform_buffer_object" ],
[ "UNIFORM_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_uniform_buffer_object" ],
# GL_ARB_vertex_shader
[ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB",
"CONTEXT_INT(Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents),
extra_ARB_vertex_shader" ],
[ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_vertex_shader" ],
# GL_EXT_framebuffer_blit
# NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT
[ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
@@ -521,21 +521,21 @@ descriptor=[
# GL_ARB_compute_shader / GLES 3.1
[ "MAX_COMPUTE_WORK_GROUP_INVOCATIONS",
"CONTEXT_INT(Const.MaxComputeWorkGroupInvocations),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxUniformBlocks),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_TEXTURE_IMAGE_UNITS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxAtomicBuffers),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_ATOMIC_COUNTERS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxAtomicCounters),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_SHARED_MEMORY_SIZE",
"CONTEXT_INT(Const.MaxComputeSharedMemorySize), extra_ARB_compute_shader_es31"
],
[ "MAX_COMPUTE_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxUniformComponents),
extra_ARB_compute_shader_es31" ],
[ "MAX_COMPUTE_IMAGE_UNIFORMS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxImageUniforms),
extra_ARB_compute_shader_es31" ],
[ "DISPATCH_INDIRECT_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_compute_shader_es31" ],
- [ "MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_COMPUTE].MaxCombinedUniformComponents),
extra_ARB_compute_shader_es31" ],
+ [ "MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_COMPUTE].MaxCombinedUniformComponents),
extra_ARB_compute_shader_es31" ],
# GL_ARB_framebuffer_no_attachments / GLES 3.1
["MAX_FRAMEBUFFER_WIDTH", "CONTEXT_INT(Const.MaxFramebufferWidth),
extra_ARB_framebuffer_no_attachments"],
["MAX_FRAMEBUFFER_HEIGHT", "CONTEXT_INT(Const.MaxFramebufferHeight),
extra_ARB_framebuffer_no_attachments"],
["MAX_FRAMEBUFFER_SAMPLES", "CONTEXT_INT(Const.MaxFramebufferSamples),
extra_ARB_framebuffer_no_attachments"],
# GL_ARB_framebuffer_no_attachments / geometry shader
[ "MAX_FRAMEBUFFER_LAYERS", "CONTEXT_INT(Const.MaxFramebufferLayers),
extra_ARB_framebuffer_no_attachments_and_geometry_shader" ],
# GL_ARB_explicit_uniform_location / GLES 3.1
@@ -599,22 +599,22 @@ descriptor=[
[ "MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxTextureImageUnits),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxTextureImageUnits),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_CONTROL_OUTPUT_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxOutputComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_PATCH_COMPONENTS", "CONTEXT_INT(Const.MaxTessPatchComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS",
"CONTEXT_INT(Const.MaxTessControlTotalOutputComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_EVALUATION_OUTPUT_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxOutputComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_CONTROL_INPUT_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxInputComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_EVALUATION_INPUT_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxInputComponents),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_CONTROL_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxUniformBlocks),
extra_ARB_tessellation_shader" ],
[ "MAX_TESS_EVALUATION_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxUniformBlocks),
extra_ARB_tessellation_shader" ],
- [ "MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxCombinedUniformComponents),
extra_ARB_tessellation_shader" ],
- [ "MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxCombinedUniformComponents),
extra_ARB_tessellation_shader" ],
+ [ "MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_TESS_CTRL].MaxCombinedUniformComponents),
extra_ARB_tessellation_shader" ],
+ [ "MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_TESS_EVAL].MaxCombinedUniformComponents),
extra_ARB_tessellation_shader" ],
[ "PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED",
"CONTEXT_BOOL(Const.PrimitiveRestartForPatches), extra_ARB_tessellation_shader"
],
# GL_ARB_shader_image_load_store / geometry shader
[ "MAX_GEOMETRY_IMAGE_UNIFORMS",
"CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms),
extra_ARB_shader_image_load_store_and_geometry_shader" ],
# GL_ARB_shader_image_load_store / tessellation shader
[ "MAX_TESS_CONTROL_IMAGE_UNIFORMS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxImageUniforms),
extra_ARB_shader_image_load_store_and_tessellation"],
[ "MAX_TESS_EVALUATION_IMAGE_UNIFORMS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxImageUniforms),
extra_ARB_shader_image_load_store_and_tessellation"],
# GL_ARB_shader_atomic_counters / geometry shader
@@ -629,21 +629,21 @@ descriptor=[
# GL_ARB_shader_storage_buffer_object / geometry shader
[ "MAX_GEOMETRY_SHADER_STORAGE_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxShaderStorageBlocks),
extra_ARB_shader_storage_buffer_object_and_geometry_shader" ],
# GL_ARB_shader_storage_buffer_object / tessellation shader
[ "MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxShaderStorageBlocks),
extra_ARB_shader_storage_buffer_object" ],
[ "MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxShaderStorageBlocks),
extra_ARB_shader_storage_buffer_object" ],
# GL_ARB_uniform_buffer_object / geometry shader
[ "MAX_GEOMETRY_UNIFORM_BLOCKS",
"CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxUniformBlocks),
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
- [ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS",
"CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
+ [ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS",
"CONTEXT_INT64(Const.Program[MESA_SHADER_GEOMETRY].MaxCombinedUniformComponents),
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
# GL_ARB_viewport_array / GL_OES_geometry_shader
[ "LAYER_PROVOKING_VERTEX",
"CONTEXT_ENUM16(Const.LayerAndVPIndexProvokingVertex),
extra_ARB_viewport_array_or_oes_geometry_shader" ],
# GL_ARB_gpu_shader5 / GL_OES_geometry_shader
[ "MAX_GEOMETRY_SHADER_INVOCATIONS",
"CONTEXT_INT(Const.MaxGeometryShaderInvocations),
extra_ARB_gpu_shader5_or_oes_geometry_shader" ],
# GL_OES_primitive_bounding_box
[ "PRIMITIVE_BOUNDING_BOX_ARB", "CONTEXT_FLOAT8(PrimitiveBoundingBox),
extra_OES_primitive_bounding_box" ],
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 8ea0f5c2396..65f271d2744 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3577,21 +3577,21 @@ struct gl_program_constants
/*@{*/
GLuint MaxInputComponents;
GLuint MaxOutputComponents;
/*@}*/
/* ES 2.0 and GL_ARB_ES2_compatibility */
struct gl_precision LowFloat, MediumFloat, HighFloat;
struct gl_precision LowInt, MediumInt, HighInt;
/* GL_ARB_uniform_buffer_object */
GLuint MaxUniformBlocks;
- GLuint MaxCombinedUniformComponents;
+ uint64_t MaxCombinedUniformComponents;
GLuint MaxTextureImageUnits;
/* GL_ARB_shader_atomic_counters */
GLuint MaxAtomicBuffers;
GLuint MaxAtomicCounters;
/* GL_ARB_shader_image_load_store */
GLuint MaxImageUniforms;
/* GL_ARB_shader_storage_buffer_object */
--
2.17.1
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
