fix sokol-gfx tests

floooh · Sep 6, 2023 · b6ab80f · b6ab80f
1 parent e5f5d95
commit b6ab80f
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/tests/functional/sokol_gfx_test.c b/tests/functional/sokol_gfx_test.c
@@ -1064,18 +1064,18 @@ UTEST(sokol_gfx, query_shader_desc) {
                 }
             },
             .images[0] = { .used = true, .image_type = SG_IMAGETYPE_2D, .sample_type = SG_IMAGESAMPLETYPE_FLOAT, .multisampled = true },
-            .images[1] = { .used = true, .image_type = SG_IMAGETYPE_3D, .sample_type = SG_IMAGESAMPLETYPE_SINT },
+            .images[1] = { .used = true, .image_type = SG_IMAGETYPE_3D, .sample_type = SG_IMAGESAMPLETYPE_DEPTH },
             .samplers[0] = { .used = true, .sampler_type = SG_SAMPLERTYPE_FILTERING },
             .samplers[1] = { .used = true, .sampler_type = SG_SAMPLERTYPE_COMPARISON },
-            .image_sampler_pairs[0] = { .used = true, .image_slot = 0, .sampler_slot = 1, .glsl_name = "img0" },
-            .image_sampler_pairs[1] = { .used = true, .image_slot = 1, .sampler_slot = 0, .glsl_name = "img1" },
+            .image_sampler_pairs[0] = { .used = true, .image_slot = 0, .sampler_slot = 0, .glsl_name = "img0" },
+            .image_sampler_pairs[1] = { .used = true, .image_slot = 1, .sampler_slot = 1, .glsl_name = "img1" },
         },
         .fs = {
             .source = "fs_source",
             .images[0] = { .used = true, .image_type = SG_IMAGETYPE_ARRAY, .sample_type = SG_IMAGESAMPLETYPE_DEPTH },
-            .images[1] = { .used = true, .image_type = SG_IMAGETYPE_CUBE, .sample_type = SG_IMAGESAMPLETYPE_FLOAT },
+            .images[1] = { .used = true, .image_type = SG_IMAGETYPE_CUBE, .sample_type = SG_IMAGESAMPLETYPE_UNFILTERABLE_FLOAT },
             .samplers[0] = { .used = true, .sampler_type = SG_SAMPLERTYPE_COMPARISON },
-            .samplers[1] = { .used = true, .sampler_type = SG_SAMPLERTYPE_FILTERING },
+            .samplers[1] = { .used = true, .sampler_type = SG_SAMPLERTYPE_NONFILTERING },
             .image_sampler_pairs[0] = { .used = true, .image_slot = 0, .sampler_slot = 0, .glsl_name = "img3" },
             .image_sampler_pairs[1] = { .used = true, .image_slot = 1, .sampler_slot = 1, .glsl_name = "img4" },
         },
@@ -1097,19 +1097,19 @@ UTEST(sokol_gfx, query_shader_desc) {
     T(s0_desc.vs.images[0].multisampled);
     T(s0_desc.vs.images[1].used);
     T(s0_desc.vs.images[1].image_type == SG_IMAGETYPE_3D);
-    T(s0_desc.vs.images[1].sample_type == SG_IMAGESAMPLETYPE_SINT);
+    T(s0_desc.vs.images[1].sample_type == SG_IMAGESAMPLETYPE_DEPTH);
     T(s0_desc.vs.images[1].multisampled == false);
     T(s0_desc.vs.samplers[0].used);
     T(s0_desc.vs.samplers[0].sampler_type == SG_SAMPLERTYPE_FILTERING);
     T(s0_desc.vs.samplers[1].used);
     T(s0_desc.vs.samplers[1].sampler_type == SG_SAMPLERTYPE_COMPARISON);
     T(s0_desc.vs.image_sampler_pairs[0].used);
     T(s0_desc.vs.image_sampler_pairs[0].image_slot == 0);
-    T(s0_desc.vs.image_sampler_pairs[0].sampler_slot == 1);
+    T(s0_desc.vs.image_sampler_pairs[0].sampler_slot == 0);
     T(s0_desc.vs.image_sampler_pairs[0].glsl_name == 0);
     T(s0_desc.vs.image_sampler_pairs[1].used);
     T(s0_desc.vs.image_sampler_pairs[1].image_slot == 1);
-    T(s0_desc.vs.image_sampler_pairs[1].sampler_slot == 0);
+    T(s0_desc.vs.image_sampler_pairs[1].sampler_slot == 1);
     T(s0_desc.vs.image_sampler_pairs[1].glsl_name == 0);
     T(s0_desc.fs.source == 0);
     T(s0_desc.fs.uniform_blocks[0].size == 0);
@@ -1123,12 +1123,12 @@ UTEST(sokol_gfx, query_shader_desc) {
     T(s0_desc.fs.images[0].multisampled == false);
     T(s0_desc.fs.images[1].used);
     T(s0_desc.fs.images[1].image_type == SG_IMAGETYPE_CUBE);
-    T(s0_desc.fs.images[1].sample_type == SG_IMAGESAMPLETYPE_FLOAT);
+    T(s0_desc.fs.images[1].sample_type == SG_IMAGESAMPLETYPE_UNFILTERABLE_FLOAT);
     T(s0_desc.fs.images[1].multisampled == false);
     T(s0_desc.fs.samplers[0].used);
     T(s0_desc.fs.samplers[0].sampler_type == SG_SAMPLERTYPE_COMPARISON);
     T(s0_desc.fs.samplers[1].used);
-    T(s0_desc.fs.samplers[1].sampler_type == SG_SAMPLERTYPE_FILTERING);
+    T(s0_desc.fs.samplers[1].sampler_type == SG_SAMPLERTYPE_NONFILTERING);
     T(s0_desc.fs.image_sampler_pairs[0].used);
     T(s0_desc.fs.image_sampler_pairs[0].image_slot == 0);
     T(s0_desc.fs.image_sampler_pairs[0].sampler_slot == 0);