Changeset 493 for trunk

Timestamp:

05/06/16 19:25:05 (9 years ago)

Author:

epyon

Message:

• program validation moved to first use - fixes validation errors on Intel and AMD cards

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/gl/gl_device.hh (modified) (2 diffs)
• src/gl/gl_context.cc (modified) (1 diff)
• src/gl/gl_device.cc (modified) (2 diffs)

trunk/nv/gl/gl_context.hh

@@ -97 +97 @@
                 void enable( unsigned int what, bool value );
                 void set_active_texture( texture_slot slot );
+
+                bool validate_program( program p );
         private:
                 texture_slot m_active_slot;

trunk/nv/gl/gl_device.hh

@@ -33 +33 @@
                 unsigned glidv;
                 unsigned glidf;
+                bool validated;
         };
 
@@ -60 +61 @@
                 virtual bool bind_block( program p, const string_view& name, uint32 index );
                 virtual int get_block_location( program p, const string_view& name, bool fatal = true ) const;
-                virtual void prepare_program( program p );
                 virtual string_view get_shader_header() const { return m_shader_header; }
                 virtual ~gl_device();
         protected:
+                void prepare_program( program p );
                 uniform_base* get_uniform( program p, const string_view& name, bool fatal = true ) const;
 

trunk/src/gl/gl_context.cc

@@ -317 +317 @@
                 glUseProgram( info->glid );
                 gdevice->update_uniforms( info );
-        }
-}
+                if ( !info->validated )
+                {
+                        validate_program( p );
+                }
+        }
+}
+
+bool nv::gl_context::validate_program( program p )
+{
+        gl_device* gdevice = static_cast<gl_device*>( m_device );
+        gl_program_info* info = gdevice->m_programs.get( p );
+        if ( info )
+        {
+                info->validated = true;
+                const uint32 buffer_size = 1024;
+                char buffer[buffer_size] = { 0 };
+                int length;
+                int status;
+                glValidateProgram( info->glid );
+                glGetProgramiv( info->glid, GL_VALIDATE_STATUS, &status );
+
+                if ( status == GL_FALSE )
+                {
+                        glGetProgramInfoLog( info->glid, buffer_size, &length, buffer );
+                        NV_LOG_ERROR( "Program #", info->glid, " validation error : ", buffer );
+                        return false;
+                }
+                return true;
+        }
+        return false;
+}
+
 
 // void nv::gl_context::bind( buffer b )

trunk/src/gl/gl_device.cc

@@ -34 +34 @@
 
         info->glid = glCreateProgram();
+        info->validated = false;
         compile( info, vs_source, fs_source );
         prepare_program( result );
@@ -452 +453 @@
         }
 
-        glValidateProgram( p->glid );
-        glGetProgramiv( p->glid, GL_VALIDATE_STATUS, &status );
-
-        if ( status == GL_FALSE )
-        {
-                glGetProgramInfoLog( p->glid, buffer_size, &length, buffer );
-                NV_LOG_ERROR( "Program #", p->glid, " validation error : ", buffer );
-                //return false;
-        }
         load_attributes( p );
         load_uniforms( p );