projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a15313
)
tu: Fix wrong copies of sampler descriptor.
author
Hyunjun Ko
<zzoon@igalia.com>
Tue, 14 Jul 2020 00:47:30 +0000
(
00:47
+0000)
committer
Marge Bot
<eric+marge@anholt.net>
Tue, 14 Jul 2020 02:48:30 +0000
(
02:48
+0000)
Found this with the following patch but it exists since adding ycbcr
sampler to the struct.
Fixes:
d070a7ba0cfb11f1e01774b9dd3775ab7cd0c4ea
Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>
src/freedreno/vulkan/tu_descriptor_set.c
patch
|
blob
|
history
diff --git
a/src/freedreno/vulkan/tu_descriptor_set.c
b/src/freedreno/vulkan/tu_descriptor_set.c
index
ec2a940
..
9dbd85b
100644
(file)
--- a/
src/freedreno/vulkan/tu_descriptor_set.c
+++ b/
src/freedreno/vulkan/tu_descriptor_set.c
@@
-849,7
+849,7
@@
write_combined_image_sampler_descriptor(struct tu_device *device,
descriptor_type, image_info);
/* copy over sampler state */
if (has_sampler) {
- memcpy(dst + A6XX_TEX_CONST_DWORDS, sampler
, sizeof(*sample
r));
+ memcpy(dst + A6XX_TEX_CONST_DWORDS, sampler
->descriptor, sizeof(sampler->descripto
r));
}
}
@@
-860,7
+860,7
@@
write_sampler_descriptor(struct tu_device *device,
{
TU_FROM_HANDLE(tu_sampler, sampler, image_info->sampler);
- memcpy(dst, sampler
, sizeof(*sample
r));
+ memcpy(dst, sampler
->descriptor, sizeof(sampler->descripto
r));
}
void