fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: update textures for bindless samplers bound to texture units

Browse source 
This is analogous to the existing SamplerUnits and SamplerTargets,
but it loops over bindless samplers bound to texture units.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset 2017-05-11 17:29:53 +02:00
parent 9eaad42c58
commit 70f2573103
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/main/texstate.c
View file

@ -704,6 +704,7 @@ update_program_texture_state(struct gl_context *ctx, struct gl_program **prog,
for (i = 0; i < MESA_SHADER_STAGES; i++) {
GLbitfield mask;
GLuint s;
if (!prog[i])
continue;
@ -711,12 +712,27 @@ update_program_texture_state(struct gl_context *ctx, struct gl_program **prog,
mask = prog[i]->SamplersUsed;
while (mask) {
const int s = u_bit_scan(&mask);
s = u_bit_scan(&mask);
update_single_program_texture_state(ctx, prog[i],
prog[i]->SamplerUnits[s],
enabled_texture_units);
}
if (unlikely(prog[i]->sh.HasBoundBindlessSampler)) {
/* Loop over bindless samplers bound to texture units.
*/
for (s = 0; s < prog[i]->sh.NumBindlessSamplers; s++) {
struct gl_bindless_sampler *sampler =
&prog[i]->sh.BindlessSamplers[s];
if (!sampler->bound)
continue;
update_single_program_texture_state(ctx, prog[i], sampler->unit,
enabled_texture_units);
}
}
}
if (prog[MESA_SHADER_FRAGMENT]) {

17
src/mesa/main/uniforms.c
View file

@ -105,18 +105,33 @@ _mesa_update_shader_textures_used(struct gl_shader_program *shProg,
gl_shader_stage prog_stage =
_mesa_program_enum_to_shader_stage(prog->Target);
struct gl_linked_shader *shader = shProg->_LinkedShaders[prog_stage];
GLuint s;
assert(shader);
memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
while (mask) {
const int s = u_bit_scan(&mask);
s = u_bit_scan(&mask);
update_single_shader_texture_used(shProg, prog,
prog->SamplerUnits[s],
prog->sh.SamplerTargets[s]);
}
if (unlikely(prog->sh.HasBoundBindlessSampler)) {
/* Loop over bindless samplers bound to texture units.
*/
for (s = 0; s < prog->sh.NumBindlessSamplers; s++) {
struct gl_bindless_sampler *sampler = &prog->sh.BindlessSamplers[s];
if (!sampler->bound)
continue;
update_single_shader_texture_used(shProg, prog, sampler->unit,
sampler->target);
}
}
}
/**