fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 12:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi,radv: use nir_format_linear_to_srgb

Browse source 
There's little point in open-coding this, when we already have a helper
for it.

This adds an fsat to both code-paths. Not sure if that's good or bad, or
if it even matters at all.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23201>
This commit is contained in:
Erik Faye-Lund 2023-05-08 10:28:45 +02:00 • committed by Marge Bot
parent 1d13f22174
commit d6deb977c8
2 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/amd/vulkan/meta/radv_meta_resolve_cs.c
View file

@ -25,6 +25,8 @@
#include <stdbool.h>
#include "nir/nir_builder.h"
#include "nir/nir_format_convert.h"
#include "radv_meta.h"
#include "radv_private.h"
#include "sid.h"
@ -34,26 +36,9 @@ static nir_ssa_def *
radv_meta_build_resolve_srgb_conversion(nir_builder *b, nir_ssa_def *input)
{
unsigned i;
nir_ssa_def *cmp[3];
for (i = 0; i < 3; i++)
cmp[i] = nir_flt(b, nir_channel(b, input, i), nir_imm_int(b, 0x3b4d2e1c));
nir_ssa_def *ltvals[3];
for (i = 0; i < 3; i++)
ltvals[i] = nir_fmul_imm(b, nir_channel(b, input, i), 12.92);
nir_ssa_def *gtvals[3];
for (i = 0; i < 3; i++) {
gtvals[i] = nir_fpow(b, nir_channel(b, input, i), nir_imm_float(b, 1.0 / 2.4));
gtvals[i] = nir_fmul_imm(b, gtvals[i], 1.055);
gtvals[i] = nir_fadd_imm(b, gtvals[i], -0.055);
}
nir_ssa_def *comp[4];
for (i = 0; i < 3; i++)
comp[i] = nir_bcsel(b, cmp[i], ltvals[i], gtvals[i]);
comp[i] = nir_format_linear_to_srgb(b, nir_channel(b, input, i));
comp[3] = nir_channels(b, input, 1 << 3);
return nir_vec(b, comp, 4);
}

19
src/gallium/drivers/radeonsi/si_shaderlib_nir.c
View file

@ -8,6 +8,8 @@
#include "ac_surface.h"
#include "si_pipe.h"
#include "nir_format_convert.h"
static void *create_shader_state(struct si_context *sctx, nir_shader *nir)
{
sctx->b.screen->finalize_nir(sctx->b.screen, (void*)nir);
@ -285,25 +287,10 @@ static nir_ssa_def *convert_linear_to_srgb(nir_builder *b, nir_ssa_def *input)
/* There are small precision differences compared to CB, so the gfx blit will return slightly
* different results.
*/
nir_ssa_def *cmp[3];
for (unsigned i = 0; i < 3; i++)
cmp[i] = nir_flt(b, nir_channel(b, input, i), nir_imm_float(b, 0.0031308));
nir_ssa_def *ltvals[3];
for (unsigned i = 0; i < 3; i++)
ltvals[i] = nir_fmul_imm(b, nir_channel(b, input, i), 12.92);
nir_ssa_def *gtvals[3];
for (unsigned i = 0; i < 3; i++) {
gtvals[i] = nir_fpow(b, nir_channel(b, input, i), nir_imm_float(b, 1.0/2.4));
gtvals[i] = nir_fmul_imm(b, gtvals[i], 1.055);
gtvals[i] = nir_fadd_imm(b, gtvals[i], -0.055);
}
nir_ssa_def *comp[4];
for (unsigned i = 0; i < 3; i++)
comp[i] = nir_bcsel(b, cmp[i], ltvals[i], gtvals[i]);
comp[i] = nir_format_linear_to_srgb(b, nir_channel(b, input, i));
comp[3] = nir_channel(b, input, 3);
return nir_vec(b, comp, 4);