From 6363ae5fb6975a6f2e7c1093ce81f25b699e3e61 Mon Sep 17 00:00:00 2001
From: Sven Göthel <sgothel@jausoft.com>
Date: Sun, 14 Jan 2024 04:19:10 +0100
Subject: Graph/GraphUI: Revise Graph Region ShaderMapping, fix AABBox-Clipping
 for Pass2-AA, revise Pass2 AA Quality parameter ..

Misc:
- Graph VBORegion2PVBAAES2: Drop unused FBO rescale
- Move MIN/MAX QUALITY/SAMPLE from GraphUI Scene -> Graph Region

+++

Quality -> Pass2 AA Quality
- Drop quality field in region
- Pass quality to GLRegion.draw(..) similar to sampleCount
  for dynamic shader and switch
- TODO: Pass quality parameter in TextRegionUtil's functions

Fix RegionRenderer Shader Mapping
- Use ShaderKey class to properly implement the hash value and equals method
- For this, TextureSequence.getTextureFragmentShaderHashID() has been added
  to provide actual shader-snippet for the equals function
- All required criterias are included in the hash value and equals method

Fix AABBox Clipping for Pass-2 AA
- Clipping in pass2-AA must happen in pass2 on actual gcu_PMVMatrix01 (not ortho)

+++

GraphUI GraphShape
- Rename: [get,set]{->AA}Quality()

GraphUI Scene
- Rename: mark{All->}ShapesDirty(), set{AllShapes->}Sharpness(), set{AllShapes->AA}Quality()
- Fix setSampleCount(..), i.e. markStatesDirty() not markShapesDirty()
- Fix setAAQuality(), markShapesDirty() and markStatesDirty(): Use forAll(..) to traverse through all shapes and groups.

GraphUI Group
- Add setFixedSize()
- Add setClipOnBox()
- Document setRelayoutOnDirtyShapes(), isShapeDirty()
---
 .../com/jogamp/opengl/util/texture/ImageSequence.java      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java')

diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
index 2da2dcbfc..99704ced0 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
@@ -159,6 +159,7 @@ public class ImageSequence implements TextureSequence {
         } else if(null != texLookupFuncName && texLookupFuncName.length()>0) {
             textureLookupFunctionName = texLookupFuncName;
         }
+        textureFragmentShaderHashCode = 0;
         return textureLookupFunctionName;
     }
 
@@ -179,14 +180,23 @@ public class ImageSequence implements TextureSequence {
           "}\n\n";
     }
 
+    @Override
+    public String getTextureFragmentShaderHashID() {
+        // return getTextureSampler2DType()+";"+getTextureLookupFunctionName()+";"+getTextureLookupFragmentShaderImpl();
+        if( useBuildInTexLookup ) {
+            return getTextureSampler2DType()+";"+getTextureLookupFunctionName();
+        } else {
+            return getTextureLookupFragmentShaderImpl();
+        }
+    }
+
     @Override
     public int getTextureFragmentShaderHashCode() {
         if( !isTextureAvailable() ) {
             textureFragmentShaderHashCode = 0;
             return 0;
         } else if( 0 == textureFragmentShaderHashCode ) {
-            int hash = 31 + getTextureLookupFragmentShaderImpl().hashCode();
-            hash = ((hash << 5) - hash) + getTextureSampler2DType().hashCode();
+            final int hash = getTextureFragmentShaderHashID().hashCode();
             textureFragmentShaderHashCode = hash;
         }
         return textureFragmentShaderHashCode;
-- 
cgit v1.2.3