Refine UML Diagram with functional segments

8 files changed, 304 insertions, 193 deletions

diff --git a/doc/bouml/html/classes.html b/doc/bouml/html/classes.html
index e4fd19eff..810c11e80 100644
--- a/doc/bouml/html/classes.html
+++ b/doc/bouml/html/classes.html
@@ -26,6 +26,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a></td><td>entity</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a></td><td>entity</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a></td><td></td><td></td></tr>
diff --git a/doc/bouml/html/classes_list.html b/doc/bouml/html/classes_list.html
index db1655af3..0455eaa49 100644
--- a/doc/bouml/html/classes_list.html
+++ b/doc/bouml/html/classes_list.html
@@ -27,6 +27,7 @@
 <a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a><br />
 <a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a><br />
 <a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a><br />
+<a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a><br />
 <a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a><br />
 <a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a><br />
 <a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a><br />
diff --git a/doc/bouml/html/fig128069.svg b/doc/bouml/html/fig128069.svg
index d9e0000b3..bd2a54f21 100644
--- a/doc/bouml/html/fig128069.svg
+++ b/doc/bouml/html/fig128069.svg
@@ -1,84 +1,116 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Bouml (http://bouml.free.fr/) -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="1003" height="696" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="1003" height="814" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <g>
-	<line stroke="black" stroke-opacity="1" x1="99" y1="124" x2="138" y2="77" />
-	<line stroke="black" stroke-opacity="1" x1="142" y1="73" x2="133" y2="73" />
-	<line stroke="black" stroke-opacity="1" x1="142" y1="73" x2="142" y2="81" />
-	<line stroke="black" stroke-opacity="1" x1="133" y1="73" x2="142" y2="81" />
+	<rect fill="#ededed" stroke="black" stroke-width="1" stroke-opacity="1" x="5" y="193" width="234" height="609" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="52" y="210">Fixed Function</text>
+	<line stroke="black" stroke-opacity="1" x1="5" y1="217" x2="98" y2="217" />
+	<line stroke="black" stroke-opacity="1" x1="98" y1="217" x2="110" y2="205" />
+	<line stroke="black" stroke-opacity="1" x1="110" y1="205" x2="110" y2="193" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="269" y1="124" x2="215" y2="76" />
-	<line stroke="black" stroke-opacity="1" x1="211" y1="73" x2="211" y2="81" />
-	<line stroke="black" stroke-opacity="1" x1="211" y1="73" x2="219" y2="72" />
-	<line stroke="black" stroke-opacity="1" x1="211" y1="81" x2="219" y2="72" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="392" x2="239" y2="392" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="72" y1="299" x2="72" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="72" y1="187" x2="66" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="72" y1="187" x2="78" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="66" y1="193" x2="78" y2="193" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="569" x2="239" y2="569" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="307" y1="299" x2="307" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="307" y1="187" x2="301" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="307" y1="187" x2="313" y2="193" />
-	<line stroke="black" stroke-opacity="1" x1="301" y1="193" x2="313" y2="193" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="5" y1="304" x2="239" y2="304" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="460" y1="522" x2="460" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="460" y1="275" x2="454" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="460" y1="275" x2="466" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="454" y1="281" x2="466" y2="281" />
+	<rect fill="#c0ffff" stroke="black" stroke-width="1" stroke-opacity="1" x="238" y="193" width="447" height="609" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="306" y="210">Programmable Shader</text>
+	<line stroke="black" stroke-opacity="1" x1="238" y1="217" x2="374" y2="217" />
+	<line stroke="black" stroke-opacity="1" x1="374" y1="217" x2="386" y2="205" />
+	<line stroke="black" stroke-opacity="1" x1="386" y1="205" x2="386" y2="193" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="316" y1="522" x2="439" y2="280" />
-	<line stroke="black" stroke-opacity="1" x1="442" y1="275" x2="433" y2="277" />
-	<line stroke="black" stroke-opacity="1" x1="442" y1="275" x2="444" y2="283" />
-	<line stroke="black" stroke-opacity="1" x1="433" y1="277" x2="444" y2="283" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="569" x2="685" y2="569" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="413" y1="216" x2="359" y2="185" />
-	<line stroke="black" stroke-opacity="1" x1="354" y1="183" x2="356" y2="191" />
-	<line stroke="black" stroke-opacity="1" x1="354" y1="183" x2="362" y2="180" />
-	<line stroke="black" stroke-opacity="1" x1="356" y1="191" x2="362" y2="180" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="304" x2="685" y2="304" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="283" y1="522" x2="93" y2="192" />
-	<line stroke="black" stroke-opacity="1" x1="91" y1="187" x2="88" y2="195" />
-	<line stroke="black" stroke-opacity="1" x1="91" y1="187" x2="99" y2="189" />
-	<line stroke="black" stroke-opacity="1" x1="88" y1="195" x2="99" y2="189" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="238" y1="392" x2="685" y2="392" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="220" y1="42" x2="534" y2="42" />
+	<line stroke="black" stroke-opacity="1" x1="237" y1="42" x2="533" y2="42" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="680" y1="115" x2="602" y2="62" />
+	<line stroke="black" stroke-opacity="1" x1="115" y1="225" x2="154" y2="178" />
+	<line stroke="black" stroke-opacity="1" x1="158" y1="174" x2="149" y2="174" />
+	<line stroke="black" stroke-opacity="1" x1="158" y1="174" x2="158" y2="182" />
+	<line stroke="black" stroke-opacity="1" x1="149" y1="174" x2="158" y2="182" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="72" y1="398" x2="72" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="72" y1="362" x2="66" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="72" y1="362" x2="78" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="66" y1="368" x2="78" y2="368" />
+	<line stroke="black" stroke-opacity="1" x1="285" y1="225" x2="231" y2="177" />
+	<line stroke="black" stroke-opacity="1" x1="227" y1="174" x2="227" y2="182" />
+	<line stroke="black" stroke-opacity="1" x1="227" y1="174" x2="235" y2="173" />
+	<line stroke="black" stroke-opacity="1" x1="227" y1="182" x2="235" y2="173" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="307" y1="398" x2="307" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="307" y1="362" x2="301" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="307" y1="362" x2="313" y2="368" />
-	<line stroke="black" stroke-opacity="1" x1="301" y1="368" x2="313" y2="368" />
+	<line stroke="black" stroke-opacity="1" x1="88" y1="400" x2="88" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="88" y1="288" x2="82" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="88" y1="288" x2="94" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="82" y1="294" x2="94" y2="294" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="460" y1="627" x2="460" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="460" y1="585" x2="454" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="460" y1="585" x2="466" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="454" y1="591" x2="466" y2="591" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="400" x2="323" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="288" x2="317" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="288" x2="329" y2="294" />
+	<line stroke="black" stroke-opacity="1" x1="317" y1="294" x2="329" y2="294" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="301" y1="627" x2="301" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="301" y1="585" x2="295" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="301" y1="585" x2="307" y2="591" />
-	<line stroke="black" stroke-opacity="1" x1="295" y1="591" x2="307" y2="591" />
+	<line stroke="black" stroke-opacity="1" x1="476" y1="624" x2="476" y2="382" />
+	<line stroke="black" stroke-opacity="1" x1="476" y1="376" x2="470" y2="382" />
+	<line stroke="black" stroke-opacity="1" x1="476" y1="376" x2="482" y2="382" />
+	<line stroke="black" stroke-opacity="1" x1="470" y1="382" x2="482" y2="382" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="270" y1="624" x2="447" y2="380" />
+	<line stroke="black" stroke-opacity="1" x1="451" y1="376" x2="442" y2="377" />
+	<line stroke="black" stroke-opacity="1" x1="451" y1="376" x2="452" y2="384" />
+	<line stroke="black" stroke-opacity="1" x1="442" y1="377" x2="452" y2="384" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="429" y1="317" x2="375" y2="286" />
+	<line stroke="black" stroke-opacity="1" x1="370" y1="284" x2="372" y2="292" />
+	<line stroke="black" stroke-opacity="1" x1="370" y1="284" x2="378" y2="281" />
+	<line stroke="black" stroke-opacity="1" x1="372" y1="292" x2="378" y2="281" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="236" y1="624" x2="103" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="101" y1="288" x2="97" y2="295" />
+	<line stroke="black" stroke-opacity="1" x1="101" y1="288" x2="108" y2="291" />
+	<line stroke="black" stroke-opacity="1" x1="97" y1="295" x2="108" y2="291" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="679" y1="115" x2="601" y2="62" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="88" y1="499" x2="88" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="88" y1="463" x2="82" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="88" y1="463" x2="94" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="82" y1="469" x2="94" y2="469" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="323" y1="499" x2="323" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="317" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="323" y1="463" x2="329" y2="469" />
+	<line stroke="black" stroke-opacity="1" x1="317" y1="469" x2="329" y2="469" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="476" y1="716" x2="476" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="476" y1="687" x2="470" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="476" y1="687" x2="482" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="470" y1="693" x2="482" y2="693" />
+</g>
+<g>
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="249" y1="716" x2="249" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="249" y1="687" x2="243" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="249" y1="687" x2="255" y2="693" />
+	<line stroke="black" stroke-opacity="1" x1="243" y1="693" x2="255" y2="693" />
 </g>
 <g>
 	<line stroke="black" stroke-opacity="1" x1="817" y1="450" x2="817" y2="429" />
@@ -105,66 +137,81 @@
 	<line stroke="black" stroke-opacity="1" x1="817" y1="531" x2="817" y2="491" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="216" y="15" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="130" y="69" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="126" y="11" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="171" y="23">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="171" y="44">GL</text>
-	<line stroke="black" stroke-opacity="1" x1="126" y1="53" x2="216" y2="53" />
-	<line stroke="black" stroke-opacity="1" x1="126" y1="61" x2="216" y2="61" />
+	<line stroke="black" stroke-opacity="1" x1="189" y1="111" x2="189" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="189" y1="74" x2="183" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="189" y1="74" x2="195" y2="80" />
+	<line stroke="black" stroke-opacity="1" x1="183" y1="80" x2="195" y2="80" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="232" y="116" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="146" y="170" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="142" y="112" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="187" y="124">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="187" y="145">GL</text>
+	<line stroke="black" stroke-opacity="1" x1="142" y1="154" x2="232" y2="154" />
+	<line stroke="black" stroke-opacity="1" x1="142" y1="162" x2="232" y2="162" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="116" y="129" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="30" y="183" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="26" y="125" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="71" y="137">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="71" y="158">GL2ES1</text>
-	<line stroke="black" stroke-opacity="1" x1="26" y1="167" x2="116" y2="167" />
-	<line stroke="black" stroke-opacity="1" x1="26" y1="175" x2="116" y2="175" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="131" y="405" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="45" y="459" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="41" y="401" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="86" y="413">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="86" y="434">GLES1</text>
+	<line stroke="black" stroke-opacity="1" x1="41" y1="443" x2="131" y2="443" />
+	<line stroke="black" stroke-opacity="1" x1="41" y1="451" x2="131" y2="451" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="345" y="527" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="259" y="581" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="255" y="523" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="300" y="535">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="300" y="556">GL2</text>
-	<line stroke="black" stroke-opacity="1" x1="255" y1="565" x2="345" y2="565" />
-	<line stroke="black" stroke-opacity="1" x1="255" y1="573" x2="345" y2="573" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="132" y="230" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="46" y="284" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="42" y="226" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="87" y="238">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="87" y="259">GL2ES1</text>
+	<line stroke="black" stroke-opacity="1" x1="42" y1="268" x2="132" y2="268" />
+	<line stroke="black" stroke-opacity="1" x1="42" y1="276" x2="132" y2="276" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="350" y="129" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="264" y="183" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="260" y="125" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="305" y="137">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="305" y="158">GL2ES2</text>
-	<line stroke="black" stroke-opacity="1" x1="260" y1="167" x2="350" y2="167" />
-	<line stroke="black" stroke-opacity="1" x1="260" y1="175" x2="350" y2="175" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="292" y="629" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="206" y="683" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="202" y="625" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="247" y="637">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="247" y="658">GL2</text>
+	<line stroke="black" stroke-opacity="1" x1="202" y1="667" x2="292" y2="667" />
+	<line stroke="black" stroke-opacity="1" x1="202" y1="675" x2="292" y2="675" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="503" y="527" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="417" y="581" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="413" y="523" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="458" y="535">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="458" y="556">GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="413" y1="565" x2="503" y2="565" />
-	<line stroke="black" stroke-opacity="1" x1="413" y1="573" x2="503" y2="573" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="366" y="230" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="280" y="284" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="276" y="226" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="321" y="238">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="321" y="259">GL2ES2</text>
+	<line stroke="black" stroke-opacity="1" x1="276" y1="268" x2="366" y2="268" />
+	<line stroke="black" stroke-opacity="1" x1="276" y1="276" x2="366" y2="276" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="351" y="304" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="265" y="358" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="261" y="300" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="306" y="312">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="306" y="333">GLES2</text>
-	<line stroke="black" stroke-opacity="1" x1="261" y1="342" x2="351" y2="342" />
-	<line stroke="black" stroke-opacity="1" x1="261" y1="350" x2="351" y2="350" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="519" y="629" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="433" y="683" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="429" y="625" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="474" y="637">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="474" y="658">GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="429" y1="667" x2="519" y2="667" />
+	<line stroke="black" stroke-opacity="1" x1="429" y1="675" x2="519" y2="675" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="607" y="26" width="3" height="35" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="539" y="58" width="71" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="535" y="22" width="72" height="36" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="571" y="34">GLContext</text>
-	<line stroke="black" stroke-opacity="1" x1="535" y1="43" x2="607" y2="43" />
-	<line stroke="black" stroke-opacity="1" x1="535" y1="51" x2="607" y2="51" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="367" y="405" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="281" y="459" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="277" y="401" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="322" y="413">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="322" y="434">GLES2</text>
+	<line stroke="black" stroke-opacity="1" x1="277" y1="443" x2="367" y2="443" />
+	<line stroke="black" stroke-opacity="1" x1="277" y1="451" x2="367" y2="451" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="606" y="26" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="538" y="58" width="71" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="534" y="22" width="72" height="36" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="570" y="34">GLContext</text>
+	<line stroke="black" stroke-opacity="1" x1="534" y1="43" x2="606" y2="43" />
+	<line stroke="black" stroke-opacity="1" x1="534" y1="51" x2="606" y2="51" />
 </g>
 <g>
 	<rect fill="#808080" stroke="none" stroke-opacity="1" x="748" y="120" width="3" height="35" />
@@ -175,32 +222,33 @@
 	<line stroke="black" stroke-opacity="1" x1="666" y1="145" x2="748" y2="145" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="291" y1="648" x2="311" y2="648" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="301" cy="638" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="301" y="660">GL2Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="271" y1="669" x2="331" y2="669" />
-	<line stroke="black" stroke-opacity="1" x1="271" y1="677" x2="331" y2="677" />
+	<line stroke="black" stroke-opacity="1" x1="239" y1="737" x2="259" y2="737" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="249" cy="727" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="249" y="749">GL2Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="219" y1="758" x2="279" y2="758" />
+	<line stroke="black" stroke-opacity="1" x1="219" y1="766" x2="279" y2="766" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="451" y1="648" x2="471" y2="648" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="461" cy="638" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="461" y="660">GL3Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="431" y1="669" x2="491" y2="669" />
-	<line stroke="black" stroke-opacity="1" x1="431" y1="677" x2="491" y2="677" />
+	<line stroke="black" stroke-opacity="1" x1="467" y1="737" x2="487" y2="737" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="477" cy="727" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="477" y="749">GL3Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="447" y1="758" x2="507" y2="758" />
+	<line stroke="black" stroke-opacity="1" x1="447" y1="766" x2="507" y2="766" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="297" y1="419" x2="317" y2="419" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="307" cy="409" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="307" y="431">GLES2Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="268" y1="440" x2="346" y2="440" />
-	<line stroke="black" stroke-opacity="1" x1="268" y1="448" x2="346" y2="448" />
+	<line stroke="black" stroke-opacity="1" x1="313" y1="520" x2="333" y2="520" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="323" cy="510" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="323" y="532">GLES2Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="284" y1="541" x2="362" y2="541" />
+	<line stroke="black" stroke-opacity="1" x1="284" y1="549" x2="362" y2="549" />
 </g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="526" y="562">Desktop final public</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="526" y="580">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="525" y="339">Mobile final public</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="525" y="357">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="54" y="665">Private implementation (detail)</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="372" y="165">Desktop/Mobile Common Interfaces</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="655">Desktop final public</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="673">OpenGL Interfaces</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="440">Mobile final public</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="458">OpenGL Interfaces</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="26" y="754">Private implementation (detail)</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="264">Desktop/Mobile</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="282">Common Interfaces</text>
 <g>
 	<rect fill="#808080" stroke="none" stroke-opacity="1" x="865" y="192" width="3" height="57" />
 	<rect fill="#808080" stroke="none" stroke-opacity="1" x="773" y="246" width="95" height="3" />
@@ -240,29 +288,32 @@
 	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="87">suitable GL implementation</text>
 	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="784" y="105">matching the GLProfile.</text>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="115" y="304" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="29" y="358" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="25" y="300" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="70" y="312">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="70" y="333">GLES1</text>
-	<line stroke="black" stroke-opacity="1" x1="25" y1="342" x2="115" y2="342" />
-	<line stroke="black" stroke-opacity="1" x1="25" y1="350" x2="115" y2="350" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="233" y="16" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="147" y="70" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="143" y="12" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="188" y="24">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="188" y="45">GLBase</text>
+	<line stroke="black" stroke-opacity="1" x1="143" y1="54" x2="233" y2="54" />
+	<line stroke="black" stroke-opacity="1" x1="143" y1="62" x2="233" y2="62" />
 </g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="273" y="152">Common GL Stuff</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="341">Common Desktop</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="544" y="359">Profile</text>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="504" y="217" width="3" height="57" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="418" y="271" width="89" height="3" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="414" y="213" width="90" height="58" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="459" y="225">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="459" y="246">GL2GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="414" y1="255" x2="504" y2="255" />
-	<line stroke="black" stroke-opacity="1" x1="414" y1="263" x2="504" y2="263" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="520" y="318" width="3" height="57" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="434" y="372" width="89" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="430" y="314" width="90" height="58" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" text-anchor="middle" x="475" y="326">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="475" y="347">GL2GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="430" y1="356" x2="520" y2="356" />
+	<line stroke="black" stroke-opacity="1" x1="430" y1="364" x2="520" y2="364" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="62" y1="419" x2="82" y2="419" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="72" cy="409" rx="10" ry="10" />
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="72" y="431">GLES1Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="33" y1="440" x2="111" y2="440" />
-	<line stroke="black" stroke-opacity="1" x1="33" y1="448" x2="111" y2="448" />
+	<line stroke="black" stroke-opacity="1" x1="78" y1="520" x2="98" y2="520" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="88" cy="510" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="88" y="532">GLES1Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="49" y1="541" x2="127" y2="541" />
+	<line stroke="black" stroke-opacity="1" x1="49" y1="549" x2="127" y2="549" />
 </g>
 <g>
 	<rect fill="#808080" stroke="none" stroke-opacity="1" x="856" y="387" width="3" height="35" />
@@ -273,16 +324,10 @@
 	<line stroke="black" stroke-opacity="1" x1="776" y1="412" x2="856" y2="412" />
 </g>
 <g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="517" y="60">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="230" y="60">1</text>
-</g>
-<g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="612" y="86">0..1</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="585" y="76">0..1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="663" y="139">1</text>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="652" y="116">1</text>
 </g>
 <g>
 	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="794" y="370">chosen</text>
@@ -296,4 +341,10 @@
 <g>
 	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="834" y="370">1</text>
 </g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="516" y="60">1</text>
+</g>
+<g>
+	<text font-family="Helvetica" font-size="10" fill="#000000" xml:space="preserve" x="247" y="60">1</text>
+</g>
 </svg>
diff --git a/doc/bouml/html/index.html b/doc/bouml/html/index.html
index 2bdfcda0e..b083f5485 100644
--- a/doc/bouml/html/index.html
+++ b/doc/bouml/html/index.html
@@ -24,16 +24,15 @@ Documentation</title>
 <h1 class ="view">1 Class View javax.media.opengl</h1>
 <div class="sub">
 <a name="refclass diagram128069"></a>
-<p align="center"><embed src="fig128069.svg" width="1003" height="696"/></p>
+<p align="center"><embed src="fig128069.svg" width="1003" height="814"/></p>
  <p align="center"><b>OpenGL Interfaces</b></p><p><br /></p><p><br /></p>
 <a name="refclass128069"></a>
 <h2 class ="class">1.1 Class GL</h2>
-<p>Declaration :</p><ul><li>Java : public interface GL </li><li>Php : public interface GL </li></ul><p>Directly inherited by : <a href="index.html#refclass128197"><b>GL2ES1</b></a> <a href="index.html#refclass128581"><b>GL2ES2</b></a> </p>
+<p>Declaration :</p><ul><li>Java : public interface GL extends <a href="index.html#refclass132549"><b>GLBase</b></a> </li><li>Php : public interface GL </li></ul><p>Directly inherited by : <a href="index.html#refclass128197"><b>GL2ES1</b></a> <a href="index.html#refclass128581"><b>GL2ES2</b></a> </p>
 <p>Stereotype: interface</p>
 <div class="sub">
 <div class="sub">
-<a name="refrelation130373"></a>
-<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul></div>
+</div>
 </div>
 <a name="refclass128197"></a>
 <h2 class ="class">1.2 Class GL2ES1</h2>
@@ -95,9 +94,9 @@ Documentation</title>
 <h2 class ="class">1.9 Class GLContext</h2>
 <p>Declaration :</p><ul><li>Java : package abstract class GLContext </li></ul><div class="sub">
 <div class="sub">
-<a name="refrelation130501"></a>
-<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass128069"><b>GL</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass128069"><b>GL</b></a> </li></ul><a name="refrelation130757"></a>
-<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130245"><b>GLDrawable</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130245"><b>GLDrawable</b></a> </li></ul></div>
+<a name="refrelation130757"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130245"><b>GLDrawable</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130245"><b>GLDrawable</b></a> </li></ul><a name="refrelation134341"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass132549"><b>GLBase</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass132549"><b>GLBase</b></a> </li></ul></div>
 </div>
 <a name="refclass130245"></a>
 <h2 class ="class">1.10 Class GLDrawable</h2>
@@ -178,6 +177,15 @@ Documentation</title>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131141"><b>GLCapabilities</b></a></li><li>Java : private <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </li></ul><a name="refrelation132805"></a>
 <table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass131141"><b>GLCapabilities</b></a></li><li>Java : private <a href="index.html#refclass131141"><b>GLCapabilities</b></a> </li></ul></div>
 </div>
+<a name="refclass132549"></a>
+<h2 class ="class">1.20 Class GLBase</h2>
+<p>Declaration :</p><ul><li>Java : public interface GLBase </li><li>Php : public interface GLBase </li></ul><p>Directly inherited by : <a href="index.html#refclass128069"><b>GL</b></a> </p>
+<p>Stereotype: interface</p>
+<div class="sub">
+<div class="sub">
+<a name="refrelation134213"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : -  : <a href="index.html#refclass130117"><b>GLContext</b></a>, multiplicity : 1</li><li>Java : private <a href="index.html#refclass130117"><b>GLContext</b></a> </li></ul></div>
+</div>
 </div>
 </body>
 </html>
diff --git a/doc/bouml/html/index_71.html b/doc/bouml/html/index_71.html
index ebb894853..473fa4229 100644
--- a/doc/bouml/html/index_71.html
+++ b/doc/bouml/html/index_71.html
@@ -25,6 +25,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130373" target = "projectFrame"><b>GL2Impl</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass128837" target = "projectFrame"><b>GL3</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130501" target = "projectFrame"><b>GL3Impl</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass132549" target = "projectFrame"><b>GLBase</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass131141" target = "projectFrame"><b>GLCapabilities</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130117" target = "projectFrame"><b>GLContext</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass130245" target = "projectFrame"><b>GLDrawable</b></a></td><td>class</td><td></td></tr>
diff --git a/doc/bouml/jogl/128069.diagram b/doc/bouml/jogl/128069.diagram
index fc6271d19..d467ebad4 100644
--- a/doc/bouml/jogl/128069.diagram
+++ b/doc/bouml/jogl/128069.diagram
@@ -2,39 +2,39 @@ format 62
 
 classcanvas 128069 class_ref 128069 // GL
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 126 11 2000
+  xyz 142 112 2000
 end
 classcanvas 128197 class_ref 128197 // GL2ES1
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 26 125 2000
+  xyz 42 226 2000
 end
 classcanvas 128325 class_ref 128325 // GLES1
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 25 300 2000
+  xyz 41 401 2000
 end
 classcanvas 128453 class_ref 128453 // GL2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 255 523 2000
+  xyz 202 625 2000
 end
 classcanvas 128581 class_ref 128581 // GL2ES2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 260 125 2000
+  xyz 276 226 2000
 end
 classcanvas 128709 class_ref 128709 // GL2GL3
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 414 213 2005
+  xyz 430 314 2005
 end
 classcanvas 128837 class_ref 128837 // GL3
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 413 523 2000
+  xyz 429 625 2000
 end
 classcanvas 128965 class_ref 128965 // GLES2
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 261 300 2000
+  xyz 277 401 2000
 end
 classcanvas 130245 class_ref 130117 // GLContext
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 535 22 2000
+  xyz 534 22 2000
 end
 classcanvas 130501 class_ref 130245 // GLDrawable
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
@@ -42,29 +42,29 @@ classcanvas 130501 class_ref 130245 // GLDrawable
 end
 classcanvas 130757 class_ref 130373 // GL2Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 271 628 2000
+  xyz 219 717 2000
 end
 classcanvas 130885 class_ref 130501 // GL3Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 431 628 2000
+  xyz 447 717 2000
 end
 classcanvas 131013 class_ref 130629 // GLES2Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 268 399 2000
+  xyz 284 500 2000
 end
 classcanvas 131141 class_ref 130757 // GLES1Impl
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
-  xyz 33 399 2005
+  xyz 49 500 2005
 end
 textcanvas 131781 "Desktop final public OpenGL Interfaces
 "
-  xyzwh 526 545 2000 135 37
+  xyzwh 544 638 2000 135 37
 textcanvas 131909 "Mobile final public OpenGL Interfaces"
-  xyzwh 525 322 2000 125 38
+  xyzwh 544 423 2000 125 38
 textcanvas 132037 "Private implementation (detail)"
-  xyzwh 54 648 2000 179 17
+  xyzwh 26 737 2000 179 17
 textcanvas 132165 "Desktop/Mobile Common Interfaces"
-  xyzwh 372 148 2000 221 17
+  xyzwh 544 247 2000 129 42
 classcanvas 132293 class_ref 130885 // NativeWindow
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
   xyz 769 188 2000
@@ -87,6 +87,26 @@ classcanvas 132805 class_ref 131397 // GLProfile
 end
 textcanvas 135749 "Lifecycle: From the lower right to the top, left step where the GLContext is created with a suitable GL implementation matching the GLProfile."
   xyzwh 784 16 2000 208 93
+classcanvas 135877 class_ref 132549 // GLBase
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 143 12 2000
+end
+textcanvas 136261 "Common GL Stuff"
+  xyzwh 273 135 2000 108 17
+fragment 136517 "Programmable Shader"
+  color blue xyzwh 238 193 1994 448 610
+  separator 3275
+  separator 6177
+  separator 1832
+end
+fragment 136645 "Fixed Function"
+  color lightgray xyzwh 5 193 1989 235 610
+  separator 3278
+  separator 6177
+  separator 1821
+end
+textcanvas 136773 "Common Desktop Profile"
+  xyzwh 544 324 2000 115 39
 relationcanvas 129093 relation_ref 129221 // <generalisation>
   from ref 128197 z 1999 to ref 128069
   no_role_a no_role_b
@@ -127,15 +147,10 @@ relationcanvas 130117 relation_ref 130245 // <generalisation>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 130373 relation_ref 130373 // <association>
-  from ref 128069 z 1999 to ref 130245
-  no_role_a no_role_b
-  multiplicity_a_pos 517 50 3000 multiplicity_b_pos 230 50 3000
-end
 relationcanvas 130629 relation_ref 130501 // <association>
   from ref 130501 z 1999 to ref 130245
   no_role_a no_role_b
-  multiplicity_a_pos 612 76 3000 multiplicity_b_pos 663 129 3000
+  multiplicity_a_pos 585 66 3000 multiplicity_b_pos 652 106 3000
 end
 relationcanvas 131269 relation_ref 130629 // <realization>
   from ref 131141 z 1999 to ref 128325
@@ -196,4 +211,14 @@ relationcanvas 134725 relation_ref 131781 // <association>
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 136005 relation_ref 133061 // <generalisation>
+  from ref 128069 z 1999 to ref 135877
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 136133 relation_ref 133189 // <association>
+  from ref 135877 z 1999 to ref 130245
+  no_role_a no_role_b
+  multiplicity_a_pos 516 50 3000 multiplicity_b_pos 247 50 3000
+end
 end
diff --git a/doc/bouml/jogl/69.session b/doc/bouml/jogl/69.session
index 676e7f380..ae6631e25 100644
--- a/doc/bouml/jogl/69.session
+++ b/doc/bouml/jogl/69.session
@@ -1,7 +1,7 @@
 window_sizes 1800 1050 450 1344 851 120
 diagrams
   active  classdiagram_ref 128069 // OpenGL Interfaces
-    1075 797 100 15 0 0
+    1135 830 100 15 57 0
 end
 show_stereotypes
 selected classdiagram_ref 128069 // OpenGL Interfaces
diff --git a/doc/bouml/jogl/jogl.prj b/doc/bouml/jogl/jogl.prj
index 9bc8dd3de..a7daf2922 100644
--- a/doc/bouml/jogl/jogl.prj
+++ b/doc/bouml/jogl/jogl.prj
@@ -1,6 +1,6 @@
 format 62
 "jogl"
-  revision 3
+  revision 4
   modified_by 69 "sg215889"
 
 
@@ -74,16 +74,12 @@ ${members}};
 "
       explicit_switch_type ""
       
-      classrelation 130373 // <association>
-	relation 130373 ----
-	  a role_name "" multiplicity "1" private
-	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
-"
-	    classrelation_ref 130373 // <association>
-	  b role_name "" multiplicity "1" private
-	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
-"
-	    classrelation_ref 130501 // <association>
+      classrelation 134085 // <generalisation>
+	relation 133061 ---|>
+	  a public
+	    java "${type}"
+	    classrelation_ref 134085 // <generalisation>
+	  b parent class_ref 132549 // GLBase
       end
     end
 
@@ -274,13 +270,13 @@ ${members}}
       idl_decl ""
       explicit_switch_type ""
       
-      classrelation 130501 // <association>
-	relation_ref 130373 // <association>
-      end
-
       classrelation 130757 // <association>
 	relation_ref 130501 // <association>
       end
+
+      classrelation 134341 // <association>
+	relation_ref 133189 // <association>
+      end
     end
 
     class 130245 "GLDrawable"
@@ -554,5 +550,33 @@ ${members}}
 	    classrelation_ref 132933 // <association>
       end
     end
+
+    class 132549 "GLBase"
+      visibility public stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      classrelation 134213 // <association>
+	relation 133189 ----
+	  a role_name "" multiplicity "1" private
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 134213 // <association>
+	  b role_name "" multiplicity "1" private
+	    java "  ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value};
+"
+	    classrelation_ref 134341 // <association>
+      end
+    end
   end
 end