0031999: Tests - request Core Profile on macOS for Ray-Tracing tests

diff --git a/samples/tcl/Penrose.tcl b/samples/tcl/Penrose.tcl
index 21a94aa8b431f588060dfed00196f8ba9318b5fc..77a77b6f8abaf1cab6ec4f4c0f8b5c922bd8feb3 100644 (file)
--- a/samples/tcl/Penrose.tcl
+++ b/samples/tcl/Penrose.tcl
@@ -6,7 +6,9 @@
 #Category: Visualization
 #Title: Penrose triangle on perspective view
 
-pload MODELING VISUALIZATION 
+pload MODELING VISUALIZATION
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
 
 # procedure to define box dimensions
 set scale 1.

diff --git a/samples/tcl/pathtrace_ball.tcl b/samples/tcl/pathtrace_ball.tcl
index 911c0eb2903d3c18b1c85acb142d83adf4083c89..9e9f79e14ccd81bb23d5bda1800d57d3c038160e 100644 (file)
--- a/samples/tcl/pathtrace_ball.tcl
+++ b/samples/tcl/pathtrace_ball.tcl
@@ -7,6 +7,8 @@
 set aBallPath [locate_data_file occ/Ball.brep]
 
 pload MODELING VISUALIZATION
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
 
 # Setup 3D viewer
 vclear

diff --git a/samples/tcl/pathtrace_cube.tcl b/samples/tcl/pathtrace_cube.tcl
index 1ef1b248cb805068abc11a98081938ea3fdf0fdb..0aca0aeb96019619fa3fc7254ce8b6de18db77ed 100644 (file)
--- a/samples/tcl/pathtrace_cube.tcl
+++ b/samples/tcl/pathtrace_cube.tcl
@@ -5,6 +5,8 @@
 #Title: Path tracing - Cube
 
 pload MODELING VISUALIZATION
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
 
 # setup 3D viewer content
 vclear

diff --git a/samples/tcl/pathtrace_materials.tcl b/samples/tcl/pathtrace_materials.tcl
index b404588d61a1aef50f83e7a7b0675a638ee1c5f2..b4d3868949496e911b3a6408677297a834b2f213 100644 (file)
--- a/samples/tcl/pathtrace_materials.tcl
+++ b/samples/tcl/pathtrace_materials.tcl
@@ -7,6 +7,8 @@
 set aBallPath [locate_data_file occ/Ball.brep]
 
 pload MODELING VISUALIZATION
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
 
 # Setup 3D viewer
 vclear

diff --git a/samples/tcl/raytrace.tcl b/samples/tcl/raytrace.tcl
index c9ab75addc1f7100271034538efda3cc670a1706..74527dd43cc2019fc0fd94e6023f5425654db764 100644 (file)
--- a/samples/tcl/raytrace.tcl
+++ b/samples/tcl/raytrace.tcl
@@ -3,6 +3,10 @@
 #Category: Visualization
 #Title: Ray tracing
 
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+pload VISUALIZATION
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 # make bottle by calling another script
 source [file join [file dirname [info script]] bottle.tcl]
 

diff --git a/samples/tcl/vis_pbr_spheres.tcl b/samples/tcl/vis_pbr_spheres.tcl
index 0f6904bec45ec74d3b7d9d27cf7dc9cbfbc584a9..79dd2e509afaba8703bb3fa55ddf6838dac22964 100644 (file)
--- a/samples/tcl/vis_pbr_spheres.tcl
+++ b/samples/tcl/vis_pbr_spheres.tcl
@@ -81,6 +81,9 @@ SetName D    [XFindShape     D ts]  "Smooth"
 SetName D {*}[XFindComponent D tr]  "Rough"
 SetName D    [XFindShape     D tr]  "Rough"
 
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 vclear
 vinit View1 -width 768 -height 768
 vfront

diff --git a/tests/bugs/vis/bug27337 b/tests/bugs/vis/bug27337
index 32eda94d037a43670c469a5e5f48fd678b1f8beb..cd09fe4513e14dc8dd584de1686cd027dea32c35 100644 (file)
--- a/tests/bugs/vis/bug27337
+++ b/tests/bugs/vis/bug27337
@@ -3,6 +3,10 @@ puts "0027337: \[Regression vs. 6.9.1\] Selection highlight is poor in ray trace
 puts "================"
 
 pload MODELING VISUALIZATION
+
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 box b 10 10 10
 vdisplay b
 vsetdispmode 1
@@ -15,4 +19,4 @@ puts "should be color of shading and not of highlight (blue)"
 checkcolor 205 100 0.64 0.56 0.08
 
 puts "Check result by image: selection highlight should show only visible edges"
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${casename}.png

diff --git a/tests/de_mesh/gltf_read/begin b/tests/de_mesh/gltf_read/begin
index a6de429d5c7a006e472d06770271fc4e0e89b4e4..72db86bda375592f31fe0b67bae0aa6e8e46fa58 100644 (file)
--- a/tests/de_mesh/gltf_read/begin
+++ b/tests/de_mesh/gltf_read/begin
@@ -1,2 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 catch { Close D }
+# PBR requires OpenGL 3.0+ on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/de_mesh/gltf_write/begin b/tests/de_mesh/gltf_write/begin
index a6de429d5c7a006e472d06770271fc4e0e89b4e4..72db86bda375592f31fe0b67bae0aa6e8e46fa58 100644 (file)
--- a/tests/de_mesh/gltf_write/begin
+++ b/tests/de_mesh/gltf_write/begin
@@ -1,2 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 catch { Close D }
+# PBR requires OpenGL 3.0+ on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/de_mesh/obj_read/begin b/tests/de_mesh/obj_read/begin
index a6de429d5c7a006e472d06770271fc4e0e89b4e4..72db86bda375592f31fe0b67bae0aa6e8e46fa58 100644 (file)
--- a/tests/de_mesh/obj_read/begin
+++ b/tests/de_mesh/obj_read/begin
@@ -1,2 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 catch { Close D }
+# PBR requires OpenGL 3.0+ on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/demo/samples/dimensionspbr b/tests/demo/samples/dimensionspbr
index 6e60ebcc9b256c81ae504884f57ea67748fa46ca..3453321145292e4369cfa2a0addd61313af11331 100644 (file)
--- a/tests/demo/samples/dimensionspbr
+++ b/tests/demo/samples/dimensionspbr
@@ -1,5 +1,7 @@
 source $env(CSF_OCCTSamplesPath)/tcl/dimensions.tcl
 vcaps -ffp 0
+# PBR requires OpenGL 3.0+ on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
 vrenderparams -shadingModel pbr
 vlight -clear
 vlight -add ambient -intensity 1

diff --git a/tests/v3d/anim/videorecorder b/tests/v3d/anim/videorecorder
index 2752024a154dcbc2709fd24239fe71cb455fef7d..ee403a40d287d8007717c83366957d00d6d2e7ec 100644 (file)
--- a/tests/v3d/anim/videorecorder
+++ b/tests/v3d/anim/videorecorder
@@ -9,9 +9,13 @@ puts "==============================================================="
 set aFile ${imagedir}/propeller.mkv
 file delete -force ${aFile}
 
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+pload VISUALIZATION
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 source $env(CSF_OCCTTestsPath)/v3d/anim/propeller
 vraytrace 1
 vrenderparams -msaa 8
 vrenderparams -fsaa 1
 XProgress +g
-vanimation anim -play -record ${aFile} 1920 1080 -vcodec ffv1 -fps 30 -speed 0.5
\ No newline at end of file
+vanimation anim -play -record ${aFile} 1920 1080 -vcodec ffv1 -fps 30 -speed 0.5

diff --git a/tests/v3d/glsl/cubemap_dds b/tests/v3d/glsl/cubemap_dds
index 9f701fd095afaf7351b9c63d25842698e4c0d015..d948955c66bff9c25eb6f53245036d48e93ed5cb 100644 (file)
--- a/tests/v3d/glsl/cubemap_dds
+++ b/tests/v3d/glsl/cubemap_dds
@@ -3,6 +3,9 @@ puts "0031478: Visualization, TKOpenGl - allow uploading Cubemap in compressed D
 puts "============"
 puts ""
 
+# PBR doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 set aCubeMapPNG [locate_data_file cubemap_labels.png]
 set aCubeMapDDS [locate_data_file cubemap_labels.dds]
 

diff --git a/tests/v3d/glsl/pbr_attenuation b/tests/v3d/glsl/pbr_attenuation
index 4d0db059f12ca48e89072d0a2b2f317fe8f4a893..6b3ecff8c12d07def4ecd94e70204fe6ae0f49ba 100644 (file)
--- a/tests/v3d/glsl/pbr_attenuation
+++ b/tests/v3d/glsl/pbr_attenuation
@@ -4,6 +4,10 @@ puts "Test of point light's (positional and spot) attenuation and range in PBR"
 puts "========"
 
 pload XDE OCAF VISUALIZATION MODELING
+
+# PBR doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 catch { Close D }
 
 vclear

diff --git a/tests/v3d/glsl/pbr_spheres b/tests/v3d/glsl/pbr_spheres
index 335bce42241c6abf6ac6448f628a9dcc9583c0c2..7f8454d81deb49676c4fbc3806d36aa3e549256a 100644 (file)
--- a/tests/v3d/glsl/pbr_spheres
+++ b/tests/v3d/glsl/pbr_spheres
@@ -3,6 +3,9 @@ puts "0030700: Visualization, TKOpenGl - support PBR Metallic-Roughness shading
 puts "Spheres grid with different roughness values"
 puts "========"
 
+# PBR doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 vclear
 vclose ALL
 source $env(CSF_OCCTSamplesPath)/tcl/vis_pbr_spheres.tcl

diff --git a/tests/v3d/glsl/pbr_tangent_normal b/tests/v3d/glsl/pbr_tangent_normal
index ade81c7d4297f694987815b887be09444d092ace..d87d9b1302662592b45f9c1ae462b500fbb7b93a 100644 (file)
--- a/tests/v3d/glsl/pbr_tangent_normal
+++ b/tests/v3d/glsl/pbr_tangent_normal
@@ -5,6 +5,9 @@ puts "========"
 
 pload XDE OCAF MODELING VISUALIZATION
 
+# PBR doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 vclear
 vclose ALL
 

diff --git a/tests/v3d/glsl/shading_models b/tests/v3d/glsl/shading_models
index e3804ed3ebf3218f4ded8521be456616c7f80b4d..e7b9350bd04d955d27a476fafc94a6afbf106dd2 100644 (file)
--- a/tests/v3d/glsl/shading_models
+++ b/tests/v3d/glsl/shading_models
@@ -2,6 +2,9 @@ puts "========"
 puts "Test various Shading Models assigned per-object"
 puts "========"
 
+# PBR doesn't work with Compatible Profile on macOS
+#if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 # setup viewer
 vclear
 vclose ALL

diff --git a/tests/v3d/glsl/transp1 b/tests/v3d/glsl/transp1
index b920218d5eee3e113c088fb6f8dbbe4e416d8549..c671f6e00200381edc898f8256190f3b215b6a93 100644 (file)
--- a/tests/v3d/glsl/transp1
+++ b/tests/v3d/glsl/transp1
@@ -2,6 +2,9 @@ puts "========"
 puts "Test various Shading Models assigned per-object with transparency"
 puts "========"
 
+# PBR doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 # setup viewer
 vclear
 vclose ALL

diff --git a/tests/v3d/materials/bug24855 b/tests/v3d/materials/bug24855
index d5077e9ce3d4e6957abbd89f61628ec3fffc3a98..4d7a9a5a949afd8ca0ea6697629201bbff33feac 100644 (file)
--- a/tests/v3d/materials/bug24855
+++ b/tests/v3d/materials/bug24855
@@ -2,6 +2,9 @@ puts "========"
 puts "0024855: Revision of parameters of standard materials"
 puts "========"
 
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 # custom shapes
 set aShape [locate_data_file occ/Top.brep]
 

diff --git a/tests/v3d/materials/ior b/tests/v3d/materials/ior
index a3200c2b3e0eec7d5c3a9fb04b8e3dd2f19e0383..87180d3ad4884c36d5eb3a4e75ff3975f088f3ef 100644 (file)
--- a/tests/v3d/materials/ior
+++ b/tests/v3d/materials/ior
@@ -3,6 +3,9 @@ puts "0031284: Visualization - XCAFDoc_VisMaterialPBR lacks Index of Refraction"
 puts "========"
 
 pload MODELING XDE OCAF VISUALIZATION
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 box b 0.5 1.0 -0.5 3 1 1
 psphere s1 0.5
 psphere s2 0.5

diff --git a/tests/v3d/materials/pbr1 b/tests/v3d/materials/pbr1
index 33f1b04883bf0b468fa2d9042c5eecc80a1bdb31..823403f65b9e729bf3d91850e1ad5dbc624c84e9 100644 (file)
--- a/tests/v3d/materials/pbr1
+++ b/tests/v3d/materials/pbr1
@@ -1,3 +1,7 @@
+# PBR requires OpenGL 3.0+ on macOS
+pload VISUALIZATION
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl
 vlight -change 0 -intensity 5
 vrenderparams -shadingModel PBR -msaa 0

diff --git a/tests/v3d/materials/raytrace1 b/tests/v3d/materials/raytrace1
index fa2f2de930db6b66b042861aabb07712fa0335d4..c3939d81f55c3c03d15e404424e828e3857ae36a 100644 (file)
--- a/tests/v3d/materials/raytrace1
+++ b/tests/v3d/materials/raytrace1
@@ -4,5 +4,9 @@ puts "Test emission material within Ray-Tracing"
 puts "========="
 puts ""
 
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+pload VISUALIZATION
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
 source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl
 vrenderparams -raytrace -msaa 0

diff --git a/tests/v3d/raytrace/begin b/tests/v3d/raytrace/begin
index ac9de1e478fdb4e9b111d094241281ec4d62a661..415dbe5fa0ee252e967bf2990339b081cfc71382 100644 (file)
--- a/tests/v3d/raytrace/begin
+++ b/tests/v3d/raytrace/begin
@@ -1,2 +1,6 @@
 set subgroup "raytrace"
-vinit View1
\ No newline at end of file
+
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
+vinit View1

diff --git a/tests/v3d/raytrace/pbr_spheres b/tests/v3d/raytrace/pbr_spheres
index e22f0ee7f6fde595e2812d586d0ff90745a3825c..8fc7c621fefac11ed08eb98e6d680257557d624b 100644 (file)
--- a/tests/v3d/raytrace/pbr_spheres
+++ b/tests/v3d/raytrace/pbr_spheres
@@ -3,6 +3,8 @@ puts "0031225: Visualization, TKOpenGl - support cubemap for environment texture
 puts "Spheres grid with different roughness values"
 puts "========"
 
+cpulimit 600
+
 vclear
 vclose ALL
 source $env(CSF_OCCTSamplesPath)/tcl/vis_pbr_spheres.tcl