OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Refactor some single-pixel util_format_read/writes.

Browse Source 
We can use the new row helpers to cut down on the noise.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2744>
This commit is contained in:
Eric Anholt
2019-11-08 14:56:07 -08:00
committed by Marge Bot
parent ab081970e0
commit 1d367c3aa5
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/util/u_pack_color.h
View File

@@ -430,7 +430,7 @@ util_pack_color(const float rgba[4], enum pipe_format format, union util_color *
/* Handle other cases with a generic function.
*/
default:
util_format_write_4f(format, rgba, 0, uc, 0, 0, 0, 1, 1);
util_format_pack_rgba(format, uc, rgba, 1);
}
}

4
src/gallium/state_trackers/xvmc/subpicture.c
View File

@@ -385,9 +385,7 @@ Status XvMCClearSubpicture(Display *dpy, XvMCSubpicture *subpicture, short x, sh
return XvMCBadSubpicture;
/* Convert color to float */
util_format_read_4f(PIPE_FORMAT_B8G8R8A8_UNORM,
uc.f, 1, &color, 4,
0, 0, 1, 1);
util_format_unpack_rgba(PIPE_FORMAT_B8G8R8A8_UNORM, uc.f, &color, 1);
subpicture_priv = subpicture->privData;
context_priv = subpicture_priv->context->privData;

14
src/gallium/tests/trivial/compute.c
View File

@@ -1072,7 +1072,7 @@ static void test_surface_ld_init0f(void *p, int s, int x, int y)
float v[] = { 1.0, -.75, .50, -.25 };
int i = 0;
util_format_write_4f(surface_fmts[i], v, 0, p, 0, 0, 0, 1, 1);
util_format_pack_rgba(surface_fmts[i], p, v, 1);
}
static void test_surface_ld_init0i(void *p, int s, int x, int y)
@@ -1080,7 +1080,7 @@ static void test_surface_ld_init0i(void *p, int s, int x, int y)
int v[] = { 0xffffffff, 0xffff, 0xff, 0xf };
int i = 0;
util_format_write_4i(surface_fmts[i], v, 0, p, 0, 0, 0, 1, 1);
util_format_pack_rgba(surface_fmts[i], p, v, 1);
}
static void test_surface_ld_expectf(void *p, int s, int x, int y)
@@ -1089,7 +1089,7 @@ static void test_surface_ld_expectf(void *p, int s, int x, int y)
int i = 0;
test_surface_ld_init0f(v, s, x / 4, y);
util_format_read_4f(surface_fmts[i], w, 0, v, 0, 0, 0, 1, 1);
util_format_unpack_rgba(surface_fmts[i], w, v, 1);
*(float *)p = w[x % 4];
}
@@ -1099,7 +1099,7 @@ static void test_surface_ld_expecti(void *p, int s, int x, int y)
int i = 0;
test_surface_ld_init0i(v, s, x / 4, y);
util_format_read_4i(surface_fmts[i], w, 0, v, 0, 0, 0, 1, 1);
util_format_unpack_rgba(surface_fmts[i], w, v, 1);
*(uint32_t *)p = w[x % 4];
}
@@ -1180,7 +1180,7 @@ static void test_surface_st_expectf(void *p, int s, int x, int y)
for (j = 0; j < 4; j++)
test_surface_st_init0f(&vf[j], s, 4 * x + j, y);
util_format_write_4f(surface_fmts[i], vf, 0, p, 0, 0, 0, 1, 1);
util_format_pack_rgba(surface_fmts[i], p, vf, 1);
}
static void test_surface_st_expects(void *p, int s, int x, int y)
@@ -1190,7 +1190,7 @@ static void test_surface_st_expects(void *p, int s, int x, int y)
for (j = 0; j < 4; j++)
test_surface_st_init0i(&v[j], s, 4 * x + j, y);
util_format_write_4i(surface_fmts[i], v, 0, p, 0, 0, 0, 1, 1);
util_format_pack_rgba(surface_fmts[i], p, v, 1);
}
static void test_surface_st_expectu(void *p, int s, int x, int y)
@@ -1200,7 +1200,7 @@ static void test_surface_st_expectu(void *p, int s, int x, int y)
for (j = 0; j < 4; j++)
test_surface_st_init0i(&v[j], s, 4 * x + j, y);
util_format_write_4ui(surface_fmts[i], v, 0, p, 0, 0, 0, 1, 1);
util_format_pack_rgba(surface_fmts[i], p, v, 1);
}
static bool test_surface_st_check(void *x, void *y, int sz)