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

glsl: ir_texture add clamp field

Browse Source 
For ARB_sparse_texture_clamp to hold the lodClamp parameter.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14488>
This commit is contained in:
Qiang Yu
2022-01-06 14:25:07 +08:00
committed by Marge Bot
parent 13ffd46a0f
commit 92d6b2735b
8 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/glsl/ir_reader.cpp
View File

@@ -943,6 +943,7 @@ ir_reader::read_texture(s_expression *expr)
s_expression *s_offset = NULL;
s_expression *s_proj = NULL;
s_list *s_shadow = NULL;
s_list *s_clamp = NULL;
s_expression *s_lod = NULL;
s_expression *s_sample_index = NULL;
s_expression *s_component = NULL;
@@ -950,7 +951,11 @@ ir_reader::read_texture(s_expression *expr)
ir_texture_opcode op = ir_tex; /* silence warning */
s_pattern tex_pattern[] =
{ "tex", s_type, s_sampler, s_coord, s_sparse, s_offset, s_proj, s_shadow };
{ "tex", s_type, s_sampler, s_coord, s_sparse, s_offset, s_proj, s_shadow, s_clamp };
s_pattern txb_pattern[] =
{ "txb", s_type, s_sampler, s_coord, s_sparse, s_offset, s_proj, s_shadow, s_clamp, s_lod };
s_pattern txd_pattern[] =
{ "txd", s_type, s_sampler, s_coord, s_sparse, s_offset, s_proj, s_shadow, s_clamp, s_lod };
s_pattern lod_pattern[] =
{ "lod", s_type, s_sampler, s_coord };
s_pattern txf_pattern[] =
@@ -972,6 +977,10 @@ ir_reader::read_texture(s_expression *expr)
op = ir_lod;
} else if (MATCH(expr, tex_pattern)) {
op = ir_tex;
} else if (MATCH(expr, txb_pattern)) {
op = ir_txb;
} else if (MATCH(expr, txd_pattern)) {
op = ir_txd;
} else if (MATCH(expr, txf_pattern)) {
op = ir_txf;
} else if (MATCH(expr, txf_ms_pattern)) {
@@ -1080,6 +1089,19 @@ ir_reader::read_texture(s_expression *expr)
}
}
if (op == ir_tex || op == ir_txb || op == ir_txd) {
if (s_clamp->subexpressions.is_empty()) {
tex->clamp = NULL;
} else {
tex->clamp = read_rvalue(s_clamp);
if (tex->clamp == NULL) {
ir_read_error(NULL, "when reading clamp in (%s ..)",
tex->opcode_string());
return NULL;
}
}
}
switch (op) {
case ir_txb:
tex->lod_info.bias = read_rvalue(s_lod);