Changeset 161 for trunk/src/gl

Timestamp:

07/15/13 02:48:06 (12 years ago)

Author:

epyon

Message:

• unified naming of attributes in nv
• predefined attribute bindings based on unified names
• unified naming of attributes in all tests

Location:

trunk/src/gl

Files:

• gl_device.cc (modified) (1 diff)
• gl_program.cc (modified) (1 diff)

trunk/src/gl/gl_device.cc

@@ -44 +44 @@
         SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
         SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
-        SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
+        SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 24 );
         SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
+        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+
 }
 

trunk/src/gl/gl_program.cc

@@ -105 +105 @@
         if (!vertex_shader.compile( vertex_program )) { return false; }
         if (!fragment_shader.compile( fragment_program )) { return false; }
+
+        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::POSITION ), "nv_position" );
+        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::TEXCOORD ), "nv_texcoord" );
+        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::NORMAL   ), "nv_normal"   );
+        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::COLOR    ), "nv_color"    );
+        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::TANGENT  ), "nv_tangent"  );
 
         glAttachShader( m_name.get_value(), fragment_shader.get_id() );