0028843: Replacing @ symbol in v3d glsl tiles test case

diff --git a/tests/v3d/glsl/msaa b/tests/v3d/glsl/msaa
index e66097e..da4fc73 100644 (file)
--- a/tests/v3d/glsl/msaa
+++ b/tests/v3d/glsl/msaa
@@ -15,28 +15,28 @@ vrotate 0.5 0 0
 vzbufftrihedron
 
 vrenderparams -msaa 0
-vdump $::imagedir/${::casename}_512x512@msaa0.png
+vdump $::imagedir/${::casename}_512x512_msaa0.png
 vrenderparams -msaa 2
-vdump $::imagedir/${::casename}_512x512@msaa2.png
+vdump $::imagedir/${::casename}_512x512_msaa2.png
 vrenderparams -msaa 4
-vdump $::imagedir/${::casename}_512x512@msaa4.png
+vdump $::imagedir/${::casename}_512x512_msaa4.png
 vrenderparams -msaa 8
-vdump $::imagedir/${::casename}_512x512@msaa8.png
+vdump $::imagedir/${::casename}_512x512_msaa8.png
 
 # check dump with resolutions not equal to window size
-vdump $::imagedir/${::casename}_1920x1080@msaa8.png -width 1920 -height 1080
-vdump $::imagedir/${::casename}_2560x1440@msaa8.png -width 2560 -height 1440
+vdump $::imagedir/${::casename}_1920x1080_msaa8.png -width 1920 -height 1080
+vdump $::imagedir/${::casename}_2560x1440_msaa8.png -width 2560 -height 1440
 
 # check dump with stereo
 vstereo anaglyph
-vdump $::imagedir/${::casename}_512x512@msaa8stereo.png -stereo blend
-vdump $::imagedir/${::casename}_1920x1080@msaa8stereo.png -width 1920 -height 1080 -stereo blend
-vdump $::imagedir/${::casename}_2560x1440@msaa8stereo.png -width 2560 -height 1440 -stereo blend
+vdump $::imagedir/${::casename}_512x512_msaa8stereo.png -stereo blend
+vdump $::imagedir/${::casename}_1920x1080_msaa8stereo.png -width 1920 -height 1080 -stereo blend
+vdump $::imagedir/${::casename}_2560x1440_msaa8stereo.png -width 2560 -height 1440 -stereo blend
 
 vraytrace 1
 vsetdispmode b 1
-vdump $::imagedir/${::casename}_512x512@msaa8stereort.png -stereo blend
-vdump $::imagedir/${::casename}_1920x1080@msaa8stereort.png -width 1920 -height 1080 -stereo blend
-vdump $::imagedir/${::casename}_2560x1440@msaa8stereort.png -width 2560 -height 1440 -stereo blend
+vdump $::imagedir/${::casename}_512x512_msaa8stereort.png -stereo blend
+vdump $::imagedir/${::casename}_1920x1080_msaa8stereort.png -width 1920 -height 1080 -stereo blend
+vdump $::imagedir/${::casename}_2560x1440_msaa8stereort.png -width 2560 -height 1440 -stereo blend
 vsetdispmode b 0
 vraytrace 0

diff --git a/tests/v3d/glsl/tiles b/tests/v3d/glsl/tiles
index f67d87a..6d16698 100644 (file)
--- a/tests/v3d/glsl/tiles
+++ b/tests/v3d/glsl/tiles
@@ -65,30 +65,30 @@ vsetwidth -noupdate lbr 2
 vdrawtext t2 "Label" -pos 1 0 1 -font $aLabelFont
 vdisplay b2 -trsfPers zoom -trsfPersPos 1 0 1
 
-vdump $::imagedir/${::casename}_409x409@tile0.png
-vdump $::imagedir/${::casename}_409x409@tile128.png  -tileSize 128
-vdump $::imagedir/${::casename}_409x409@tile1024.png -tileSize 1024
-vdump $::imagedir/${::casename}_1920x1080@tile0.png    -width 1920 -height 1920
-vdump $::imagedir/${::casename}_1920x1080@tile128.png  -width 1920 -height 1920 -tileSize 128
-vdump $::imagedir/${::casename}_1920x1080@tile1024.png -width 1920 -height 1920 -tileSize 1024
-diffimage $::imagedir/${::casename}_409x409@tile0.png $::imagedir/${::casename}_409x409@tile128.png 0 0 0 $::imagedir/${::casename}_409x409@tile128diff.png
+vdump $::imagedir/${::casename}_409x409_tile0.png
+vdump $::imagedir/${::casename}_409x409_tile128.png  -tileSize 128
+vdump $::imagedir/${::casename}_409x409_tile1024.png -tileSize 1024
+vdump $::imagedir/${::casename}_1920x1080_tile0.png    -width 1920 -height 1920
+vdump $::imagedir/${::casename}_1920x1080_tile128.png  -width 1920 -height 1920 -tileSize 128
+vdump $::imagedir/${::casename}_1920x1080_tile1024.png -width 1920 -height 1920 -tileSize 1024
+diffimage $::imagedir/${::casename}_409x409_tile0.png $::imagedir/${::casename}_409x409_tile128.png 0 0 0 $::imagedir/${::casename}_409x409_tile128diff.png
 
 # check dump with stereo
 vstereo anaglyph
-vdump $::imagedir/${::casename}_409x409@stereotile0.png      -stereo blend
-vdump $::imagedir/${::casename}_409x409@stereotile128.png    -stereo blend -tileSize 128
-vdump $::imagedir/${::casename}_409x409@stereotile1024.png   -stereo blend -tileSize 1024
-vdump $::imagedir/${::casename}_1920x1080@stereotile0.png    -width 1920 -height 1920 -stereo blend
-vdump $::imagedir/${::casename}_1920x1080@stereotile128.png  -width 1920 -height 1920 -stereo blend -tileSize 128
-vdump $::imagedir/${::casename}_1920x1080@stereotile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024
-diffimage $::imagedir/${::casename}_409x409@stereotile0.png $::imagedir/${::casename}_409x409@stereotile128.png 0 0 0 $::imagedir/${::casename}_409x409@stereotile128diff.png
+vdump $::imagedir/${::casename}_409x409_stereotile0.png      -stereo blend
+vdump $::imagedir/${::casename}_409x409_stereotile128.png    -stereo blend -tileSize 128
+vdump $::imagedir/${::casename}_409x409_stereotile1024.png   -stereo blend -tileSize 1024
+vdump $::imagedir/${::casename}_1920x1080_stereotile0.png    -width 1920 -height 1920 -stereo blend
+vdump $::imagedir/${::casename}_1920x1080_stereotile128.png  -width 1920 -height 1920 -stereo blend -tileSize 128
+vdump $::imagedir/${::casename}_1920x1080_stereotile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024
+diffimage $::imagedir/${::casename}_409x409_stereotile0.png $::imagedir/${::casename}_409x409_stereotile128.png 0 0 0 $::imagedir/${::casename}_409x409_stereotile128diff.png
 
 # check dump with Ray Tracing
 vraytrace 1
-vdump $::imagedir/${::casename}_409x409@rttile0.png      -stereo blend
-vdump $::imagedir/${::casename}_409x409@rttile128.png    -stereo blend -tileSize 128
-vdump $::imagedir/${::casename}_409x409@rttile1024.png   -stereo blend -tileSize 1024
-vdump $::imagedir/${::casename}_1920x1080@rttile0.png    -width 1920 -height 1920 -stereo blend
-vdump $::imagedir/${::casename}_1920x1080@rttile128.png  -width 1920 -height 1920 -stereo blend -tileSize 128
-vdump $::imagedir/${::casename}_1920x1080@rttile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024
+vdump $::imagedir/${::casename}_409x409_rttile0.png      -stereo blend
+vdump $::imagedir/${::casename}_409x409_rttile128.png    -stereo blend -tileSize 128
+vdump $::imagedir/${::casename}_409x409_rttile1024.png   -stereo blend -tileSize 1024
+vdump $::imagedir/${::casename}_1920x1080_rttile0.png    -width 1920 -height 1920 -stereo blend
+vdump $::imagedir/${::casename}_1920x1080_rttile128.png  -width 1920 -height 1920 -stereo blend -tileSize 128
+vdump $::imagedir/${::casename}_1920x1080_rttile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024
 vraytrace 0