Changeset 535 for trunk/src/engine

Timestamp:

01/12/17 19:15:29 (8 years ago)

Author:

epyon

Message:

• unified pixel_format instead of image_format

Location:

trunk/src/engine

Files:

• material_manager.cc (modified) (1 diff)
• shadow.cc (modified) (2 diffs)

trunk/src/engine/material_manager.cc

@@ -19 +19 @@
         uint8 data[2 * 2 * 4];
         nv::raw_fill_n( data, 2 * 2 * 4, 0 );
-        m_default = m_context->create_texture( ivec2(2,2), nv::image_format( nv::RGBA ), nv::sampler(), data );
+        m_default = m_context->create_texture( ivec2(2,2), nv::RGBA8, nv::sampler(), data );
 }
 

trunk/src/engine/shadow.cc

@@ -12 +12 @@
 {
         m_map_size = map_size;
-        m_maps = context->create_texture( TEXTURE_2D_ARRAY, ivec3( map_size, map_size, count ), image_format( DEPTH24, UINT ), sampler( sampler::LINEAR, sampler::CLAMP_TO_EDGE ), nullptr );
+        m_maps = context->create_texture( TEXTURE_2D_ARRAY, ivec3( map_size, map_size, count ), DEPTH24, sampler( sampler::LINEAR, sampler::CLAMP_TO_EDGE ), nullptr );
         m_passes.resize( count );
         for ( uint32 i = 0; i < count; ++i )
@@ -32 +32 @@
 void nv::shadow_data::initialize( context* context, uint32 count, uint32 map_size, const render_pass& pass_base, const render_pass& color_base )
 {
-        m_color_maps = context->create_texture( TEXTURE_2D_ARRAY, ivec3( map_size, map_size, count ), image_format( RGBA16F, FLOAT ), sampler( sampler::LINEAR, sampler::CLAMP_TO_EDGE ), nullptr );
+        m_color_maps = context->create_texture( TEXTURE_2D_ARRAY, ivec3( map_size, map_size, count ), RGBA16F, sampler( sampler::LINEAR, sampler::CLAMP_TO_EDGE ), nullptr );
 
         initialize( context, count, map_size, pass_base );