Changeset 37 for trunk

Timestamp:

05/28/13 01:03:00 (12 years ago)

Author:

epyon

Message:

• gl_context added
• removed geometry shader support from gl_program (non-GL 2.1/GLES 2.0 compatible)
• cleaned up warnings

Location:

trunk

Files:

• nv/gl/gl_context.hh (added)
• nv/gl/gl_program.hh (modified) (2 diffs)
• nv/lib/gl.hh (modified) (1 diff)
• nv/types.hh (modified) (1 diff)
• src/gl/gl_context.cc (added)
• src/gl/gl_program.cc (modified) (3 diffs)

trunk/nv/gl/gl_program.hh

@@ -44 +44 @@
         {
         public:
-                gl_program( const string& vertex_program, const string& fragment_program, const string& geometry_program = "");
-                bool compile( const string& vertex_program, const string& fragment_program, const string& geometry_program = "" );
+                gl_program( const string& vertex_program, const string& fragment_program );
+                bool compile( const string& vertex_program, const string& fragment_program );
 
                 virtual void bind();
@@ -60 +60 @@
                 gl_shader vertex_shader;
                 gl_shader fragment_shader;
-                gl_shader geometry_shader;
         };
 

trunk/nv/lib/gl.hh

@@ -145 +145 @@
 #define GL_DRAW_BUFFER 0x0C01
 #define GL_READ_BUFFER 0x0C02
+#define GL_SCISSOR_TEST 0x0C11
 #define GL_COLOR_CLEAR_VALUE 0x0C22
 #define GL_COLOR_WRITEMASK 0x0C23

trunk/nv/types.hh

@@ -76 +76 @@
 
         template <typename TYPE>
-    const char* get_type_name()
+    inline const char* get_type_name()
     {
         static_assert< FALSE >( "Type not implemented!" );
     }
 
-    template <> const char* get_type_name<sint8> () { return "sint8"; }
-    template <> const char* get_type_name<sint16>() { return "sint16"; }
-    template <> const char* get_type_name<sint32>() { return "sint32"; }
-    template <> const char* get_type_name<sint64>() { return "sint64"; }
-
-        template <> const char* get_type_name<uint8> () { return "uint8"; }
-    template <> const char* get_type_name<uint16>() { return "uint16"; }
-    template <> const char* get_type_name<uint32>() { return "uint32"; }
-    template <> const char* get_type_name<uint64>() { return "uint64"; }
-
-        template <> const char* get_type_name<f32> () { return "f32"; }
-        template <> const char* get_type_name<f64> () { return "f64"; }
-
-        template <> const char* get_type_name<bool> () { return "bool"; }
-
-        template <> const char* get_type_name<std::string> () { return "string"; }
+    template <> inline const char* get_type_name<sint8> () { return "sint8"; }
+    template <> inline const char* get_type_name<sint16>() { return "sint16"; }
+    template <> inline const char* get_type_name<sint32>() { return "sint32"; }
+    template <> inline const char* get_type_name<sint64>() { return "sint64"; }
+
+        template <> inline const char* get_type_name<uint8> () { return "uint8"; }
+    template <> inline const char* get_type_name<uint16>() { return "uint16"; }
+    template <> inline const char* get_type_name<uint32>() { return "uint32"; }
+    template <> inline const char* get_type_name<uint64>() { return "uint64"; }
+
+        template <> inline const char* get_type_name<f32> () { return "f32"; }
+        template <> inline const char* get_type_name<f64> () { return "f64"; }
+
+        template <> inline const char* get_type_name<bool> () { return "bool"; }
+
+        template <> inline const char* get_type_name<std::string> () { return "string"; }
 
         template <typename TYPE>

trunk/src/gl/gl_program.cc

@@ -73 +73 @@
 }
 
-gl_program::gl_program( const string& vertex_program, const string& fragment_program, const string& geometry_program /*= ""*/ )
-        : vertex_shader( GL_VERTEX_SHADER ), fragment_shader( GL_FRAGMENT_SHADER ), geometry_shader( GL_GEOMETRY_SHADER )
-{
-        compile( vertex_program, fragment_program, geometry_program );
+gl_program::gl_program( const string& vertex_program, const string& fragment_program )
+        : vertex_shader( GL_VERTEX_SHADER ), fragment_shader( GL_FRAGMENT_SHADER )
+{
+        compile( vertex_program, fragment_program );
 }
 
@@ -86 +86 @@
                 glDetachShader( m_name.get_value(), vertex_shader.get_id() );
                 glDetachShader( m_name.get_value(), fragment_shader.get_id() );
-                if ( geometry_shader.is_valid() )
-                {
-                        glDetachShader( m_name.get_value(), geometry_shader.get_id() );
-                }
-        }
-}
-
-bool gl_program::compile( const string& vertex_program, const string& fragment_program, const string& geometry_program /*= "" */ )
+        }
+}
+
+bool gl_program::compile( const string& vertex_program, const string& fragment_program )
 {
         if (!vertex_shader.compile( vertex_program )) { return false; }
         if (!fragment_shader.compile( fragment_program )) { return false; }
-        if (!geometry_program.empty())
-        {
-                if (!geometry_shader.compile( geometry_program )) { return false; }
-        }
 
         glAttachShader( m_name.get_value(), fragment_shader.get_id() );
         glAttachShader( m_name.get_value(), vertex_shader.get_id() );
-        if (!geometry_program.empty())
-        {
-                glAttachShader( m_name.get_value(), geometry_shader.get_id() );
-        }
         glLinkProgram( m_name.get_value() );
 
@@ -180 +168 @@
                 int uni_loc = glGetUniformLocation( m_name.get_value(), name.c_str() );
                 type utype = gl_enum_to_type( uni_type );
-                m_uniform_map[ name ] = create_uniform( gl_enum_to_type( uni_type ), name, uni_loc, uni_len );
+                m_uniform_map[ name ] = create_uniform( utype, name, uni_loc, uni_len );
         }
 }