diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-02-23 11:39:53 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-04 01:51:16 +0000 |
| commit | 61c1aabb9f25a6e0710ab6a49a9fb889c4fa7752 (patch) | |
| tree | bbaf1424929cb168a0e802ce0f0ff9ac8a012e97 | |
| parent | 6da4e66d4e1785d37ed06007a8804d955ddab9f6 (diff) | |
radeonsi: fix point sprites
Broken by a27b74819ad375e8c0bc88e13f42c951d2b5cd6a.
This fix is critical and should be ported to stable ASAP.
Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 7820a11e3dea2aca8e2b9b4ed9faf94ff5696990)
Squashed with commit
radeonsi: fix a warning caused by previous commit
Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 050bf75c8bbaa7cad537aabaf8612129edfee3a4)
[Emil Velikov: The file was renamed si_state_{shaders,draw}.c]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Conflicts:
src/gallium/drivers/radeonsi/si_state_shader.c
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index c85b1cce87f..137394fc8d4 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -544,7 +544,7 @@ bcolor: } } - if (j == vsinfo->num_outputs) { + if (j == vsinfo->num_outputs && !G_028644_PT_SPRITE_TEX(tmp)) { /* No corresponding output found, load defaults into input. * Don't set any other bits. * (FLAT_SHADE=1 completely changes behavior) */ |