diff --git a/render/memory_test.odin b/render/memory_test.odin index 05cfeaad1..e7cc8a86d 100644 --- a/render/memory_test.odin +++ b/render/memory_test.odin @@ -20,12 +20,12 @@ memory_limit_proc :: proc(data: rawptr, mode: runtime.Allocator_Mode, size, alig } @(private = "file") -MEMORY_CATALOG :: `{"version":2,"programs":[{"id":3,"name":"Paint","domain":"Vfx","attributes":8,"size":24, +MEMORY_PROGRAMS :: `[{"id":3,"name":"Paint","domain":"Vfx","attributes":8,"size":24, "resources":[{"name":"field","kind":"Grid"},{"name":"words","kind":"Data","words":4}], "stages":[{"name":"spread","iterations":2,"over":0,"writes":1}], "parameters":[ {"name":"image","kind":"Texture","components":1,"offset":0,"srgb":true}, - {"name":"steps","kind":"Int","components":2,"offset":4,"defaults":[-2,5,0,0],"min":-8,"max":8,"group":"Pattern"}]}]}` + {"name":"steps","kind":"Int","components":2,"offset":4,"defaults":[-2,5,0,0],"min":-8,"max":8,"group":"Pattern"}]}]` // What the renderer asks its allocator for without a device, with the memory // ending at each request in turn: the call is refused, says so where it has @@ -103,7 +103,7 @@ renderer_calls_without_memory_are_refused_and_keep_what_they_had :: proc(t: ^tes texture_data_destroy(&data, limited) case .Catalog: catalog: Program_Catalog - catalog, done = program_catalog_parse(transmute([]u8)string(MEMORY_CATALOG), limited) + catalog, done = program_catalog_parse(catalog_text(MEMORY_PROGRAMS), limited) if !done {testing.expectf(t, len(catalog.programs) == 0, "a catalog refused with %d requests served keeps no program", served)} program_catalog_destroy(&catalog) case .Scene_Init: diff --git a/render/scene_edit_test.odin b/render/scene_edit_test.odin index 058a2d14d..a6cb4d185 100644 --- a/render/scene_edit_test.odin +++ b/render/scene_edit_test.odin @@ -1,11 +1,19 @@ package mirai_render +import "core:fmt" import "core:mem" import "core:slice" import "core:testing" import "mirai:asset" +import "mirai:render/abi" import mm "mirai:std/math" +// A catalog of the version the parser reads, holding programs (a JSON array). +@(private) +catalog_text :: proc(programs: string) -> []u8 { + return transmute([]u8)fmt.tprintf(`{{"version":%d,"programs":%s}}`, abi.SHADER_CATALOG_VERSION, programs) +} + // A square grid on the ground, two triangles per cell, the far half in slot 1. @(private) edit_grid :: proc(cells: int, size: f32, height: f32 = 0) -> (vertices: [dynamic]Gpu_Vertex, indices: [dynamic]u32) { @@ -359,12 +367,12 @@ program_catalog_names_the_programs_and_packs_their_parameters :: proc(t: ^testin testing.expect_value(t, params[0].xyz, Vec3{0.5, 0.25, 1}) testing.expect(t, program_parameter(grid, "nothing") == nil) - text := `{"version":3,"programs":[{"id":3,"name":"Paint","domain":"Surface","size":24,"parameters":[ + text := `[{"id":3,"name":"Paint","domain":"Surface","size":24,"parameters":[ {"name":"image","kind":"Texture","components":1,"offset":0,"srgb":true}, {"name":"steps","kind":"Int","components":2,"offset":4,"defaults":[-2,5,0,0],"min":-8,"max":8,"group":"Pattern"}, {"name":"on","kind":"Bool","components":1,"offset":12,"defaults":[1,0,0,0],"min":0,"max":1}, - {"name":"mask","kind":"Uint","components":1,"offset":16,"defaults":[7,0,0,0],"min":0,"max":4294967295}]}]}` - catalog, parsed := program_catalog_parse(transmute([]u8)text) + {"name":"mask","kind":"Uint","components":1,"offset":16,"defaults":[7,0,0,0],"min":0,"max":4294967295}]}]` + catalog, parsed := program_catalog_parse(catalog_text(text)) if !testing.expect(t, parsed) {return} defer program_catalog_destroy(&catalog) paint := &catalog.programs[0] @@ -385,8 +393,8 @@ program_catalog_names_the_programs_and_packs_their_parameters :: proc(t: ^testin testing.expect(t, !program_parameter_set(&values, &paint.parameters[0], {1, 0, 0, 0}), "a texture is not a number") testing.expect(t, paint.parameters[0].srgb && program_parameter_set_texture(r, &values, &paint.parameters[0], 0)) testing.expect(t, !program_parameter_set_texture(r, &values, &paint.parameters[1], 0)) - broken := `{"version":2,"programs":[{"id":1,"name":"Wide","domain":"Surface","size":8,"parameters":[{"name":"far","kind":"Float","components":4,"offset":248}]}]}` - _, wide := program_catalog_parse(transmute([]u8)broken) + broken := `[{"id":1,"name":"Wide","domain":"Surface","size":8,"parameters":[{"name":"far","kind":"Float","components":4,"offset":248}]}]` + _, wide := program_catalog_parse(catalog_text(broken)) testing.expect(t, !wide, "a parameter past the 256 bytes of a row makes the catalog invalid") } @@ -401,17 +409,17 @@ program_catalog_keeps_the_ui_programs_apart :: proc(t: ^testing.T) { testing.expectf(t, program_find(r, name, .Postprocess) == nil && program_find(r, name, .Surface) == nil, "%s is of the ui domain alone", name) } testing.expect(t, program_find(r, "ColorGrade", .Ui) == nil) - text := `{"version":3,"programs":[{"id":4,"name":"Wipe","domain":"Ui","size":8,"parameters":[ + text := `[{"id":4,"name":"Wipe","domain":"Ui","size":8,"parameters":[ {"name":"fill","kind":"Float","components":1,"offset":0,"defaults":[1,0,0,0],"min":0,"max":1}, - {"name":"start","kind":"Float","components":1,"offset":4,"min":-1,"max":1}]}]}` - catalog, parsed := program_catalog_parse(transmute([]u8)text) + {"name":"start","kind":"Float","components":1,"offset":4,"min":-1,"max":1}]}]` + catalog, parsed := program_catalog_parse(catalog_text(text)) if !testing.expect(t, parsed) {return} defer program_catalog_destroy(&catalog) wipe := &catalog.programs[0] testing.expect(t, wipe.domain == .Ui && wipe.id == 4 && len(wipe.parameters) == 2) testing.expect_value(t, program_defaults(wipe)[0], Vec4{1, 0, 0, 0}) - unknown := `{"version":3,"programs":[{"id":1,"name":"Fog","domain":"Volume","size":0,"parameters":[]}]}` - _, known := program_catalog_parse(transmute([]u8)unknown) + unknown := `[{"id":1,"name":"Fog","domain":"Volume","size":0,"parameters":[]}]` + _, known := program_catalog_parse(catalog_text(unknown)) testing.expect(t, !known, "a domain the renderer does not know makes the catalog invalid") }