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

mesa: preparse [ and [0] in gl_resource_name and use it in shader_query.cpp

Browse Source 
strrchr is very expensive here.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13507>
This commit is contained in:
Marek Olšák
2021-10-22 21:02:42 -04:00
parent 4b67055fef
commit aad903c3f5
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/ir_uniform.h
View File

@@ -92,6 +92,8 @@ struct gl_resource_name
{ {
char *string; char *string;
int length; /* strlen(string) or 0 */ int length; /* strlen(string) or 0 */
int last_square_bracket; /* (strrchr(name, '[') - name) or -1 */
bool suffix_is_zero_square_bracketed; /* suffix is [0] */
}; };
struct gl_uniform_storage { struct gl_uniform_storage {

12
src/compiler/glsl/linker.cpp
View File

@@ -5043,7 +5043,19 @@ resource_name_updated(struct gl_resource_name *name)
{ {
if (name->string) { if (name->string) {
name->length = strlen(name->string); name->length = strlen(name->string);
const char *last_square_bracket = strrchr(name->string, '[');
if (last_square_bracket) {
name->last_square_bracket = last_square_bracket - name->string;
name->suffix_is_zero_square_bracketed =
strcmp(last_square_bracket, "[0]") == 0;
} else {
name->last_square_bracket = -1;
name->suffix_is_zero_square_bracketed = false;
}
} else { } else {
name->length = 0; name->length = 0;
name->last_square_bracket = -1;
name->suffix_is_zero_square_bracketed = false;
} }
} }

14
src/mesa/main/shader_query.cpp
View File

@@ -694,10 +694,8 @@ _mesa_program_resource_find_name(struct gl_shader_program *shProg,
if (!_mesa_program_get_resource_name(res, &rname)) if (!_mesa_program_get_resource_name(res, &rname))
continue; continue;
int length_without_array_index = rname.length;
const char *rname_last_square_bracket = strrchr(rname.string, '[');
bool found = false; bool found = false;
bool rname_has_array_index_zero = false;
/* From ARB_program_interface_query spec: /* From ARB_program_interface_query spec:
* *
* "uint GetProgramResourceIndex(uint program, enum programInterface, * "uint GetProgramResourceIndex(uint program, enum programInterface,
@@ -723,12 +721,10 @@ _mesa_program_resource_find_name(struct gl_shader_program *shProg,
* array's index is zero and the resulting string length is the same * array's index is zero and the resulting string length is the same
* than the provided name's length. * than the provided name's length.
*/ */
if (rname_last_square_bracket) { int length_without_array_index =
length_without_array_index -= rname_last_square_bracket - rname.string; rname.last_square_bracket >= 0 ? rname.last_square_bracket : rname.length;
rname_has_array_index_zero = bool rname_has_array_index_zero = rname.suffix_is_zero_square_bracketed &&
(strcmp(rname_last_square_bracket, "[0]") == 0) && rname.last_square_bracket == len;
(length_without_array_index == len);
}
if (len >= rname.length && strncmp(rname.string, name, rname.length) == 0) if (len >= rname.length && strncmp(rname.string, name, rname.length) == 0)
found = true; found = true;