Changeset 492 for trunk/nv/interface/device.hh

Timestamp:

05/05/16 19:37:28 (9 years ago)

Author:

epyon

Message:

 

File:

• trunk/nv/interface/device.hh (modified) (5 diffs)

trunk/nv/interface/device.hh

@@ -52 +52 @@
                 TEXTURE_2D_ARRAY,
                 TEXTURE_1D_BUFFER,
+                TEXTURE_2D_MULTISAMPLE,
         };
 
@@ -79 +80 @@
                 TEXTURE_14    = 14,
                 TEXTURE_15    = 15,
+                MAX_TEXTURES  = 16,
         };
 
@@ -233 +235 @@
 
                 template < typename T >
-                void set_uniform_array( program p, const string_view& name, const T* value, uint32 count, bool fatal = true )
+                bool set_uniform_array( program p, const string_view& name, const T* value, uint32 count, bool fatal = true )
                 {
                         uniform_base* base = get_uniform( p, name, fatal );
@@ -243 +245 @@
                                         NV_ASSERT( static_cast<int>( count ) <= base->get_length(), "LENGTH CHECK FAIL" );
                                         static_cast< uniform<T>* >( base )->set_value( value, count );
+                                        return true;
                                 }
                         }
-                }
-
-                template < typename T >
-                void set_opt_uniform_array( program p, const string_view& name, const T* value, uint32 count )
-                {
-                        set_uniform_array( p, name, value, count, false );
-                }
-
-                template < typename T >
-                void set_opt_uniform_array( program p, const string_view& name, const array_view<T>& value )
-                {
-                        set_uniform_array( p, name, value.data(), value.size(), false );
-                }
-
-
-                template < typename T >
-                void set_uniform( program p, const string_view& name, const T& value, bool fatal = true )
+                        return false;
+                }
+
+                template < typename T >
+                bool set_opt_uniform_array( program p, const string_view& name, const T* value, uint32 count )
+                {
+                        return set_uniform_array( p, name, value, count, false );
+                }
+
+                template < typename T >
+                bool set_opt_uniform_array( program p, const string_view& name, const array_view<T>& value )
+                {
+                        return set_uniform_array( p, name, value.data(), value.size(), false );
+                }
+
+
+                template < typename T >
+                bool set_uniform( program p, const string_view& name, const T& value, bool fatal = true )
                 {
                         uniform_base* base = get_uniform( p, name, fatal );
@@ -269 +273 @@
                                 {
                                         static_cast< uniform<T>* >( base )->set_value( value );
+                                        return true;
                                 }
                         }
-                }
-
-                template < typename T >
-                void set_opt_uniform( program p, const string_view& name, const T& value )
-                {
-                        set_uniform( p, name, value, false );
+                        return false;
+                }
+
+                template < typename T >
+                bool set_opt_uniform( program p, const string_view& name, const T& value )
+                {
+                        return set_uniform( p, name, value, false );
                 }