diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-28 20:34:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 20:34:17 +0200 |
| commit | 8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab (patch) | |
| tree | cd8ed89c8e953679ce42aa01925b4e9861137ec1 /drivers/gles3/rasterizer_canvas_gles3.cpp | |
| parent | 1c820f19b1a0ba72316896ad354cb31391638a3b (diff) | |
| parent | 4b42379c8fb89c28a8c38e79ac3573f5b34f8fb4 (diff) | |
| download | redot-engine-8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab.tar.gz | |
Merge pull request #59840 from Calinou/renderingserver-global-uniform-rename
Diffstat (limited to 'drivers/gles3/rasterizer_canvas_gles3.cpp')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index e37c10b4b1..abbc11847f 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -183,7 +183,7 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_ glBindBufferBase(GL_UNIFORM_BUFFER, BASE_UNIFORM_LOCATION, state.canvas_state_buffer); glBufferData(GL_UNIFORM_BUFFER, sizeof(StateBuffer), &state_buffer, GL_STREAM_DRAW); - GLuint global_buffer = material_storage->global_variables_get_uniform_buffer(); + GLuint global_buffer = material_storage->global_shader_uniforms_get_uniform_buffer(); glBindBufferBase(GL_UNIFORM_BUFFER, GLOBAL_UNIFORM_LOCATION, global_buffer); glBindBuffer(GL_UNIFORM_BUFFER, 0); @@ -1570,7 +1570,7 @@ RasterizerCanvasGLES3::RasterizerCanvasGLES3() { glBindBuffer(GL_UNIFORM_BUFFER, 0); String global_defines; - global_defines += "#define MAX_GLOBAL_VARIABLES 256\n"; // TODO: this is arbitrary for now + global_defines += "#define MAX_GLOBAL_SHADER_UNIFORMS 256\n"; // TODO: this is arbitrary for now global_defines += "#define MAX_LIGHTS " + itos(state.max_instances_per_batch) + "\n"; global_defines += "#define MAX_DRAW_DATA_INSTANCES " + itos(state.max_instances_per_batch) + "\n"; |