third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vrend: rename id -> shader_type in bind_sampler_locs()

Browse Source 
Refactor only. There are a lot of variables named like *_id/*_index
already.

Signed-off-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Ryan Neph 3 years ago
parent c2fc38f993
commit a28726131f
1 changed files with 13 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      src/vrend_renderer.c

26
src/vrend_renderer.c
Unescape View File

@ -1433,21 +1433,21 @@ static void set_stream_out_varyings(MAYBE_UNUSED struct vrend_sub_context *sub_c
} }
static int bind_sampler_locs(struct vrend_linked_shader_program *sprog, static int bind_sampler_locs(struct vrend_linked_shader_program *sprog,
int id, int next_sampler_id) int shader_type, int next_sampler_id)
{ {
const struct vrend_shader_info *sinfo = &sprog->ss[id]->sel->sinfo; const struct vrend_shader_info *sinfo = &sprog->ss[shader_type]->sel->sinfo;
if (sinfo->samplers_used_mask) { if (sinfo->samplers_used_mask) {
uint32_t mask = sinfo->samplers_used_mask; uint32_t mask = sinfo->samplers_used_mask;
sprog->shadow_samp_mask[id] = sinfo->shadow_samp_mask; sprog->shadow_samp_mask[shader_type] = sinfo->shadow_samp_mask;
if (sinfo->shadow_samp_mask) { if (sinfo->shadow_samp_mask) {
unsigned nsamp = util_bitcount(sinfo->samplers_used_mask); unsigned nsamp = util_bitcount(sinfo->samplers_used_mask);
sprog->shadow_samp_mask_locs[id] = calloc(nsamp, sizeof(uint32_t)); sprog->shadow_samp_mask_locs[shader_type] = calloc(nsamp, sizeof(uint32_t));
sprog->shadow_samp_add_locs[id] = calloc(nsamp, sizeof(uint32_t)); sprog->shadow_samp_add_locs[shader_type] = calloc(nsamp, sizeof(uint32_t));
} else { } else {
sprog->shadow_samp_mask_locs[id] = sprog->shadow_samp_add_locs[id] = NULL; sprog->shadow_samp_mask_locs[shader_type] = sprog->shadow_samp_add_locs[shader_type] = NULL;
} }
const char *prefix = pipe_shader_to_prefix(id); const char *prefix = pipe_shader_to_prefix(shader_type);
int sampler_index = 0; int sampler_index = 0;
while(mask) { while(mask) {
uint32_t i = u_bit_scan(&mask); uint32_t i = u_bit_scan(&mask);
@ -1462,18 +1462,18 @@ static int bind_sampler_locs(struct vrend_linked_shader_program *sprog,
if (sinfo->shadow_samp_mask & (1 << i)) { if (sinfo->shadow_samp_mask & (1 << i)) {
snprintf(name, 32, "%sshadmask%d", prefix, i); snprintf(name, 32, "%sshadmask%d", prefix, i);
sprog->shadow_samp_mask_locs[id][sampler_index] = glGetUniformLocation(sprog->id, name); sprog->shadow_samp_mask_locs[shader_type][sampler_index] = glGetUniformLocation(sprog->id, name);
snprintf(name, 32, "%sshadadd%d", prefix, i); snprintf(name, 32, "%sshadadd%d", prefix, i);
sprog->shadow_samp_add_locs[id][sampler_index] = glGetUniformLocation(sprog->id, name); sprog->shadow_samp_add_locs[shader_type][sampler_index] = glGetUniformLocation(sprog->id, name);
} }
sampler_index++; sampler_index++;
} }
} else { } else {
sprog->shadow_samp_mask_locs[id] = NULL; sprog->shadow_samp_mask_locs[shader_type] = NULL;
sprog->shadow_samp_add_locs[id] = NULL; sprog->shadow_samp_add_locs[shader_type] = NULL;
sprog->shadow_samp_mask[id] = 0; sprog->shadow_samp_mask[shader_type] = 0;
} }
sprog->samplers_used_mask[id] = sinfo->samplers_used_mask; sprog->samplers_used_mask[shader_type] = sinfo->samplers_used_mask;
return next_sampler_id; return next_sampler_id;
} }

Write Preview
Loading…
Cancel
Save