diff options
| author | Adam Scott <ascott.ca@gmail.com> | 2023-08-22 19:32:37 -0400 |
|---|---|---|
| committer | Adam Scott <ascott.ca@gmail.com> | 2023-08-25 10:19:25 -0400 |
| commit | 9c7db7397fd18037a03745c5988f6ad24649d3dc (patch) | |
| tree | f260b77489159a8adad6dbbea9969df7605881d4 /drivers/gles3/storage | |
| parent | 6f90b23702be158349aa544cf1d6b231600bae92 (diff) | |
| download | redot-engine-9c7db7397fd18037a03745c5988f6ad24649d3dc.tar.gz | |
Fix integer value for GL_MAX_UNIFORM_BLOCK_SIZE overflowing
Diffstat (limited to 'drivers/gles3/storage')
| -rw-r--r-- | drivers/gles3/storage/config.cpp | 16 | ||||
| -rw-r--r-- | drivers/gles3/storage/config.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp index 77a4553c76..03dde88d4b 100644 --- a/drivers/gles3/storage/config.cpp +++ b/drivers/gles3/storage/config.cpp @@ -53,9 +53,9 @@ Config::Config() { singleton = this; { - GLint max_extensions = 0; - glGetIntegerv(GL_NUM_EXTENSIONS, &max_extensions); - for (int i = 0; i < max_extensions; i++) { + int64_t max_extensions = 0; + glGetInteger64v(GL_NUM_EXTENSIONS, &max_extensions); + for (int64_t i = 0; i < max_extensions; i++) { const GLubyte *s = glGetStringi(GL_EXTENSIONS, i); if (!s) { break; @@ -88,11 +88,11 @@ Config::Config() { rgtc_supported = extensions.has("GL_EXT_texture_compression_rgtc") || extensions.has("GL_ARB_texture_compression_rgtc") || extensions.has("EXT_texture_compression_rgtc"); #endif - glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units); - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_image_units); - glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size); - glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &max_uniform_buffer_size); - glGetIntegerv(GL_MAX_VIEWPORT_DIMS, max_viewport_size); + glGetInteger64v(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units); + glGetInteger64v(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_image_units); + glGetInteger64v(GL_MAX_TEXTURE_SIZE, &max_texture_size); + glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &max_uniform_buffer_size); + glGetInteger64v(GL_MAX_VIEWPORT_DIMS, max_viewport_size); support_anisotropic_filter = extensions.has("GL_EXT_texture_filter_anisotropic"); if (support_anisotropic_filter) { diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index 623f0442bd..6b90c8c359 100644 --- a/drivers/gles3/storage/config.h +++ b/drivers/gles3/storage/config.h @@ -58,14 +58,14 @@ public: bool use_nearest_mip_filter = false; bool use_depth_prepass = true; - int max_vertex_texture_image_units = 0; - int max_texture_image_units = 0; - int max_texture_size = 0; - int max_viewport_size[2] = { 0, 0 }; - int max_uniform_buffer_size = 0; - int max_renderable_elements = 0; - int max_renderable_lights = 0; - int max_lights_per_object = 0; + int64_t max_vertex_texture_image_units = 0; + int64_t max_texture_image_units = 0; + int64_t max_texture_size = 0; + int64_t max_viewport_size[2] = { 0, 0 }; + int64_t max_uniform_buffer_size = 0; + int64_t max_renderable_elements = 0; + int64_t max_renderable_lights = 0; + int64_t max_lights_per_object = 0; // TODO implement wireframe in OpenGL // bool generate_wireframes; |