Changeset 492 for trunk/src/gl/gl_device.cc

Timestamp:

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

Author:

epyon

Message:

 

File:

• trunk/src/gl/gl_device.cc (modified) (6 diffs)

trunk/src/gl/gl_device.cc

@@ -98 +98 @@
         unsigned glid = 0;
         unsigned gl_type = texture_type_to_enum( type );
-        GLint gl_internal = GLint( nv::image_format_to_internal_enum( aformat.format ) );
+        GLenum gl_internal = GLenum( nv::image_format_to_internal_enum( aformat.format ) );
         unsigned gl_enum = nv::image_format_to_enum( aformat.format );
 
@@ -119 +119 @@
         }
 
-        glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_min ) ) );
-        glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_max ) ) );
+        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE )
+        {
+                glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_min ) ) );
+                glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_max ) ) );
+        }
         
-        if ( gl_enum != GL_RED_INTEGER )
+        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE && gl_enum != GL_RED_INTEGER )
         {
                 glTexParameteri( gl_type, GL_TEXTURE_WRAP_S, GLint( nv::sampler_wrap_to_enum( asampler.wrap_s ) ) );
@@ -130 +133 @@
         if ( is_depth )
         {
-                glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-                glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+//              glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+//              glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
 
                 // This is to allow usage of shadow2DProj function in the shader
@@ -146 +149 @@
 //      glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso );
 
-        glTexImage2D( gl_type, 0, gl_internal, size.x, size.y, 0, gl_enum, nv::datatype_to_gl_enum(aformat.type), data );
+        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE )
+                glTexImage2D( gl_type, 0, gl_internal, size.x, size.y, 0, gl_enum, nv::datatype_to_gl_enum(aformat.type), data );
+        else
+                glTexImage2DMultisample( gl_type, 4, gl_internal, size.x, size.y, 1 );
 
         glBindTexture( gl_type, 0 );
@@ -163 +169 @@
 nv::texture nv::gl_device::create_texture( texture_type type, pixel_format format )
 {
-        NV_ASSERT_ALWAYS( type == TEXTURE_1D_BUFFER );
+        NV_ASSERT_ALWAYS( type == TEXTURE_1D_BUFFER, "create_texture not texture buffer!" );
         unsigned glid = 0;
-        unsigned gl_type = texture_type_to_enum( type );
 
         glGenTextures( 1, &glid );
@@ -552 +557 @@
                 NV_ASSERT( u, "Unknown uniform type!" );
                 (*p->m_uniform_map)[ name ] = u;
+                //NV_LOG_DEBUG( "Uniform : ", name, " - ", utype, "/", uni_len );
+
         }