griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #144174: DRW: Base instance workaround not working

Browse Source 
The part of the workaround that was inside the gpu module
was not updated.

Candidate for backporting to 4.5 LTS.

Pull Request: https://projects.blender.org/blender/blender/pulls/144346
This commit is contained in:
Clément Foucault
2025-08-11 14:22:01 +02:00
committed by Clément Foucault
parent 92b555452b
commit ca57cf0750
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/intern/shaders/draw_model_lib.glsl
View File

@@ -25,7 +25,7 @@ uint drw_resource_id_raw()
#if defined(GPU_VERTEX_SHADER)
# if defined(RESOURCE_ID_FALLBACK)
# ifdef WITH_CUSTOM_IDS
uint id = in_resource_id.x;
uint id = in_resource_id_custom_id.x;
# else
uint id = in_resource_id;
# endif
@@ -54,7 +54,7 @@ uint drw_custom_id()
#ifdef WITH_CUSTOM_IDS
# if defined(GPU_VERTEX_SHADER)
# if defined(RESOURCE_ID_FALLBACK)
return in_resource_id.y;
return in_resource_id_custom_id.y;
# else
uint inst_id = gpu_BaseInstance + gl_InstanceID;
return resource_id_buf[gpu_BaseInstance + gl_InstanceID].y;

2
source/blender/draw/intern/shaders/draw_view_info.hh
View File

@@ -59,7 +59,7 @@ GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_resource_with_custom_id_fallback)
DEFINE("RESOURCE_ID_FALLBACK")
DEFINE("WITH_CUSTOM_IDS")
VERTEX_IN(15, uint2, in_resource_id)
VERTEX_IN(15, uint2, in_resource_id_custom_id)
GPU_SHADER_CREATE_END()
/** \} */

6
source/blender/gpu/opengl/gl_vertex_array.cc
View File

@@ -107,11 +107,11 @@ void GLVertArray::update_bindings(const GLuint vao,
}
if (batch->resource_id_buf) {
const ShaderInput *input = interface->attr_get("drw_ResourceID");
const ShaderInput *input = interface->attr_get("in_resource_id");
int component_len = 1;
if (input == nullptr) {
/* Uses Custom IDs */
input = interface->attr_get("vertex_in_drw_ResourceID");
input = interface->attr_get("in_resource_id_custom_id");
component_len = 2;
}
if (input) {
@@ -119,7 +119,7 @@ void GLVertArray::update_bindings(const GLuint vao,
glEnableVertexAttribArray(input->location);
glVertexAttribDivisor(input->location, 1);
glVertexAttribIPointer(
input->location, component_len, to_gl(GPU_COMP_I32), 0, (GLvoid *)nullptr);
input->location, component_len, to_gl(GPU_COMP_U32), 0, (GLvoid *)nullptr);
attr_mask &= ~(1 << input->location);
}
}