projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-sampler-view
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_state_fs.c
diff --git
a/src/gallium/drivers/svga/svga_state_fs.c
b/src/gallium/drivers/svga/svga_state_fs.c
index 2973444d0ab084e8b89cd86a477a573599f9daa3..1310fd9825fa8a71d7f686cf0107fce422b331c7 100644
(file)
--- a/
src/gallium/drivers/svga/svga_state_fs.c
+++ b/
src/gallium/drivers/svga/svga_state_fs.c
@@
-158,10
+158,11
@@
static int make_fs_key( const struct svga_context *svga,
*
* SVGA_NEW_TEXTURE_BINDING | SVGA_NEW_SAMPLER
*/
*
* SVGA_NEW_TEXTURE_BINDING | SVGA_NEW_SAMPLER
*/
- for (i = 0; i < svga->curr.num_
texture
s; i++) {
- if (svga->curr.
texture
[i]) {
+ for (i = 0; i < svga->curr.num_
sampler_view
s; i++) {
+ if (svga->curr.
sampler_views
[i]) {
assert(svga->curr.sampler[i]);
assert(svga->curr.sampler[i]);
- key->tex[i].texture_target = svga->curr.texture[i]->target;
+ assert(svga->curr.sampler_views[i]->texture);
+ key->tex[i].texture_target = svga->curr.sampler_views[i]->texture->target;
if (!svga->curr.sampler[i]->normalized_coords) {
key->tex[i].width_height_idx = idx++;
key->tex[i].unnormalized = TRUE;
if (!svga->curr.sampler[i]->normalized_coords) {
key->tex[i].width_height_idx = idx++;
key->tex[i].unnormalized = TRUE;
@@
-169,7
+170,7
@@
static int make_fs_key( const struct svga_context *svga,
}
}
}
}
}
}
- key->num_textures = svga->curr.num_
texture
s;
+ key->num_textures = svga->curr.num_
sampler_view
s;
idx = 0;
for (i = 0; i < svga->curr.num_samplers; ++i) {
idx = 0;
for (i = 0; i < svga->curr.num_samplers; ++i) {