Changeset 466 for trunk/src

Timestamp:

09/04/15 17:46:48 (10 years ago)

Author:

epyon

Message:

• support for separate runtime CRT build
• wx fix for new gl headers

Location:

trunk/src

Files:

• gl/gl_context.cc (modified) (1 diff)
• gl/gl_device.cc (modified) (4 diffs)
• gl/gl_window.cc (modified) (1 diff)
• lib/gl.cc (modified) (2 diffs)

trunk/src/gl/gl_context.cc

@@ -177 +177 @@
                 case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete attachment!" ); break;
                 case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT : NV_LOG_ERROR( "gl_context::check : Framebuffer missing attachment!" ); break;
-                case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete dimensions!" ); break;
-                case GL_FRAMEBUFFER_INCOMPLETE_FORMATS            : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete formats!" ); break;
+//              case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete dimensions!" ); break;
+//              case GL_FRAMEBUFFER_INCOMPLETE_FORMATS            : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete formats!" ); break;
                 case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete draw buffer!" ); break;
                 case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER        : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete read buffer!" ); break;

trunk/src/gl/gl_device.cc

@@ -17 +17 @@
 gl_device::gl_device()
 {
-        m_shader_header.append( "#version 120\n#extension GL_EXT_texture_array : require\n" );
+        m_shader_header.append( "#version 330\n" );
         for ( auto& i : get_uniform_factory() ) 
                 m_shader_header.append( "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ i.first +";\n" );
@@ -124 +124 @@
         if ( is_depth )
         {
-#define GL_TEXTURE_DEPTH_SIZE 0x884A
-#define GL_DEPTH_TEXTURE_MODE 0x884B
-#define GL_TEXTURE_COMPARE_MODE 0x884C
-#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#define GL_COMPARE_R_TO_TEXTURE 0x884E
-
-#define GL_INTENSITY 0x8049
-#define GL_LUMINANCE 0x1909
-//              glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE );
-//              glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL );
-//              glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE );
-//              glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, 0 );
-//              glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY );
+                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
+                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE );
+                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL );
         }
 
@@ -182 +175 @@
         glTexParameteri( gl_type, GL_TEXTURE_WRAP_T, GLint( nv::sampler_wrap_to_enum( asampler.wrap_t ) ) );
 
+        if ( is_depth )
+        {
+                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
+                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE );
+                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL );
+        }
+
         //glTexStorage3D( GL_TEXTURE_2D_ARRAY, mipLevelCount, GL_RGBA8, width, height, layerCount );
         glTexImage3D( gl_type, 0, GLint( nv::image_format_to_internal_enum( aformat.format ) ), size.x, size.y, size.z, 0, nv::image_format_to_enum( aformat.format ), nv::datatype_to_gl_enum( aformat.type ), data );
@@ -366 +369 @@
         if ( length > 0 )
         {
-                NV_LOG_INFO( "Program #", p->glid, " log: ", buffer );
+                NV_LOG_INFO( "Program #", p->glid, " log: ", string_view( buffer, size_t( length ) ) );
         }
 

trunk/src/gl/gl_window.cc

@@ -75 +75 @@
         int attribs[] =
         {
-                WGL_CONTEXT_MAJOR_VERSION_ARB,   2,
+                WGL_CONTEXT_MAJOR_VERSION_ARB,   3,
                 WGL_CONTEXT_MINOR_VERSION_ARB,   1,
                 WGL_CONTEXT_PROFILE_MASK_ARB,  WGL_CONTEXT_CORE_PROFILE_BIT_ARB, 

trunk/src/lib/gl.cc

@@ -26 +26 @@
 #define NV_GL_FUN_REN( rtype, fname, rname, fparams ) rtype (NV_GL_APIENTRY *rname) fparams = nullptr;
 #define NV_GL_FUN_EXT NV_GL_FUN
-#include <nv/lib/detail/gl_functions.inc>
+#include <nv/lib/detail/gl_core/gl_functions_3_1.inc>
 #if NV_PLATFORM == NV_WINDOWS
 #include <nv/lib/detail/wgl_functions.inc>
 #endif
-#include <nv/lib/detail/gl_ext/gl_ext_all_functions.inc>
 #undef NV_GL_FUN_REN
 #undef NV_GL_FUN_EXT
@@ -107 +106 @@
 #       define NV_GL_FUN( rtype, fname, fparams ) NV_GL_LOAD( fname )
 #       define NV_GL_FUN_EXT( rtype, fname, fparams ) NV_GL_LOAD_EXT( fname )
-#       include <nv/lib/detail/gl_functions.inc>
+#       include <nv/lib/detail/gl_core/gl_functions_3_1.inc>
 #       undef NV_GL_FUN_EXT
 #       undef NV_GL_FUN