OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f368ea3
)
st/mesa: set st_context::...num_samplers to 0 when there are no samplers
author
Marek Olšák
<marek.olsak@amd.com>
Wed, 14 Jun 2017 16:31:06 +0000
(18:31 +0200)
committer
Marek Olšák
<marek.olsak@amd.com>
Wed, 21 Jun 2017 23:51:02 +0000
(
01:51
+0200)
This was missed during my st/mesa series.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/mesa/state_tracker/st_atom_sampler.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_atom_sampler.c
b/src/mesa/state_tracker/st_atom_sampler.c
index
5eb8584
..
00fc354
100644
(file)
--- a/
src/mesa/state_tracker/st_atom_sampler.c
+++ b/
src/mesa/state_tracker/st_atom_sampler.c
@@
-252,8
+252,10
@@
update_shader_samplers(struct st_context *st,
unsigned unit, num_samplers;
const struct pipe_sampler_state *states[PIPE_MAX_SAMPLERS];
- if (samplers_used == 0x0)
+ if (samplers_used == 0x0) {
+ *out_num_samplers = 0;
return;
+ }
num_samplers = util_last_bit(samplers_used);