Changeset 10766

Timestamp:

11/18/09 12:25:28 (4 years ago)

Author:

robert

Message:

Added osg::ShaderBinary::readShaderBinaryFile(..) static method

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Shader (modified) (4 diffs)
• src/osg/Shader.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/Shader

@@ -36 +36 @@
 {
     public:
-        
+
         ShaderBinary();
 
@@ -46 +46 @@
         /** Allocated a data buffer of specified size/*/
         void allocate(unsigned int size);
-        
+
         /** Assign shader binary data, copying the specified data into locally stored data buffer, the original data can then be deleted.*/
         void assign(unsigned int size, const unsigned char* data);
-        
+
         /** Get the size of the shader binary data.*/
         unsigned int getSize() const { return _data.size(); }
@@ -58 +58 @@
         /** Get a const ptr to the shader binary data.*/
         const unsigned char* getData() const { return _data.empty() ? 0 : &(_data.front()); }
-        
+
+        /** Read shader binary from file.
+          * Return the resulting Shader or 0 if no valid shader binary could be read.*/
+        static ShaderBinary* readShaderBinaryFile(const std::string& fileName);
+
     protected:
-        
+
         typedef std::vector<unsigned char> Data;
         Data _data;
@@ -133 +137 @@
 
         /** Read shader source from file and then constructor shader of specified type.
-          * Return the resulting Shader or 0 if no valid shader source code be read.*/
+          * Return the resulting Shader or 0 if no valid shader source could be read.*/
         static Shader* readShaderFile( Type type, const std::string& fileName );
 

OpenSceneGraph/trunk/src/osg/Shader.cpp

@@ -64 +64 @@
 }
 
-        ///////////////////////////////////////////////////////////////////////////
+ShaderBinary* ShaderBinary::readShaderBinaryFile(const std::string& fileName)
+{
+    std::ifstream fin;
+    fin.open(fileName.c_str(), std::ios::binary);
+    if (!fin) return 0;
+
+    fin.seekg(0, std::ios::end);
+    int length = fin.tellg();
+    if (length==0) return 0;
+
+    osg::ref_ptr<ShaderBinary> shaderBinary = new osg::ShaderBinary;
+    shaderBinary->allocate(length);
+    fin.seekg(0, std::ios::beg);
+    fin.read(reinterpret_cast<char*>(shaderBinary->getData()), length);
+    fin.close();
+
+    return shaderBinary.release();
+}
+
+///////////////////////////////////////////////////////////////////////////
 // static cache of glShaders flagged for deletion, which will actually
 // be deleted in the correct GL context.