fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-18 23:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

gallium/vl: Rename s_addr variable in vl_idct.c as it conflicts with windows existing inaddr.h keyword definition

Browse source 
Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18328>
This commit is contained in:
Sil Vilerino 2022-09-14 10:12:22 -04:00
parent e0b732e506
commit f2d172a8be
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/auxiliary/vl/vl_idct.c
View file

@ -219,10 +219,10 @@ create_mismatch_frag_shader(struct vl_idct *idct)
}
for (i = 0; i < 8; ++i) {
struct ureg_src s_addr[2];
s_addr[0] = ureg_src(m[i][0]);
s_addr[1] = ureg_src(m[i][1]);
fetch_four(shader, m[i], s_addr, ureg_DECL_sampler(shader, 0), false);
struct ureg_src s_address[2];
s_address[0] = ureg_src(m[i][0]);
s_address[1] = ureg_src(m[i][1]);
fetch_four(shader, m[i], s_address, ureg_DECL_sampler(shader, 0), false);
}
for (i = 1; i < 8; ++i) {
@ -355,20 +355,20 @@ create_stage1_frag_shader(struct vl_idct *idct)
}
for (i = 0; i < 4; ++i) {
struct ureg_src s_addr[2];
s_addr[0] = ureg_src(l[i][0]);
s_addr[1] = ureg_src(l[i][1]);
fetch_four(shader, l[i], s_addr, ureg_DECL_sampler(shader, 0), false);
struct ureg_src s_address[2];
s_address[0] = ureg_src(l[i][0]);
s_address[1] = ureg_src(l[i][1]);
fetch_four(shader, l[i], s_address, ureg_DECL_sampler(shader, 0), false);
}
for (i = 0; i < idct->nr_of_render_targets; ++i) {
struct ureg_src s_addr[2];
struct ureg_src s_address[2];
increment_addr(shader, r, r_addr, true, true, i - (signed)idct->nr_of_render_targets / 2, VL_BLOCK_HEIGHT);
s_addr[0] = ureg_src(r[0]);
s_addr[1] = ureg_src(r[1]);
fetch_four(shader, r, s_addr, ureg_DECL_sampler(shader, 1), false);
s_address[0] = ureg_src(r[0]);
s_address[1] = ureg_src(r[1]);
fetch_four(shader, r, s_address, ureg_DECL_sampler(shader, 1), false);
for (j = 0; j < 4; ++j) {
matrix_mul(shader, ureg_writemask(fragment[i], TGSI_WRITEMASK_X << j), l[j], r);