0027715: Visualization - turn off deprecated OpenGL fixed-function pipeline by default

OpenGl_Caps - flag ffpEnable is now initialized to false on desktop OpenGL.
OpenGl_Context::init() - now prints error if OpenGL version does not support GLSL
and switches OpenGl_Caps::ffpEnable to true.

update test cases

diff --git a/src/OpenGl/OpenGl_Caps.cxx b/src/OpenGl/OpenGl_Caps.cxx
index 76ed855e96d9508e0e2e937ebf3fe24fbffb2974..fc48e43e9f09dfe63188ff57fff4995ae31d7d50 100755 (executable)
--- a/src/OpenGl/OpenGl_Caps.cxx
+++ b/src/OpenGl/OpenGl_Caps.cxx
@@ -29,7 +29,7 @@ OpenGl_Caps::OpenGl_Caps()
   pntSpritesDisable (Standard_False),
   keepArrayData     (Standard_False),
 #if !defined(GL_ES_VERSION_2_0)
-  ffpEnable         (Standard_True),
+  ffpEnable         (Standard_False),
   useSystemBuffer   (Standard_False),
 #else
   ffpEnable         (Standard_False),

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index d15758682bef9cf4a5cbd4acd8b0ecd8ed5bc94f..1c6e41095ec126490d791dba5b2169956b078038 100644 (file)
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -1055,6 +1055,20 @@ void OpenGl_Context::init (const Standard_Boolean theIsCoreProfile)
   myMaxMsaaSamples = 0;
   ReadGlVersion (myGlVerMajor, myGlVerMinor);
   myVendor = (const char* )::glGetString (GL_VENDOR);
+  if (!caps->ffpEnable
+   && !IsGlGreaterEqual (2, 0))
+  {
+    caps->ffpEnable = true;
+    TCollection_ExtendedString aMsg =
+      TCollection_ExtendedString("OpenGL driver is too old! Context info:\n")
+                               + "    Vendor:   " + (const char* )::glGetString (GL_VENDOR)   + "\n"
+                               + "    Renderer: " + (const char* )::glGetString (GL_RENDERER) + "\n"
+                               + "    Version:  " + (const char* )::glGetString (GL_VERSION)  + "\n"
+                               + "  Fallback using deprecated fixed-function pipeline.\n"
+                               + "  Visualization might work incorrectly.\n"
+                                 "  Consider upgrading the graphics driver.";
+    PushMessage (GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_PORTABILITY, 0, GL_DEBUG_SEVERITY_HIGH, aMsg);
+  }
 
 #if defined(GL_ES_VERSION_2_0)
   (void )theIsCoreProfile;

diff --git a/tests/3rdparty/export/end b/tests/3rdparty/export/end
index 99af059b71a5e73fd998afd022fcbf81bb26a693..612fcbac0e3543e2cc2349bd982de1fab7190250 100644 (file)
--- a/tests/3rdparty/export/end
+++ b/tests/3rdparty/export/end
@@ -1,3 +1,4 @@
+vcaps -ffp 1
 vexport ${aFile} ${format}
 vglinfo
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/moddata_2/bug23172 b/tests/bugs/moddata_2/bug23172
index 480a2824abab13420397e8f29512f483903b9625..16d63799c8cdeb1d4252ec2fd8d0ddd56ff6c1a4 100755 (executable)
--- a/tests/bugs/moddata_2/bug23172
+++ b/tests/bugs/moddata_2/bug23172
@@ -19,6 +19,7 @@ if { [file exists ${aFile}] } {
   file delete ${aFile}
 }
 
+vcaps -ffp 1
 vexport $aFile SVG
 
 if { [file exists ${aFile}] } {

diff --git a/tests/bugs/vis/bug21091_3 b/tests/bugs/vis/bug21091_3
index b5dac67b8035f07cc6cedd1f4478d7c82ec41ccb..979866068f3acdbf989b8b97ca51f0b6d442a855 100755 (executable)
--- a/tests/bugs/vis/bug21091_3
+++ b/tests/bugs/vis/bug21091_3
@@ -3,10 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vinit
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#
 
 pload XSDRAW
 vinit
@@ -20,6 +16,7 @@ vsetdispmode m 34
 file delete -force ${imagedir}/${test_image}.pdf
 set aFile ${imagedir}/${test_image}.pdf
 
+vcaps -ffp 1
 vexport ${aFile} PDF
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug21091_4 b/tests/bugs/vis/bug21091_4
index 8c51d4d45ccd92816cd226d43b1e66b274302d69..311b9a4219396d8d4452fa3c8a77d32835a68ca2 100755 (executable)
--- a/tests/bugs/vis/bug21091_4
+++ b/tests/bugs/vis/bug21091_4
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to PDF format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -45,6 +42,7 @@ vdisplay a
 file delete -force ${imagedir}/${test_image}.pdf
 set aFile ${imagedir}/${test_image}.pdf
 
+vcaps -ffp 1
 vexport ${aFile} PDF
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug21091_5 b/tests/bugs/vis/bug21091_5
index ec1974cdc845f443723e44a041f091ee43b08887..5fed799a64318bf47fbc721ea4c90ce1bd1bc8ee 100755 (executable)
--- a/tests/bugs/vis/bug21091_5
+++ b/tests/bugs/vis/bug21091_5
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to PS format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -45,6 +42,7 @@ vdisplay a
 file delete -force ${imagedir}/${test_image}.ps
 set aFile ${imagedir}/${test_image}.ps
 
+vcaps -ffp 1
 vexport ${aFile} PS
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug21091_6 b/tests/bugs/vis/bug21091_6
index 904238a81094be07a17ed5f2d6300e2bea94ded1..3589ada1897071031594f84585a0df004561f565 100755 (executable)
--- a/tests/bugs/vis/bug21091_6
+++ b/tests/bugs/vis/bug21091_6
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to EPS format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -44,6 +41,7 @@ vdisplay a
 file delete -force ${imagedir}/${test_image}.eps
 set aFile ${imagedir}/${test_image}.eps
 
+vcaps -ffp 1
 vexport ${aFile} EPS
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug21091_7 b/tests/bugs/vis/bug21091_7
index 77e554105d466b0e942f16dc247768f8c80169fd..27c24bc32900d2a6af6fac9f0c75a831d2e9acdc 100755 (executable)
--- a/tests/bugs/vis/bug21091_7
+++ b/tests/bugs/vis/bug21091_7
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to TEX format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -46,6 +43,7 @@ vdisplay a
 
 set aFile $imagedir/${test_image}.tex
 
+vcaps -ffp 1
 vexport ${aFile} TEX
 
 if { [file exists ${aFile}] } {

diff --git a/tests/bugs/vis/bug21091_8 b/tests/bugs/vis/bug21091_8
index d22829d02eb248e3467e562335e6a1072cbc90b6..a2fe745b4b1a0daf4b24513174fc2ddf75c31725 100755 (executable)
--- a/tests/bugs/vis/bug21091_8
+++ b/tests/bugs/vis/bug21091_8
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to SVG format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -45,6 +42,7 @@ vdisplay a
 file delete -force ${imagedir}/${test_image}.svg
 set aFile ${imagedir}/${test_image}.svg
 
+vcaps -ffp 1
 vexport ${aFile} SVG
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug21091_9 b/tests/bugs/vis/bug21091_9
index 8eb7ddc38a43c0600795cfeacaf560e2c12089e5..328be289f6c6581604c3b2497deb7b04f17c84f1 100755 (executable)
--- a/tests/bugs/vis/bug21091_9
+++ b/tests/bugs/vis/bug21091_9
@@ -3,9 +3,6 @@ puts "OCC21091"
 puts "OCC21450"
 puts "============"
 puts ""
-#vexport
-#vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format
-#Testing export to PGF format
 
 vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
@@ -45,6 +42,7 @@ vdisplay a
 file delete -force ${imagedir}/${test_image}.pgf
 set aFile ${imagedir}/${test_image}.pgf
 
+vcaps -ffp 1
 vexport ${aFile} PGF
 
 if { [checkplatform -windows] } {

diff --git a/tests/bugs/vis/bug22332 b/tests/bugs/vis/bug22332
deleted file mode 100644 (file)
index c7cd471..0000000
--- a/tests/bugs/vis/bug22332
+++ /dev/null
@@ -1,41 +0,0 @@
-puts "============"
-puts "OCC22332"
-puts "============"
-puts ""
-
-######################################################
-# 
-######################################################
-
-set BUGNUMBER OCC22332
-
-vinit
-vclear
-box b 100 100 100
-vsetdispmode b 1
-vdisplay b
-vtrihedron tri
-vfit
- 
-vmoveto 0 0
-
-# TEST LINEWIDTH
-# draw a 10px horizontal line at (10,10) - (400,10)
-vlayerline 10 10 400 10 10
-
-checkcolor 15 5 1 0 0
-checkcolor 15 13 1 0 0
-checkcolor 15 14 0 0 0
-
-# TEST LINETYPE
-# draw a slashed 10px horizontal line at (10,10) - (400,10)
-vlayerline 10 10 400 10 10 1
-
-checkcolor 23 10 1 0 0
-checkcolor 25 10 1 0 0
-checkcolor 26 10 0 0 0
-checkcolor 30 10 0 0 0
-checkcolor 32 10 1 0 0
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
-

diff --git a/tests/bugs/vis/bug22368 b/tests/bugs/vis/bug22368
index 387beb56024469430bb1e370deb91a33818a508c..dbd3538f1698a096702cf0004097cdce839f4b7e 100755 (executable)
--- a/tests/bugs/vis/bug22368
+++ b/tests/bugs/vis/bug22368
@@ -8,6 +8,9 @@ puts ""
 
 set BugNumber OCC22368
 
+# enable FFP until bug-fix for GLSL
+vcaps -ffp 1
+
 vinit
 vtrihedron trihedron
 OCC74_set trihedron 3

diff --git a/tests/bugs/vis/bug22796_3 b/tests/bugs/vis/bug22796_3
index 6de67e0ffbb754f26d487a276485ee0c2ab89446..de1bb335bf0e9701936b22a10c7c6aadead04f67 100755 (executable)
--- a/tests/bugs/vis/bug22796_3
+++ b/tests/bugs/vis/bug22796_3
@@ -10,6 +10,7 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont
 
 set BugNumber OCC22796
 
+vcaps -ffp 1
 vinit
 vdrawtext text0 "TestString\nHello,\tWorld!" -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont
 vexport $imagedir/${test_image}.pdf PDF

diff --git a/tests/bugs/vis/bug23407_2 b/tests/bugs/vis/bug23407_2
index 5c5f32de1be0ac7ad42d604c9b5bb587949138be..4f73918ebcab6884d77cc9ea8361da7733807357 100755 (executable)
--- a/tests/bugs/vis/bug23407_2
+++ b/tests/bugs/vis/bug23407_2
@@ -15,8 +15,8 @@ vfit
 vaspects -setwidth 5
 
 if { "[vreadpixel 183 190 rgb name]" != "RED"
-  || "[vreadpixel 292 358 rgb name]" != "RED"
-  || "[vreadpixel 26 265 rgb name]" != "RED"
+  || "[vreadpixel 314 344 rgb name]" != "RED"
+  || "[vreadpixel  26 267 rgb name]" != "RED"
 } {
     puts "Error : Boundary of face is not changed"
 }

diff --git a/tests/bugs/vis/bug23747_2 b/tests/bugs/vis/bug23747_2
index 278acbf559951b144b92be59790cbf9e53729939..4a817b88bebe0273f3f0d1bdc9bf8282120feaeb 100644 (file)
--- a/tests/bugs/vis/bug23747_2
+++ b/tests/bugs/vis/bug23747_2
@@ -4,6 +4,9 @@ puts "Checking environment mapping in general"
 puts "============"
 puts ""
 
+# enable FFP until bug-fix for GLSL
+vcaps -ffp 1
+
 vinit
 vclear
 vaxo

diff --git a/tests/bugs/vis/bug24224 b/tests/bugs/vis/bug24224
index 3b8e87d8378adc45d988daa6b557075f8e6b43b4..05b78e3e6b6e192ef93467f822087be087ff33b2 100644 (file)
--- a/tests/bugs/vis/bug24224
+++ b/tests/bugs/vis/bug24224
@@ -18,6 +18,9 @@ set y2_coord 320
 set x3_coord 73
 set y3_coord 150
 
+# enable FFP until bug-fix for GLSL
+vcaps -ffp 1
+
 vinit
 box b1 0 0 0 10 10 10
 box b2 30 0 0 10 40 10

diff --git a/tests/bugs/vis/bug24622 b/tests/bugs/vis/bug24622
index df2fbc5bd1bd5072250c1a356901d745fc96bee3..b9a503db1508641e6b4a9dc26870a5fc6116fada 100644 (file)
--- a/tests/bugs/vis/bug24622
+++ b/tests/bugs/vis/bug24622
@@ -18,16 +18,14 @@ OCC24622 1D
 vtop
 vfit
 
-checkcolor 100 200 0 0.5804 0.949
-
-if { $stat != 1 } {
-  puts "Error : the 1D texture color does not match at px (100, 200)!"
+set aColor [vreadpixel 100 200 rgb name]
+if { "$aColor" != "CYAN1" } {
+  puts "Error: the 1D texture color does not match at px (100, 200)!"
 }
 
-checkcolor 300 200 0.298 1.0 0.0
-
-if { $stat != 1 } {
-  puts "Error : the 1D texture color does not match at px (300, 200)!"
+set aColor [vreadpixel 300 200 rgb name]
+if { "$aColor" != "CHARTREUSE" } {
+  puts "Error: the 1D texture color does not match at px (300, 200)!"
 }
 
 vactivate $aV2
@@ -37,16 +35,14 @@ OCC24622 2D
 vtop
 vfit
 
-checkcolor 200 100 0 0.5804 0.949
-
-if { $stat != 1 } {
-  puts "Error : the 2D texture color does not match at px (200, 100)!"
+set aColor [vreadpixel 100 200 rgb name]
+if { "$aColor" != "DARKGOLDENROD1" } {
+  puts "Error: the 2D texture color does not match at px (200, 100)!"
 }
 
-checkcolor 200 300 0.298 1.0 0.0
-
-if { $stat != 1 } {
-  puts "Error : the 2D texture color does not match at px (200, 300)!"
+set aColor [vreadpixel 200 300 rgb name]
+if { "$aColor" != "CHARTREUSE" } {
+  puts "Error: the 2D texture color does not match at px (200, 300)!"
 }
 
 checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug24728 b/tests/bugs/vis/bug24728
index 96750210f6498c26cfe1edb7ea4727eefbf84dcf..1e7a6a4ce2b268db8aa13d394197fa941cebad18 100644 (file)
--- a/tests/bugs/vis/bug24728
+++ b/tests/bugs/vis/bug24728
@@ -7,7 +7,7 @@ puts ""
 #  Test image dumping with software accelerated GL context
 ############################################################
 
-vcaps -softMode
+vcaps -softMode 1 -ffp 1
 vinit View1
 
 box b 1 2 3

diff --git a/tests/bugs/vis/bug25611_1 b/tests/bugs/vis/bug25611_1
index be7e3e093b6b4beb23168635d3120268d8afc1a2..7c8131842bf963bbd941f63bb9a14097f0dd3249 100644 (file)
--- a/tests/bugs/vis/bug25611_1
+++ b/tests/bugs/vis/bug25611_1
@@ -8,6 +8,9 @@ puts "Displaying \'zbufftrihedron\' interferes with \'vgraduatedtrihedron\'"
 
 set anImage $imagedir/${casename}.png
 
+# enable FFP until bug-fix for GLSL
+vcaps -ffp 1
+
 vinit View1
 psphere s 10
 vdisplay s

diff --git a/tests/bugs/vis/bug25611_2 b/tests/bugs/vis/bug25611_2
index b64762b64dc873a41d49eb57de5d6cfa21cfc6d4..ab904473e49ed3730ae476044eb30475980a969e 100644 (file)
--- a/tests/bugs/vis/bug25611_2
+++ b/tests/bugs/vis/bug25611_2
@@ -12,6 +12,9 @@ set anImage2 $imagedir/${casename}_2.png
 set anImage3 $imagedir/${casename}_3.png
 set anImage4 $imagedir/${casename}_4.png
 
+# enable FFP until bug-fix for GLSL
+vcaps -ffp 1
+
 vinit View1
 psphere s 10
 vdisplay s

diff --git a/tests/bugs/vis/bug25768 b/tests/bugs/vis/bug25768
deleted file mode 100644 (file)
index a654d0f..0000000
--- a/tests/bugs/vis/bug25768
+++ /dev/null
@@ -1,28 +0,0 @@
-puts "========="
-puts "CR25768"
-puts "========="
-puts ""
-###########################################################################################
-# Visualization, Graphic3d_Structure - do not use invalid bounding boxes of empty groups
-###########################################################################################
-box b 100 0 0 2 1 1
-vinit View1
-vclear
-vaxo
-vsetdispmode 0
-vdisplay b
-vfit
-vzoom 0.1
-vbounding b
-
-set x_coord 115
-set y_coord 153
-checkcolor $x_coord $y_coord 0 0 0
-
-if { $stat != 1 } {
-  puts "Error: invalid broken bounding boxes"
-} else {
-  puts "OK: valid boundong box"
-}
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/demo/samples/dimensions b/tests/demo/samples/dimensions
index b218d2fb1540044061471939c5dfba756d65745f..6c6dc25d89ac2cb94a3cb0e148a6c27bdb7c6e0c 100644 (file)
--- a/tests/demo/samples/dimensions
+++ b/tests/demo/samples/dimensions
@@ -1,4 +1,5 @@
 source $env(CSF_OCCTSamplesPath)/tcl/dimensions.tcl
+vcaps -ffp 1
 vdump $imagedir/${test_image}.png
 
 puts "TEST COMPLETED"

diff --git a/tests/v3d/point_cloud/sphere b/tests/v3d/point_cloud/sphere
index 70dd27a1e379b0400f00e6d27b8a4f5a7196b8a9..d99d07f14ecd868c1b8b82a2e5658a6651cc5398 100644 (file)
--- a/tests/v3d/point_cloud/sphere
+++ b/tests/v3d/point_cloud/sphere
@@ -8,6 +8,7 @@ mkface s ss
 incmesh s 0.01
 
 # draw sphere
+vcaps -ffp 1
 vinit View1
 vclear
 vsetdispmode 1