6 files changed, 380 insertions, 382 deletions
diff --git a/doc/uml/html-svg/fig128069.svg b/doc/uml/html-svg/fig128069.svg
index 942a34f81..ca0f67f84 100755
--- a/doc/uml/html-svg/fig128069.svg
+++ b/doc/uml/html-svg/fig128069.svg
@@ -1,496 +1,494 @@
 <?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="1072" height="1062" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="1186" height="1178" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <g>
-	<rect fill="#ededed" stroke="black" stroke-width="1" stroke-opacity="1" x="2" y="176" width="213" height="874" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="45" y="193">Fixed Function</text>
-	<line stroke="black" stroke-opacity="1" x1="2" y1="197" x2="87" y2="197" />
-	<line stroke="black" stroke-opacity="1" x1="87" y1="197" x2="98" y2="186" />
-	<line stroke="black" stroke-opacity="1" x1="98" y1="186" x2="98" y2="176" />
+	<rect fill="#ededed" stroke="black" stroke-width="1" stroke-opacity="1" x="2" y="195" width="235" height="971" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="49" y="213">Fixed Function</text>
+	<line stroke="black" stroke-opacity="1" x1="2" y1="218" x2="95" y2="218" />
+	<line stroke="black" stroke-opacity="1" x1="95" y1="218" x2="107" y2="206" />
+	<line stroke="black" stroke-opacity="1" x1="107" y1="206" x2="107" y2="195" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="342" x2="215" y2="342" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="379" x2="237" y2="379" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="417" x2="215" y2="417" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="462" x2="237" y2="462" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="573" x2="215" y2="573" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="2" y1="637" x2="237" y2="637" />
 </g>
 <g>
-	<rect fill="#c0ffff" stroke="black" stroke-width="1" stroke-opacity="1" x="213" y="177" width="637" height="873" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="279" y="194">Programmable Shader</text>
-	<line stroke="black" stroke-opacity="1" x1="213" y1="198" x2="345" y2="198" />
-	<line stroke="black" stroke-opacity="1" x1="345" y1="198" x2="356" y2="187" />
-	<line stroke="black" stroke-opacity="1" x1="356" y1="187" x2="356" y2="177" />
+	<rect fill="#c0ffff" stroke="black" stroke-width="1" stroke-opacity="1" x="236" y="195" width="708" height="971" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="304" y="213">Programmable Shader</text>
+	<line stroke="black" stroke-opacity="1" x1="236" y1="218" x2="372" y2="218" />
+	<line stroke="black" stroke-opacity="1" x1="372" y1="218" x2="384" y2="206" />
+	<line stroke="black" stroke-opacity="1" x1="384" y1="206" x2="384" y2="195" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="213" y1="417" x2="850" y2="417" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="236" y1="462" x2="944" y2="462" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="213" y1="574" x2="850" y2="574" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="236" y1="637" x2="944" y2="637" />
 </g>
 <g>
-	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="213" y1="342" x2="850" y2="342" />
+	<line stroke="black" stroke-dasharray="20,4" stroke-opacity="1" x1="236" y1="379" x2="944" y2="379" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="100" y1="204" x2="138" y2="158" />
-	<line stroke="black" stroke-opacity="1" x1="142" y1="154" x2="133" y2="154" />
-	<line stroke="black" stroke-opacity="1" x1="142" y1="154" x2="142" y2="162" />
-	<line stroke="black" stroke-opacity="1" x1="133" y1="154" x2="142" y2="162" />
+	<line stroke="black" stroke-opacity="1" x1="111" y1="225" x2="152" y2="176" />
+	<line stroke="black" stroke-opacity="1" x1="156" y1="172" x2="147" y2="172" />
+	<line stroke="black" stroke-opacity="1" x1="156" y1="172" x2="156" y2="180" />
+	<line stroke="black" stroke-opacity="1" x1="147" y1="172" x2="156" y2="180" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="257" y1="204" x2="204" y2="157" />
-	<line stroke="black" stroke-opacity="1" x1="200" y1="154" x2="200" y2="162" />
-	<line stroke="black" stroke-opacity="1" x1="200" y1="154" x2="208" y2="153" />
-	<line stroke="black" stroke-opacity="1" x1="200" y1="162" x2="208" y2="153" />
+	<line stroke="black" stroke-opacity="1" x1="284" y1="226" x2="227" y2="175" />
+	<line stroke="black" stroke-opacity="1" x1="223" y1="172" x2="223" y2="180" />
+	<line stroke="black" stroke-opacity="1" x1="223" y1="172" x2="231" y2="171" />
+	<line stroke="black" stroke-opacity="1" x1="223" y1="180" x2="231" y2="171" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="77" y1="432" x2="77" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="77" y1="257" x2="71" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="77" y1="257" x2="83" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="71" y1="263" x2="83" y2="263" />
+	<line stroke="black" stroke-opacity="1" x1="86" y1="479" x2="86" y2="292" />
+	<line stroke="black" stroke-opacity="1" x1="86" y1="286" x2="80" y2="292" />
+	<line stroke="black" stroke-opacity="1" x1="86" y1="286" x2="92" y2="292" />
+	<line stroke="black" stroke-opacity="1" x1="80" y1="292" x2="92" y2="292" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="288" y1="432" x2="288" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="288" y1="257" x2="282" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="288" y1="257" x2="294" y2="263" />
-	<line stroke="black" stroke-opacity="1" x1="282" y1="263" x2="294" y2="263" />
+	<line stroke="black" stroke-opacity="1" x1="320" y1="479" x2="320" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="320" y1="287" x2="314" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="320" y1="287" x2="326" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="314" y1="293" x2="326" y2="293" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="564" y1="720" x2="439" y2="408" />
-	<line stroke="black" stroke-opacity="1" x1="437" y1="403" x2="433" y2="410" />
-	<line stroke="black" stroke-opacity="1" x1="437" y1="403" x2="444" y2="406" />
-	<line stroke="black" stroke-opacity="1" x1="433" y1="410" x2="444" y2="406" />
+	<line stroke="black" stroke-opacity="1" x1="627" y1="799" x2="487" y2="454" />
+	<line stroke="black" stroke-opacity="1" x1="485" y1="449" x2="481" y2="456" />
+	<line stroke="black" stroke-opacity="1" x1="485" y1="449" x2="492" y2="452" />
+	<line stroke="black" stroke-opacity="1" x1="481" y1="456" x2="492" y2="452" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="236" y1="622" x2="401" y2="407" />
-	<line stroke="black" stroke-opacity="1" x1="405" y1="403" x2="396" y2="404" />
-	<line stroke="black" stroke-opacity="1" x1="405" y1="403" x2="406" y2="411" />
-	<line stroke="black" stroke-opacity="1" x1="396" y1="404" x2="406" y2="411" />
+	<line stroke="black" stroke-opacity="1" x1="262" y1="690" x2="443" y2="453" />
+	<line stroke="black" stroke-opacity="1" x1="447" y1="449" x2="438" y2="450" />
+	<line stroke="black" stroke-opacity="1" x1="447" y1="449" x2="448" y2="457" />
+	<line stroke="black" stroke-opacity="1" x1="438" y1="450" x2="448" y2="457" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="208" y1="622" x2="87" y2="262" />
-	<line stroke="black" stroke-opacity="1" x1="86" y1="257" x2="82" y2="264" />
-	<line stroke="black" stroke-opacity="1" x1="86" y1="257" x2="93" y2="260" />
-	<line stroke="black" stroke-opacity="1" x1="82" y1="264" x2="93" y2="260" />
+	<line stroke="black" stroke-opacity="1" x1="230" y1="690" x2="97" y2="291" />
+	<line stroke="black" stroke-opacity="1" x1="96" y1="286" x2="92" y2="293" />
+	<line stroke="black" stroke-opacity="1" x1="96" y1="286" x2="103" y2="289" />
+	<line stroke="black" stroke-opacity="1" x1="92" y1="293" x2="103" y2="289" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="615" y1="99" x2="449" y2="48" />
+	<line stroke="black" stroke-opacity="1" x1="685" y1="110" x2="498" y2="54" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="77" y1="517" x2="77" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="77" y1="485" x2="71" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="77" y1="485" x2="83" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="71" y1="491" x2="83" y2="491" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="85" y1="573" x2="85" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="85" y1="540" x2="79" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="85" y1="540" x2="91" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="79" y1="546" x2="91" y2="546" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="440" y1="944" x2="552" y2="777" />
-	<line stroke="black" stroke-opacity="1" x1="556" y1="773" x2="547" y2="774" />
-	<line stroke="black" stroke-opacity="1" x1="556" y1="773" x2="557" y2="781" />
-	<line stroke="black" stroke-opacity="1" x1="547" y1="774" x2="557" y2="781" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="491" y1="1047" x2="614" y2="864" />
+	<line stroke="black" stroke-opacity="1" x1="618" y1="860" x2="609" y2="861" />
+	<line stroke="black" stroke-opacity="1" x1="618" y1="860" x2="619" y2="868" />
+	<line stroke="black" stroke-opacity="1" x1="609" y1="861" x2="619" y2="868" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="964" y1="431" x2="964" y2="396" />
-	<line stroke="black" stroke-opacity="1" x1="964" y1="390" x2="958" y2="396" />
-	<line stroke="black" stroke-opacity="1" x1="964" y1="390" x2="970" y2="396" />
-	<line stroke="black" stroke-opacity="1" x1="958" y1="396" x2="970" y2="396" />
+	<line stroke="black" stroke-opacity="1" x1="1071" y1="477" x2="1071" y2="441" />
+	<line stroke="black" stroke-opacity="1" x1="1071" y1="435" x2="1065" y2="441" />
+	<line stroke="black" stroke-opacity="1" x1="1071" y1="435" x2="1077" y2="441" />
+	<line stroke="black" stroke-opacity="1" x1="1065" y1="441" x2="1077" y2="441" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="933" y1="300" x2="934" y2="355" />
+	<line stroke="black" stroke-opacity="1" x1="1038" y1="335" x2="1037" y2="394" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="965" y1="265" x2="965" y2="233" />
+	<line stroke="black" stroke-opacity="1" x1="1072" y1="294" x2="1072" y2="260" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="920" y1="192" x2="696" y2="123" />
+	<line stroke="black" stroke-opacity="1" x1="1020" y1="212" x2="772" y2="136" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="964" y1="524" x2="964" y2="466" />
+	<line stroke="black" stroke-opacity="1" x1="1071" y1="581" x2="1071" y2="518" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="988" y1="355" x2="990" y2="300" />
+	<line stroke="black" stroke-opacity="1" x1="1098" y1="394" x2="1098" y2="335" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="964" y1="524" x2="964" y2="466" />
+	<line stroke="black" stroke-opacity="1" x1="1071" y1="581" x2="1071" y2="518" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="169" y1="101" x2="169" y2="69" />
-	<line stroke="black" stroke-opacity="1" x1="170" y1="64" x2="163" y2="69" />
-	<line stroke="black" stroke-opacity="1" x1="170" y1="64" x2="175" y2="70" />
-	<line stroke="black" stroke-opacity="1" x1="163" y1="69" x2="175" y2="70" />
+	<line stroke="black" stroke-opacity="1" x1="188" y1="111" x2="188" y2="77" />
+	<line stroke="black" stroke-opacity="1" x1="189" y1="72" x2="182" y2="77" />
+	<line stroke="black" stroke-opacity="1" x1="189" y1="72" x2="194" y2="78" />
+	<line stroke="black" stroke-opacity="1" x1="182" y1="77" x2="194" y2="78" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="213" y1="38" x2="378" y2="38" />
+	<line stroke="black" stroke-opacity="1" x1="236" y1="42" x2="421" y2="42" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="256" y="724" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="178" y="770" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="175" y="721" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="216" y="734">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="216" y="751">GL3bc</text>
-	<line stroke="black" stroke-opacity="1" x1="175" y1="755" x2="256" y2="755" />
-	<line stroke="black" stroke-opacity="1" x1="175" y1="761" x2="256" y2="761" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="283" y="804" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="199" y="856" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="195" y="800" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="239" y="815">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="239" y="835">GL3bc</text>
+	<line stroke="black" stroke-opacity="1" x1="195" y1="840" x2="283" y2="840" />
+	<line stroke="black" stroke-opacity="1" x1="195" y1="848" x2="283" y2="848" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="208" y="105" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="130" y="151" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="127" y="102" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="168" y="115">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="168" y="132">GL</text>
-	<line stroke="black" stroke-opacity="1" x1="127" y1="136" x2="208" y2="136" />
-	<line stroke="black" stroke-opacity="1" x1="127" y1="142" x2="208" y2="142" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="230" y="116" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="146" y="168" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="142" y="112" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="186" y="127">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="186" y="147">GL</text>
+	<line stroke="black" stroke-opacity="1" x1="142" y1="152" x2="230" y2="152" />
+	<line stroke="black" stroke-opacity="1" x1="142" y1="160" x2="230" y2="160" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="768" y="839" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="690" y="885" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="687" y="836" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="728" y="849">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="728" y="866">GL4</text>
-	<line stroke="black" stroke-opacity="1" x1="687" y1="870" x2="768" y2="870" />
-	<line stroke="black" stroke-opacity="1" x1="687" y1="876" x2="768" y2="876" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="852" y="932" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="768" y="984" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="764" y="928" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="808" y="943">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="808" y="963">GL4</text>
+	<line stroke="black" stroke-opacity="1" x1="764" y1="968" x2="852" y2="968" />
+	<line stroke="black" stroke-opacity="1" x1="764" y1="976" x2="852" y2="976" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="117" y="208" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="39" y="254" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="36" y="205" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="77" y="218">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="77" y="235">GL2ES1</text>
-	<line stroke="black" stroke-opacity="1" x1="36" y1="239" x2="117" y2="239" />
-	<line stroke="black" stroke-opacity="1" x1="36" y1="245" x2="117" y2="245" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="128" y="230" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="44" y="282" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="40" y="226" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="84" y="241">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="84" y="261">GL2ES1</text>
+	<line stroke="black" stroke-opacity="1" x1="40" y1="266" x2="128" y2="266" />
+	<line stroke="black" stroke-opacity="1" x1="40" y1="274" x2="128" y2="274" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="256" y="840" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="178" y="886" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="175" y="837" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="216" y="850">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="216" y="867">GL4bc</text>
-	<line stroke="black" stroke-opacity="1" x1="175" y1="871" x2="256" y2="871" />
-	<line stroke="black" stroke-opacity="1" x1="175" y1="877" x2="256" y2="877" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="283" y="932" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="199" y="984" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="195" y="928" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="239" y="943">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="239" y="963">GL4bc</text>
+	<line stroke="black" stroke-opacity="1" x1="195" y1="968" x2="283" y2="968" />
+	<line stroke="black" stroke-opacity="1" x1="195" y1="976" x2="283" y2="976" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="116" y="436" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="38" y="482" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="35" y="433" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="76" y="446">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="76" y="463">GLES1</text>
-	<line stroke="black" stroke-opacity="1" x1="35" y1="467" x2="116" y2="467" />
-	<line stroke="black" stroke-opacity="1" x1="35" y1="473" x2="116" y2="473" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="128" y="484" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="44" y="536" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="40" y="480" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="84" y="495">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="84" y="515">GLES1</text>
+	<line stroke="black" stroke-opacity="1" x1="40" y1="520" x2="128" y2="520" />
+	<line stroke="black" stroke-opacity="1" x1="40" y1="528" x2="128" y2="528" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="256" y="626" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="178" y="672" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="175" y="623" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="216" y="636">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="216" y="653">GL2</text>
-	<line stroke="black" stroke-opacity="1" x1="175" y1="657" x2="256" y2="657" />
-	<line stroke="black" stroke-opacity="1" x1="175" y1="663" x2="256" y2="663" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="283" y="695" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="199" y="747" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="195" y="691" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="239" y="706">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="239" y="726">GL2</text>
+	<line stroke="black" stroke-opacity="1" x1="195" y1="731" x2="283" y2="731" />
+	<line stroke="black" stroke-opacity="1" x1="195" y1="739" x2="283" y2="739" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="327" y="208" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="249" y="254" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="246" y="205" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="287" y="218">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="287" y="235">GL2ES2</text>
-	<line stroke="black" stroke-opacity="1" x1="246" y1="239" x2="327" y2="239" />
-	<line stroke="black" stroke-opacity="1" x1="246" y1="245" x2="327" y2="245" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="362" y="231" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="278" y="283" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="274" y="227" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="318" y="242">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="318" y="262">GL2ES2</text>
+	<line stroke="black" stroke-opacity="1" x1="274" y1="267" x2="362" y2="267" />
+	<line stroke="black" stroke-opacity="1" x1="274" y1="275" x2="362" y2="275" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="615" y="724" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="537" y="770" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="534" y="721" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="575" y="734">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="575" y="751">GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="534" y1="755" x2="615" y2="755" />
-	<line stroke="black" stroke-opacity="1" x1="534" y1="761" x2="615" y2="761" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="683" y="804" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="599" y="856" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="595" y="800" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="639" y="815">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="639" y="835">GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="595" y1="840" x2="683" y2="840" />
+	<line stroke="black" stroke-opacity="1" x1="595" y1="848" x2="683" y2="848" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="327" y="436" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="249" y="482" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="246" y="433" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="287" y="446">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="287" y="463">GLES2</text>
-	<line stroke="black" stroke-opacity="1" x1="246" y1="467" x2="327" y2="467" />
-	<line stroke="black" stroke-opacity="1" x1="246" y1="473" x2="327" y2="473" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="774" y="278" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="684" y="324" width="92" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="681" y="275" width="93" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="728" y="288">&lt;&lt;@interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="728" y="305">GL4ES3</text>
-	<line stroke="black" stroke-opacity="1" x1="681" y1="309" x2="774" y2="309" />
-	<line stroke="black" stroke-opacity="1" x1="681" y1="315" x2="774" y2="315" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="446" y="24" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="382" y="52" width="66" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="379" y="21" width="67" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="413" y="34">GLContext</text>
-	<line stroke="black" stroke-opacity="1" x1="379" y1="38" x2="446" y2="38" />
-	<line stroke="black" stroke-opacity="1" x1="379" y1="44" x2="446" y2="44" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="693" y="99" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="619" y="127" width="76" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="616" y="96" width="77" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="655" y="109">GLDrawable</text>
-	<line stroke="black" stroke-opacity="1" x1="616" y1="113" x2="693" y2="113" />
-	<line stroke="black" stroke-opacity="1" x1="616" y1="119" x2="693" y2="119" />
-</g>
-<g>
-	<rect fill="none" stroke="black" stroke-width="1" stroke-opacity="1" x="379" y="227" width="92" height="48" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="425" y="240">&lt;&lt;metaclass&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="425" y="257">GL2ES3</text>
-	<line stroke="black" stroke-opacity="1" x1="379" y1="261" x2="471" y2="261" />
-	<line stroke="black" stroke-opacity="1" x1="379" y1="267" x2="471" y2="267" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="417" y1="963" x2="435" y2="963" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="426" cy="954" rx="9" ry="9" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="426" y="976">GL4bcImpl</text>
-	<line stroke="black" stroke-opacity="1" x1="393" y1="980" x2="459" y2="980" />
-	<line stroke="black" stroke-opacity="1" x1="393" y1="986" x2="459" y2="986" />
-</g>
-<g>
-	<line stroke="black" stroke-opacity="1" x1="640" y1="537" x2="658" y2="537" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="649" cy="528" rx="9" ry="9" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="649" y="550">GLES3Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="615" y1="554" x2="683" y2="554" />
-	<line stroke="black" stroke-opacity="1" x1="615" y1="560" x2="683" y2="560" />
-</g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1008" y="184" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="924" y="230" width="86" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="921" y="181" width="87" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="965" y="194">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="965" y="211">NativeWindow</text>
-	<line stroke="black" stroke-opacity="1" x1="921" y1="215" x2="1008" y2="215" />
-	<line stroke="black" stroke-opacity="1" x1="921" y1="221" x2="1008" y2="221" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="362" y="484" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="278" y="536" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="274" y="480" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="318" y="495">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="318" y="515">GLES2</text>
+	<line stroke="black" stroke-opacity="1" x1="274" y1="520" x2="362" y2="520" />
+	<line stroke="black" stroke-opacity="1" x1="274" y1="528" x2="362" y2="528" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="859" y="309" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="761" y="361" width="101" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="757" y="305" width="102" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="808" y="320">&lt;&lt;@interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="808" y="340">GL4ES3</text>
+	<line stroke="black" stroke-opacity="1" x1="757" y1="345" x2="859" y2="345" />
+	<line stroke="black" stroke-opacity="1" x1="757" y1="353" x2="859" y2="353" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="494" y="27" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="426" y="59" width="71" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="422" y="23" width="72" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="458" y="38">GLContext</text>
+	<line stroke="black" stroke-opacity="1" x1="422" y1="43" x2="494" y2="43" />
+	<line stroke="black" stroke-opacity="1" x1="422" y1="51" x2="494" y2="51" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="768" y="109" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="690" y="141" width="81" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="686" y="105" width="82" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="727" y="120">GLDrawable</text>
+	<line stroke="black" stroke-opacity="1" x1="686" y1="125" x2="768" y2="125" />
+	<line stroke="black" stroke-opacity="1" x1="686" y1="133" x2="768" y2="133" />
+</g>
+<g>
+	<rect fill="none" stroke="black" stroke-width="1" stroke-opacity="1" x="423" y="250" width="100" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="473" y="265">&lt;&lt;metaclass&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="473" y="285">GL2ES3</text>
+	<line stroke="black" stroke-opacity="1" x1="423" y1="290" x2="523" y2="290" />
+	<line stroke="black" stroke-opacity="1" x1="423" y1="298" x2="523" y2="298" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="464" y1="1068" x2="484" y2="1068" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="474" cy="1058" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="474" y="1083">GL4bcImpl</text>
+	<line stroke="black" stroke-opacity="1" x1="436" y1="1088" x2="512" y2="1088" />
+	<line stroke="black" stroke-opacity="1" x1="436" y1="1096" x2="512" y2="1096" />
+</g>
+<g>
+	<line stroke="black" stroke-opacity="1" x1="711" y1="595" x2="731" y2="595" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="721" cy="585" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="721" y="610">GLES3Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="682" y1="615" x2="760" y2="615" />
+	<line stroke="black" stroke-opacity="1" x1="682" y1="623" x2="760" y2="623" />
 </g>
-<g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1057" y="269" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="875" y="297" width="184" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="872" y="266" width="185" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="965" y="279">AbstractGraphicsConfiguration</text>
-	<line stroke="black" stroke-opacity="1" x1="872" y1="283" x2="1057" y2="283" />
-	<line stroke="black" stroke-opacity="1" x1="872" y1="289" x2="1057" y2="289" />
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1121" y="204" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1025" y="256" width="99" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="1021" y="200" width="100" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="1071" y="215">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="1071" y="235">NativeWindow</text>
+	<line stroke="black" stroke-opacity="1" x1="1021" y1="240" x2="1121" y2="240" />
+	<line stroke="black" stroke-opacity="1" x1="1021" y1="248" x2="1121" y2="248" />
+</g>
+<g>
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1170" y="299" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="976" y="331" width="197" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="972" y="295" width="198" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" font-style="italic" text-anchor="middle" x="1071" y="310">AbstractGraphicsConfiguration</text>
+	<line stroke="black" stroke-opacity="1" x1="972" y1="315" x2="1170" y2="315" />
+	<line stroke="black" stroke-opacity="1" x1="972" y1="323" x2="1170" y2="323" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1006" y="435" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="922" y="463" width="86" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="919" y="432" width="87" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="963" y="445">GLCapabilities</text>
-	<line stroke="black" stroke-opacity="1" x1="919" y1="449" x2="1006" y2="449" />
-	<line stroke="black" stroke-opacity="1" x1="919" y1="455" x2="1006" y2="455" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1119" y="482" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1023" y="514" width="99" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="1019" y="478" width="100" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="1069" y="493">GLCapabilities</text>
+	<line stroke="black" stroke-opacity="1" x1="1019" y1="498" x2="1119" y2="498" />
+	<line stroke="black" stroke-opacity="1" x1="1019" y1="506" x2="1119" y2="506" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="993" y="528" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="937" y="556" width="58" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="934" y="525" width="59" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="964" y="538">GLProfile</text>
-	<line stroke="black" stroke-opacity="1" x1="934" y1="542" x2="993" y2="542" />
-	<line stroke="black" stroke-opacity="1" x1="934" y1="548" x2="993" y2="548" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1104" y="586" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1040" y="618" width="67" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="1036" y="582" width="68" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="1070" y="597">GLProfile</text>
+	<line stroke="black" stroke-opacity="1" x1="1036" y1="602" x2="1104" y2="602" />
+	<line stroke="black" stroke-opacity="1" x1="1036" y1="610" x2="1104" y2="610" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="210" y="15" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="132" y="61" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="129" y="12" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="170" y="25">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="170" y="42">GLBase</text>
-	<line stroke="black" stroke-opacity="1" x1="129" y1="46" x2="210" y2="46" />
-	<line stroke="black" stroke-opacity="1" x1="129" y1="52" x2="210" y2="52" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="232" y="16" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="148" y="68" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="144" y="12" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="188" y="27">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="188" y="47">GLBase</text>
+	<line stroke="black" stroke-opacity="1" x1="144" y1="52" x2="232" y2="52" />
+	<line stroke="black" stroke-opacity="1" x1="144" y1="60" x2="232" y2="60" />
 </g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="613">Desktop final public</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="628">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="485">Mobile final public</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="500">OpenGL Interfaces</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="16" y="980">Private implementation</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="16" y="995">(detail)</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="737" y="233">Desktop/Mobile</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="737" y="248">Common Interfaces</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="704" y="29">Lifecycle: From the lower right to</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="704" y="44">the top, left step where the</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="704" y="59">GLContext is created with a</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="704" y="74">suitable GL implementation</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="704" y="89">matching the GLProfile.</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="245" y="137">Common GL</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="245" y="152">Stuff</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="377">Common Desktop</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="738" y="392">Profile</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="680">Desktop final public</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="696">OpenGL Interfaces</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="538">Mobile final public</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="554">OpenGL Interfaces</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="17" y="1088">Private implementation (detail)</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="819" y="258">Desktop/Mobile</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="819" y="274">Common Interfaces</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="781" y="32">Lifecycle: From the lower right to</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="781" y="48">the top, left step where the</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="781" y="64">GLContext is created with a</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="781" y="80">suitable GL implementation</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="781" y="96">matching the GLProfile.</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="271" y="151">Common GL Stuff</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="418">Common Desktop</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="820" y="434">Profile</text>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="402" y1="944" x2="245" y2="777" />
-	<line stroke="black" stroke-opacity="1" x1="241" y1="773" x2="240" y2="781" />
-	<line stroke="black" stroke-opacity="1" x1="241" y1="773" x2="249" y2="773" />
-	<line stroke="black" stroke-opacity="1" x1="240" y1="781" x2="249" y2="773" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="446" y1="1047" x2="273" y2="864" />
+	<line stroke="black" stroke-opacity="1" x1="269" y1="860" x2="268" y2="868" />
+	<line stroke="black" stroke-opacity="1" x1="269" y1="860" x2="277" y2="860" />
+	<line stroke="black" stroke-opacity="1" x1="268" y1="868" x2="277" y2="860" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="392" y1="951" x2="264" y2="886" />
-	<line stroke="black" stroke-opacity="1" x1="259" y1="884" x2="261" y2="892" />
-	<line stroke="black" stroke-opacity="1" x1="259" y1="884" x2="267" y2="881" />
-	<line stroke="black" stroke-opacity="1" x1="261" y1="892" x2="267" y2="881" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="435" y1="1056" x2="292" y2="983" />
+	<line stroke="black" stroke-opacity="1" x1="287" y1="981" x2="289" y2="989" />
+	<line stroke="black" stroke-opacity="1" x1="287" y1="981" x2="295" y2="978" />
+	<line stroke="black" stroke-opacity="1" x1="289" y1="989" x2="295" y2="978" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="408" y1="944" x2="236" y2="680" />
-	<line stroke="black" stroke-opacity="1" x1="233" y1="675" x2="231" y2="683" />
-	<line stroke="black" stroke-opacity="1" x1="233" y1="675" x2="241" y2="676" />
-	<line stroke="black" stroke-opacity="1" x1="231" y1="683" x2="241" y2="676" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="455" y1="1047" x2="263" y2="756" />
+	<line stroke="black" stroke-opacity="1" x1="260" y1="751" x2="258" y2="759" />
+	<line stroke="black" stroke-opacity="1" x1="260" y1="751" x2="268" y2="752" />
+	<line stroke="black" stroke-opacity="1" x1="258" y1="759" x2="268" y2="752" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="459" y1="955" x2="680" y2="876" />
-	<line stroke="black" stroke-opacity="1" x1="686" y1="875" x2="678" y2="871" />
-	<line stroke="black" stroke-opacity="1" x1="686" y1="875" x2="682" y2="882" />
-	<line stroke="black" stroke-opacity="1" x1="678" y1="871" x2="682" y2="882" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="512" y1="1061" x2="757" y2="974" />
+	<line stroke="black" stroke-opacity="1" x1="763" y1="972" x2="755" y2="968" />
+	<line stroke="black" stroke-opacity="1" x1="763" y1="972" x2="759" y2="979" />
+	<line stroke="black" stroke-opacity="1" x1="755" y1="968" x2="759" y2="979" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="217" y1="720" x2="217" y2="681" />
-	<line stroke="black" stroke-opacity="1" x1="217" y1="675" x2="211" y2="681" />
-	<line stroke="black" stroke-opacity="1" x1="217" y1="675" x2="223" y2="681" />
-	<line stroke="black" stroke-opacity="1" x1="211" y1="681" x2="223" y2="681" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="799" x2="241" y2="757" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="751" x2="235" y2="757" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="751" x2="247" y2="757" />
+	<line stroke="black" stroke-opacity="1" x1="235" y1="757" x2="247" y2="757" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="259" y1="747" x2="527" y2="747" />
-	<line stroke="black" stroke-opacity="1" x1="533" y1="747" x2="527" y2="741" />
-	<line stroke="black" stroke-opacity="1" x1="533" y1="747" x2="527" y2="753" />
-	<line stroke="black" stroke-opacity="1" x1="527" y1="741" x2="527" y2="753" />
+	<line stroke="black" stroke-opacity="1" x1="287" y1="830" x2="588" y2="830" />
+	<line stroke="black" stroke-opacity="1" x1="594" y1="830" x2="588" y2="824" />
+	<line stroke="black" stroke-opacity="1" x1="594" y1="830" x2="588" y2="836" />
+	<line stroke="black" stroke-opacity="1" x1="588" y1="824" x2="588" y2="836" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="693" y1="835" x2="615" y2="776" />
-	<line stroke="black" stroke-opacity="1" x1="611" y1="773" x2="612" y2="781" />
-	<line stroke="black" stroke-opacity="1" x1="611" y1="773" x2="619" y2="771" />
-	<line stroke="black" stroke-opacity="1" x1="612" y1="781" x2="619" y2="771" />
+	<line stroke="black" stroke-opacity="1" x1="768" y1="927" x2="685" y2="863" />
+	<line stroke="black" stroke-opacity="1" x1="681" y1="860" x2="682" y2="868" />
+	<line stroke="black" stroke-opacity="1" x1="681" y1="860" x2="689" y2="858" />
+	<line stroke="black" stroke-opacity="1" x1="682" y1="868" x2="689" y2="858" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="217" y1="836" x2="217" y2="779" />
-	<line stroke="black" stroke-opacity="1" x1="217" y1="773" x2="211" y2="779" />
-	<line stroke="black" stroke-opacity="1" x1="217" y1="773" x2="223" y2="779" />
-	<line stroke="black" stroke-opacity="1" x1="211" y1="779" x2="223" y2="779" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="927" x2="241" y2="866" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="860" x2="235" y2="866" />
+	<line stroke="black" stroke-opacity="1" x1="241" y1="860" x2="247" y2="866" />
+	<line stroke="black" stroke-opacity="1" x1="235" y1="866" x2="247" y2="866" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="259" y1="862" x2="680" y2="862" />
-	<line stroke="black" stroke-opacity="1" x1="686" y1="862" x2="680" y2="856" />
-	<line stroke="black" stroke-opacity="1" x1="686" y1="862" x2="680" y2="868" />
-	<line stroke="black" stroke-opacity="1" x1="680" y1="856" x2="680" y2="868" />
+	<line stroke="black" stroke-opacity="1" x1="287" y1="958" x2="757" y2="958" />
+	<line stroke="black" stroke-opacity="1" x1="763" y1="958" x2="757" y2="952" />
+	<line stroke="black" stroke-opacity="1" x1="763" y1="958" x2="757" y2="964" />
+	<line stroke="black" stroke-opacity="1" x1="757" y1="952" x2="757" y2="964" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="378" y1="243" x2="335" y2="236" />
-	<line stroke="black" stroke-opacity="1" x1="330" y1="236" x2="335" y2="242" />
-	<line stroke="black" stroke-opacity="1" x1="330" y1="236" x2="336" y2="230" />
-	<line stroke="black" stroke-opacity="1" x1="335" y1="242" x2="336" y2="230" />
+	<line stroke="black" stroke-opacity="1" x1="422" y1="269" x2="371" y2="262" />
+	<line stroke="black" stroke-opacity="1" x1="366" y1="262" x2="371" y2="268" />
+	<line stroke="black" stroke-opacity="1" x1="366" y1="262" x2="372" y2="256" />
+	<line stroke="black" stroke-opacity="1" x1="371" y1="268" x2="372" y2="256" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="729" y1="835" x2="729" y2="333" />
-	<line stroke="black" stroke-opacity="1" x1="729" y1="327" x2="723" y2="333" />
-	<line stroke="black" stroke-opacity="1" x1="729" y1="327" x2="735" y2="333" />
-	<line stroke="black" stroke-opacity="1" x1="723" y1="333" x2="735" y2="333" />
+	<line stroke="black" stroke-opacity="1" x1="810" y1="927" x2="810" y2="371" />
+	<line stroke="black" stroke-opacity="1" x1="810" y1="365" x2="804" y2="371" />
+	<line stroke="black" stroke-opacity="1" x1="810" y1="365" x2="816" y2="371" />
+	<line stroke="black" stroke-opacity="1" x1="804" y1="371" x2="816" y2="371" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="614" y1="534" x2="335" y2="469" />
-	<line stroke="black" stroke-opacity="1" x1="330" y1="468" x2="334" y2="475" />
-	<line stroke="black" stroke-opacity="1" x1="330" y1="468" x2="337" y2="463" />
-	<line stroke="black" stroke-opacity="1" x1="334" y1="475" x2="337" y2="463" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="681" y1="593" x2="371" y2="521" />
+	<line stroke="black" stroke-opacity="1" x1="366" y1="520" x2="370" y2="527" />
+	<line stroke="black" stroke-opacity="1" x1="366" y1="520" x2="373" y2="515" />
+	<line stroke="black" stroke-opacity="1" x1="370" y1="527" x2="373" y2="515" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="695" y="436" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="605" y="482" width="92" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="602" y="433" width="93" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="649" y="446">&lt;&lt;@interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="649" y="463">GLES3</text>
-	<line stroke="black" stroke-opacity="1" x1="602" y1="467" x2="695" y2="467" />
-	<line stroke="black" stroke-opacity="1" x1="602" y1="473" x2="695" y2="473" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="771" y="484" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="673" y="536" width="101" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="669" y="480" width="102" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="720" y="495">&lt;&lt;@interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="720" y="515">GLES3</text>
+	<line stroke="black" stroke-opacity="1" x1="669" y1="520" x2="771" y2="520" />
+	<line stroke="black" stroke-opacity="1" x1="669" y1="528" x2="771" y2="528" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="466" y="354" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="388" y="400" width="80" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="385" y="351" width="81" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="426" y="364">&lt;&lt;interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="426" y="381">GL2GL3</text>
-	<line stroke="black" stroke-opacity="1" x1="385" y1="385" x2="466" y2="385" />
-	<line stroke="black" stroke-opacity="1" x1="385" y1="391" x2="466" y2="391" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="516" y="393" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="432" y="445" width="87" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="428" y="389" width="88" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="472" y="404">&lt;&lt;interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="472" y="424">GL2GL3</text>
+	<line stroke="black" stroke-opacity="1" x1="428" y1="429" x2="516" y2="429" />
+	<line stroke="black" stroke-opacity="1" x1="428" y1="437" x2="516" y2="437" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="68" y1="536" x2="86" y2="536" />
-	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="77" cy="527" rx="9" ry="9" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="77" y="549">GLES1Impl</text>
-	<line stroke="black" stroke-opacity="1" x1="43" y1="553" x2="111" y2="553" />
-	<line stroke="black" stroke-opacity="1" x1="43" y1="559" x2="111" y2="559" />
+	<line stroke="black" stroke-opacity="1" x1="75" y1="594" x2="95" y2="594" />
+	<ellipse fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" cx="85" cy="584" rx="10" ry="10" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="85" y="609">GLES1Impl</text>
+	<line stroke="black" stroke-opacity="1" x1="46" y1="614" x2="124" y2="614" />
+	<line stroke="black" stroke-opacity="1" x1="46" y1="622" x2="124" y2="622" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="999" y="359" width="2" height="30" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="929" y="387" width="72" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="926" y="356" width="73" height="31" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="963" y="369">Capabilities</text>
-	<line stroke="black" stroke-opacity="1" x1="926" y1="373" x2="999" y2="373" />
-	<line stroke="black" stroke-opacity="1" x1="926" y1="379" x2="999" y2="379" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1110" y="399" width="3" height="35" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="1032" y="431" width="81" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="1028" y="395" width="82" height="36" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="1069" y="410">Capabilities</text>
+	<line stroke="black" stroke-opacity="1" x1="1028" y1="415" x2="1110" y2="415" />
+	<line stroke="black" stroke-opacity="1" x1="1028" y1="423" x2="1110" y2="423" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="661" y1="432" x2="711" y2="332" />
-	<line stroke="black" stroke-opacity="1" x1="714" y1="327" x2="705" y2="329" />
-	<line stroke="black" stroke-opacity="1" x1="714" y1="327" x2="716" y2="335" />
-	<line stroke="black" stroke-opacity="1" x1="705" y1="329" x2="716" y2="335" />
+	<line stroke="black" stroke-opacity="1" x1="735" y1="479" x2="790" y2="370" />
+	<line stroke="black" stroke-opacity="1" x1="793" y1="365" x2="784" y2="367" />
+	<line stroke="black" stroke-opacity="1" x1="793" y1="365" x2="795" y2="373" />
+	<line stroke="black" stroke-opacity="1" x1="784" y1="367" x2="795" y2="373" />
 </g>
 <g>
-	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="649" y1="518" x2="649" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="649" y1="485" x2="643" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="649" y1="485" x2="655" y2="491" />
-	<line stroke="black" stroke-opacity="1" x1="643" y1="491" x2="655" y2="491" />
+	<line stroke-dasharray="4,4" stroke="black" stroke-opacity="1" x1="721" y1="574" x2="721" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="721" y1="540" x2="715" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="721" y1="540" x2="727" y2="546" />
+	<line stroke="black" stroke-opacity="1" x1="715" y1="546" x2="727" y2="546" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="426" y1="350" x2="425" y2="280" />
-	<line stroke="black" stroke-opacity="1" x1="425" y1="275" x2="419" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="425" y1="275" x2="431" y2="280" />
-	<line stroke="black" stroke-opacity="1" x1="419" y1="281" x2="431" y2="280" />
+	<line stroke="black" stroke-opacity="1" x1="473" y1="388" x2="473" y2="312" />
+	<line stroke="black" stroke-opacity="1" x1="473" y1="306" x2="467" y2="312" />
+	<line stroke="black" stroke-opacity="1" x1="473" y1="306" x2="479" y2="312" />
+	<line stroke="black" stroke-opacity="1" x1="467" y1="312" x2="479" y2="312" />
 </g>
 <g>
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="621" y="250" width="2" height="48" />
-	<rect fill="#808080" stroke="none" stroke-opacity="1" x="531" y="296" width="92" height="2" />
-	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="528" y="247" width="93" height="49" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" text-anchor="middle" x="575" y="260">&lt;&lt;@interface&gt;&gt;</text>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="575" y="277">GL3ES3</text>
-	<line stroke="black" stroke-opacity="1" x1="528" y1="281" x2="621" y2="281" />
-	<line stroke="black" stroke-opacity="1" x1="528" y1="287" x2="621" y2="287" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="690" y="277" width="3" height="55" />
+	<rect fill="#808080" stroke="none" stroke-opacity="1" x="592" y="329" width="101" height="3" />
+	<rect fill="#ffffc0" stroke="black" stroke-width="1" stroke-opacity="1" x="588" y="273" width="102" height="56" />
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" text-anchor="middle" x="639" y="288">&lt;&lt;@interface&gt;&gt;</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="639" y="308">GL3ES3</text>
+	<line stroke="black" stroke-opacity="1" x1="588" y1="313" x2="690" y2="313" />
+	<line stroke="black" stroke-opacity="1" x1="588" y1="321" x2="690" y2="321" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="680" y1="292" x2="629" y2="282" />
-	<line stroke="black" stroke-opacity="1" x1="624" y1="281" x2="628" y2="288" />
-	<line stroke="black" stroke-opacity="1" x1="624" y1="281" x2="631" y2="276" />
-	<line stroke="black" stroke-opacity="1" x1="628" y1="288" x2="631" y2="276" />
+	<line stroke="black" stroke-opacity="1" x1="756" y1="325" x2="699" y2="314" />
+	<line stroke="black" stroke-opacity="1" x1="694" y1="313" x2="698" y2="320" />
+	<line stroke="black" stroke-opacity="1" x1="694" y1="313" x2="701" y2="308" />
+	<line stroke="black" stroke-opacity="1" x1="698" y1="320" x2="701" y2="308" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="527" y1="264" x2="476" y2="256" />
-	<line stroke="black" stroke-opacity="1" x1="471" y1="256" x2="476" y2="262" />
-	<line stroke="black" stroke-opacity="1" x1="471" y1="256" x2="477" y2="250" />
-	<line stroke="black" stroke-opacity="1" x1="476" y1="262" x2="477" y2="250" />
+	<line stroke="black" stroke-opacity="1" x1="587" y1="293" x2="528" y2="284" />
+	<line stroke="black" stroke-opacity="1" x1="523" y1="284" x2="528" y2="290" />
+	<line stroke="black" stroke-opacity="1" x1="523" y1="284" x2="529" y2="278" />
+	<line stroke="black" stroke-opacity="1" x1="528" y1="290" x2="529" y2="278" />
 </g>
 <g>
-	<line stroke="black" stroke-opacity="1" x1="576" y1="720" x2="576" y2="305" />
-	<line stroke="black" stroke-opacity="1" x1="576" y1="299" x2="570" y2="305" />
-	<line stroke="black" stroke-opacity="1" x1="576" y1="299" x2="582" y2="305" />
-	<line stroke="black" stroke-opacity="1" x1="570" y1="305" x2="582" y2="305" />
+	<line stroke="black" stroke-opacity="1" x1="641" y1="799" x2="641" y2="339" />
+	<line stroke="black" stroke-opacity="1" x1="641" y1="333" x2="635" y2="339" />
+	<line stroke="black" stroke-opacity="1" x1="641" y1="333" x2="647" y2="339" />
+	<line stroke="black" stroke-opacity="1" x1="635" y1="339" x2="647" y2="339" />
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="594" y="121">1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="660" y="135">1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="357" y="57">1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="397" y="64">1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="223" y="57">1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="248" y="64">1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="463" y="72">0..1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="514" y="80">0..1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="1002" y="347">requested</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="1043" y="386">chosen</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="972" y="347">1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="1015" y="386">1</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="913" y="347">1</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="1115" y="386">requested</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="937" y="347">chosen</text>
+	<text font-family="Helvetica" font-size="12" fill="#000000" xml:space="preserve" x="1080" y="386">1</text>
 </g>
 </svg>
diff --git a/doc/uml/html-svg/index.html b/doc/uml/html-svg/index.html
index 5505c4d94..046f333bd 100755
--- a/doc/uml/html-svg/index.html
+++ b/doc/uml/html-svg/index.html
@@ -24,7 +24,7 @@ Documentation</title>
 <h1 class ="view">1 Class View javax.media.opengl</h1>
 <div class="sub">
 <a name="ref10_128069"></a>
-<p align="center"><embed src="fig128069.svg" width="1072" height="1062"/></p>
+<p align="center"><embed src="fig128069.svg" width="1186" height="1178"/></p>
  <p align="center"><b>OpenGL Interfaces - All</b></p><p><br /></p><p><br /></p>
 <a name="ref10_134786"></a>
 <p align="center"><embed src="fig134786.svg" width="1186" height="1054"/></p>
diff --git a/doc/uml/html/fig128069.png b/doc/uml/html/fig128069.png
index f94051e8a..b653c71a3 100755
--- a/doc/uml/html/fig128069.png
+++ b/doc/uml/html/fig128069.png
diff --git a/doc/uml/jogl/128069.diagram b/doc/uml/jogl/128069.diagram
index 3a184cb7d..757594823 100755
--- a/doc/uml/jogl/128069.diagram
+++ b/doc/uml/jogl/128069.diagram
@@ -2,7 +2,7 @@ format 75
 
 classcanvas 128002 class_ref 128002 // GL3bc
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 195.3 800.5 2000
+  xyz 195.8 800.5 2000
 end
 classcanvas 128069 class_ref 128069 // GL
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -18,7 +18,7 @@ classcanvas 128197 class_ref 128197 // GL2ES1
 end
 classcanvas 128258 class_ref 128258 // GL4bc
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 195.3 928.9 2000
+  xyz 195.8 928.9 2000
 end
 classcanvas 128325 class_ref 128325 // GLES1
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -26,19 +26,19 @@ classcanvas 128325 class_ref 128325 // GLES1
 end
 classcanvas 128453 class_ref 128453 // GL2
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 195.8 691.8 2000
+  xyz 195.3 691.3 2000
 end
 classcanvas 128581 class_ref 128581 // GL2ES2
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 274 227.6 2000
+  xyz 274 227.1 2000
 end
 classcanvas 128709 class_ref 128709 // GL2GL3
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 428.4 389.2 2005
+  xyz 428.4 389.7 2005
 end
 classcanvas 128837 class_ref 128837 // GL3
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 595 800 2000
+  xyz 595.5 800 2000
 end
 classcanvas 128965 class_ref 128965 // GLES2
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -50,24 +50,24 @@ classcanvas 130050 class_ref 134914 // GLES3
 end
 classcanvas 130178 class_ref 135042 // GL4ES3
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 757 305 2000
+  xyz 757 305.5 2000
 end
 classcanvas 130245 class_ref 130117 // GLContext
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 422.4 23.2 2000
+  xyz 422.4 23.7 2000
 end
 classcanvas 130434 class_ref 135170 // GL3ES3
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 588 273.5 2009
+  xyz 588.5 273 2009
 end
 classcanvas 130501 class_ref 130245 // GLDrawable
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 686.7 105.8 2000
+  xyz 686.2 105.3 2000
 end
 classcanvas 130690 class_ref 135298 // GL2ES3
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   color transparent
-  xyz 423 250.8 2000
+  xyz 423.5 250.8 2000
 end
 classcanvas 130885 class_ref 130501 // GL4bcImpl
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
@@ -75,63 +75,63 @@ classcanvas 130885 class_ref 130501 // GL4bcImpl
 end
 classcanvas 131141 class_ref 130757 // GLES1Impl
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 46.5 574.6 2005
+  xyz 46 574.6 2005
 end
 classcanvas 131202 class_ref 130629 // GLES3Impl
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 682.2 575.6 2000
+  xyz 682.7 575.1 2000
 end
 textcanvas 131781 "Desktop final public OpenGL Interfaces
 "
-  xyzwh 820.3 664.8 2000 135 37
+  xyzwh 820.5 664 2000 135 37
 textcanvas 131909 "Mobile final public OpenGL Interfaces"
-  xyzwh 820.8 522 2000 125 38
+  xyzwh 820 522 2000 125 38
 textcanvas 132037 "Private implementation (detail)"
-  xyzwh 18.4 1072 2000 178 18
+  xyzwh 17 1072 2000 178 18
 textcanvas 132165 "Desktop/Mobile Common Interfaces"
-  xyzwh 819.7 242.7 2000 129 42
+  xyzwh 819.5 242 2000 129 42
 classcanvas 132293 class_ref 130885 // NativeWindow
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 1021.3 200.8 2000
+  xyz 1021.8 200.8 2000
 end
 classcanvas 132421 class_ref 131013 // AbstractGraphicsConfiguration
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 972.7 295.3 2000
+  xyz 972.2 295.8 2000
 end
 classcanvas 132549 class_ref 131141 // GLCapabilities
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 1019.1 478.9 2000
+  xyz 1019.6 478.9 2000
 end
 classcanvas 132677 class_ref 131269 // Capabilities
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 1028.6 395 2005
+  xyz 1028.1 395.5 2005
 end
 classcanvas 132805 class_ref 131397 // GLProfile
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   xyz 1036.8 582.6 2000
 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 781.5 16.8 2000 208 93
+  xyzwh 781 16 2000 208 93
 classcanvas 135877 class_ref 132549 // GLBase
   draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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 class drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
   xyz 144 12.6 2000
 end
 textcanvas 136261 "Common GL Stuff"
-  xyzwh 271.5 135.7 2000 108 17
+  xyzwh 271 135.5 2000 108 17
 fragment 136517 "Programmable Shader"
-  color blue xyzwh 236.4 196.3 1994 709 972
+  color blue xyzwh 236.4 195.8 1994 709 972
   separator 2748
   separator 4543
   separator 1893
 end
 fragment 136645 "Fixed Function"
-  color lightgray xyzwh 2 195.3 1989 238 973
-  separator 2754
-  separator 4544
-  separator 1896
+  color lightgray xyzwh 2 195.8 1989 236 972
+  separator 2746
+  separator 4546
+  separator 1888
 end
 textcanvas 136773 "Common Desktop Profile"
-  xyzwh 820.3 402.9 2000 115 39
+  xyzwh 820.5 402.5 2000 115 39
 relationcanvas 128386 relation_ref 128002 // <realization>
   from ref 130885 z 2001 to ref 128002
   no_role_a no_role_b
diff --git a/doc/uml/jogl/2.session b/doc/uml/jogl/2.session
index 2a96b7e3a..ef995db6c 100644
--- a/doc/uml/jogl/2.session
+++ b/doc/uml/jogl/2.session
@@ -1,7 +1,7 @@
 window_sizes 1898 1332 450 1344 884 38
 diagrams
   active  classdiagram_ref 128069 // OpenGL Interfaces - All
-    1442 1217 90 17 0 0
+    1442 1217 100 17 0 0
   classdiagram_ref 134786 // OpenGL Interfaces - Core Only
     1149 974 100 17 93 0
 end
diff --git a/doc/uml/jogl/jogl.prj b/doc/uml/jogl/jogl.prj
index 882c2a1e9..c6751e0ef 100755
--- a/doc/uml/jogl/jogl.prj
+++ b/doc/uml/jogl/jogl.prj
@@ -1,6 +1,6 @@
 format 75
 "jogl"
-  revision 12
+  revision 13
   modified_by 2 "sven"
 
 
@@ -39,7 +39,7 @@ format 75
   mark_for_import
   
   ncouples 1
-  key "html dir" value "c:/projects/JOGAMP/jogl/doc/bouml/html-svg/"
+  key "html dir" value "c:/projects/JOGAMP/jogl/doc/bouml/html/"
   classview 128069 "javax.media.opengl"
     //class diagram settings
     draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context 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_relation_visibility default show_infonote default shadow default show_stereotype_properties default