Changeset 534 for trunk/nv/gl/gl_context.hh

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/nv/gl/gl_context.hh (modified) (3 diffs)

trunk/nv/gl/gl_context.hh

@@ -1 @@
-// Copyright (C) 2012-2015 ChaosForge Ltd
+// Copyright (C) 2012-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -49 +49 @@
                 virtual texture create_texture( texture_type type, ivec3 size, image_format aformat, sampler asampler, const void* data = nullptr );
 
-                virtual buffer create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source = nullptr );
-                virtual void create_buffer( buffer, size_t, const void* = nullptr );
+                virtual buffer create_buffer( buffer_type type, buffer_hint hint, uint32 size, const void* source = nullptr );
+                virtual void create_buffer( buffer, uint32, const void* = nullptr );
 
                 virtual void set_draw_buffers( uint32 count, const output_slot* slots );
@@ -66 +66 @@
                 virtual void bind( framebuffer f, framebuffer_slot ft = FRAMEBUFFER );
                 virtual void bind( texture t, texture_slot slot );
-                virtual void bind( buffer b, uint32 index, size_t offset = 0, size_t size = 0 );
+                virtual void bind( buffer b, uint32 index, uint32 offset = 0, uint32 size = 0 );
                 virtual void bind( buffer b, texture t );
 
 
                 virtual void update( texture t, const void* data );
-                virtual void update( buffer b, const void* data, size_t offset, size_t size );
-                virtual void* map_buffer( buffer, buffer_access, size_t /*offset*/, size_t /*length*/ );
+                virtual void update( buffer b, const void* data, uint32 offset, uint32 size );
+                virtual void* map_buffer( buffer, buffer_access, uint32 /*offset*/, uint32 /*length*/ );
                 virtual void unmap_buffer( buffer );
 
-                //              virtual void update( buffer b, uint32 index, const void* data, size_t offset, size_t size );
+                //              virtual void update( buffer b, uint32 index, const void* data, uint32 offset, uint32 size );
 
                 virtual void clear( const clear_state& cs );
                 // temporary
-                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count, size_t first = 0 );
-                virtual void draw_instanced( primitive prim, const render_state& rs, program p, size_t instances, vertex_array va, size_t count, size_t first = 0 );
+                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, uint32 count, uint32 first = 0 );
+                virtual void draw_instanced( primitive prim, const render_state& rs, program p, uint32 instances, vertex_array va, uint32 count, uint32 first = 0 );
 
                 virtual const ivec4& get_viewport();