fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: remove extra calculation of sampler count

Browse source 
This code was originally introduced to fix https://bugs.freedesktop.org/show_bug.cgi?id=53617. The comment says you need to pass NULL in order to unref old views however cso_set_sampler_views() already takes care of old views with the second for loop. Also as of 2355a64414 cso_set_sampler_views() passes the max of the old and new views to the driver for all state trackers making this code obsolete.

Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Timothy Arceri 2014-06-07 12:02:56 +10:00
parent d588a4919b
commit 1454f894ff
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/state_tracker/st_atom_texture.c
View file

@ -358,7 +358,7 @@ update_textures(struct st_context *st,
{
const GLuint old_max = *num_textures;
GLbitfield samplers_used = prog->SamplersUsed;
GLuint unit, new_count;
GLuint unit;
if (samplers_used == 0x0 && old_max == 0)
return;
@ -387,16 +387,9 @@ update_textures(struct st_context *st,
pipe_sampler_view_reference(&(sampler_views[unit]), sampler_view);
}
/* Ex: if old_max = 3 and *num_textures = 1, we need to pass an
* array of views={X, NULL, NULL} to unref the old texture views
* at positions [1] and [2].
*/
new_count = MAX2(*num_textures, old_max);
assert(new_count <= max_units);
cso_set_sampler_views(st->cso_context,
shader_stage,
new_count,
*num_textures,
sampler_views);
}