← Back to branch summary

~brandontschaefer/nux/xim-tests

« back to all changes in this revision

Viewing changes to NuxGraphics/GLShaderParameter.h

  • Committer: Brandon Schaefer
  • Date: 2012-10-19 00:23:27 UTC
  • mfrom: (637.2.55 trunk)
  • Revision ID: brandon.schaefer@canonical.com-20121019002327-60e88jn3k8chi7gt
* Merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxGraphics/GLShaderParameter.h
50
50
  {
51
51
  public:
52
52
    int                      m_Index;                  // Register m_Index / Attribute m_Index
53
 
    eShaderParameterType        m_ShaderParameterType;
54
 
    NString                     m_Name;
 
53
    eShaderParameterType       m_ShaderParameterType;
 
54
    std::string                m_Name;
55
55
    bool                       m_bIsOptional;
56
56
    bool                       m_bIsStatic;
57
57
    bool                       bStaticSet;
136
136
    }
137
137
 
138
138
 
139
 
    inline void SetTexture( const GLuint textureId )
 
139
    inline void SetTexture( const GLuint /* textureId */)
140
140
    {
141
141
      //CHECKGL(glUniform1iARB( m_Index, textureId ));
142
142
      //CHECKGL(cgGLEnableTextureParameter( CgParameter ));