From 43790b07b3761524cd47bc44b488784bcdcd1660 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 10 Jun 2007 19:22:13 +0000
Subject: [PATCH] From Vladimir Shabanov, "osg::Image::isImageTranslucent() now
 handles GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV,
 GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV,
 GL_UNSIGNED_INT_10_10_10_2, GL_UNSIGNED_INT_2_10_10_10_REV and
 GL_HALF_FLOAT_NV pixel formats."

---
 src/osg/Image.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp
index f8d86d588..9916de898 100644
--- a/src/osg/Image.cpp
+++ b/src/osg/Image.cpp
@@ -963,6 +963,17 @@ bool _findLowerAlphaValueInRow(unsigned int num, T* data,T value, unsigned int d
     return false;
 }
 
+template <typename T>    
+bool _maskedFindLowerAlphaValueInRow(unsigned int num, T* data,T value, T mask, unsigned int delta)
+{
+    for(unsigned int i=0;i<num;++i)
+    {
+        if ((*data & mask)<value) return true;
+        data += delta;
+    }
+    return false;
+}
+
 bool Image::isImageTranslucent() const
 {
     unsigned int offset = 0;
@@ -1024,6 +1035,47 @@ bool Image::isImageTranslucent() const
                     if (_findLowerAlphaValueInRow(s(), (float*)d + offset, 1.0f, delta))
                         return true;
                     break;
+                case(GL_UNSIGNED_SHORT_5_5_5_1):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned short*)d,
+                                                        (unsigned short)0x0001,
+                                                        (unsigned short)0x0001, 1))
+                        return true;
+                    break;
+                case(GL_UNSIGNED_SHORT_1_5_5_5_REV):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned short*)d,
+                                                        (unsigned short)0x8000,
+                                                        (unsigned short)0x8000, 1))
+                        return true;
+                    break;
+                case(GL_UNSIGNED_SHORT_4_4_4_4):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned short*)d,
+                                                        (unsigned short)0x000f,
+                                                        (unsigned short)0x000f, 1))
+                        return true;
+                    break;
+                case(GL_UNSIGNED_SHORT_4_4_4_4_REV):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned short*)d,
+                                                        (unsigned short)0xf000,
+                                                        (unsigned short)0xf000, 1))
+                        return true;
+                    break;
+                case(GL_UNSIGNED_INT_10_10_10_2):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned int*)d,
+                                                        0x00000003u,
+                                                        0x00000003u, 1))
+                        return true;
+                    break;                    
+                case(GL_UNSIGNED_INT_2_10_10_10_REV):
+                    if (_maskedFindLowerAlphaValueInRow(s(), (unsigned int*)d,
+                                                        0xc0000000u,
+                                                        0xc0000000u, 1))
+                        return true;
+                    break;
+                case(GL_HALF_FLOAT_NV):
+                    if (_findLowerAlphaValueInRow(s(), (unsigned short*)d + offset,
+                                                  (unsigned short)0x3c00, delta))
+                        return true;
+                    break;
             }
         }
     }