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

2025-04-02 17:46:22 +03:00 · 2020-12-15 22:15:33 +03:00 · 2020-12-15 22:15:33 +03:00 · ba562b2b7a
commit ba562b2b7a
parent 73dc2d3ae5
24 changed files with 74 additions and 4 deletions
--- 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.
--- 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
--- 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
--- 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
--- 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]

--- 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
--- 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
--- 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 }
--- 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 }
--- 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 }
--- 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
--- 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
+vanimation anim -play -record ${aFile} 1920 1080 -vcodec ffv1 -fps 30 -speed 0.5
--- 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]

--- 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
--- 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
--- 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

--- 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
--- 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
--- 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]

--- 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
--- 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
--- 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
--- a/tests/v3d/raytrace/begin
+++ b/tests/v3d/raytrace/begin
@ -1,2 +1,6 @@
 set subgroup "raytrace"
-vinit View1
+
+# Ray-Tracing doesn't work with Compatible Profile on macOS
+if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+
+vinit View1
--- 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