Skip to content

Commit 98d4d5f

Browse files
committed
slang_preprocess_parse_parameters - no more gotos
1 parent 8181583 commit 98d4d5f

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

gfx/drivers_shader/slang_process.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -395,22 +395,21 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta,
395395
bool slang_preprocess_parse_parameters(const char *shader_path,
396396
struct video_shader *shader)
397397
{
398-
glslang_meta meta;
399398
struct string_list lines = {0};
400399

401-
if (!string_list_initialize(&lines))
402-
goto error;
403-
404-
if (!glslang_read_shader_file(shader_path, &lines, true, false))
405-
goto error;
406-
meta = glslang_meta{};
407-
if (!glslang_parse_meta(&lines, &meta))
408-
goto error;
409-
410-
string_list_deinitialize(&lines);
411-
return slang_preprocess_parse_parameters(meta, shader);
400+
if (string_list_initialize(&lines))
401+
{
402+
if (glslang_read_shader_file(shader_path, &lines, true, false))
403+
{
404+
glslang_meta meta = glslang_meta{};
405+
if (glslang_parse_meta(&lines, &meta))
406+
{
407+
string_list_deinitialize(&lines);
408+
return slang_preprocess_parse_parameters(meta, shader);
409+
}
410+
}
411+
}
412412

413-
error:
414413
string_list_deinitialize(&lines);
415414
return false;
416415
}

0 commit comments

Comments
 (0)