From ba562b2b7a9c7c92bc582d43b3eabca7c722668d Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 15 Dec 2020 22:15:33 +0300 Subject: [PATCH] 0031999: Tests - request Core Profile on macOS for Ray-Tracing tests --- samples/tcl/Penrose.tcl | 4 +++- samples/tcl/pathtrace_ball.tcl | 2 ++ samples/tcl/pathtrace_cube.tcl | 2 ++ samples/tcl/pathtrace_materials.tcl | 2 ++ samples/tcl/raytrace.tcl | 4 ++++ samples/tcl/vis_pbr_spheres.tcl | 3 +++ tests/bugs/vis/bug27337 | 6 +++++- tests/de_mesh/gltf_read/begin | 2 ++ tests/de_mesh/gltf_write/begin | 2 ++ tests/de_mesh/obj_read/begin | 2 ++ tests/demo/samples/dimensionspbr | 2 ++ tests/v3d/anim/videorecorder | 6 +++++- tests/v3d/glsl/cubemap_dds | 3 +++ tests/v3d/glsl/pbr_attenuation | 4 ++++ tests/v3d/glsl/pbr_spheres | 3 +++ tests/v3d/glsl/pbr_tangent_normal | 3 +++ tests/v3d/glsl/shading_models | 3 +++ tests/v3d/glsl/transp1 | 3 +++ tests/v3d/materials/bug24855 | 3 +++ tests/v3d/materials/ior | 3 +++ tests/v3d/materials/pbr1 | 4 ++++ tests/v3d/materials/raytrace1 | 4 ++++ tests/v3d/raytrace/begin | 6 +++++- tests/v3d/raytrace/pbr_spheres | 2 ++ 24 files changed, 74 insertions(+), 4 deletions(-) diff --git a/samples/tcl/Penrose.tcl b/samples/tcl/Penrose.tcl index 21a94aa8b4..77a77b6f8a 100644 --- 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 911c0eb290..9e9f79e14c 100644 --- 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 1ef1b248cb..0aca0aeb96 100644 --- 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 b404588d61..b4d3868949 100644 --- 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 c9ab75addc..74527dd43c 100644 --- 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 0f6904bec4..79dd2e509a 100644 --- 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 32eda94d03..cd09fe4513 100644 --- 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 a6de429d5c..72db86bda3 100644 --- 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 a6de429d5c..72db86bda3 100644 --- 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 a6de429d5c..72db86bda3 100644 --- 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 6e60ebcc9b..3453321145 100644 --- 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 2752024a15..ee403a40d2 100644 --- 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 9f701fd095..d948955c66 100644 --- 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 4d0db059f1..6b3ecff8c1 100644 --- 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 335bce4224..7f8454d81d 100644 --- 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 ade81c7d42..d87d9b1302 100644 --- 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 e3804ed3eb..e7b9350bd0 100644 --- 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 b920218d5e..c671f6e002 100644 --- 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 d5077e9ce3..4d7a9a5a94 100644 --- 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 a3200c2b3e..87180d3ad4 100644 --- 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 33f1b04883..823403f65b 100644 --- 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 fa2f2de930..c3939d81f5 100644 --- 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 ac9de1e478..415dbe5fa0 100644 --- 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 e22f0ee7f6..8fc7c621fe 100644 --- 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