Subversion Repositories gelsvn

Rev

Rev 582 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 582 Rev 586
Line 117... Line 117...
117 
            GL_ALPHA, GL_UNSIGNED_BYTE, data);
 117 
            GL_ALPHA, GL_UNSIGNED_BYTE, data);
118 
        stbi_image_free(data);
 118 
        stbi_image_free(data);
119 
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 119 
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
120 
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 120 
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
121 
        glBindTexture(GL_TEXTURE_2D, 0);
 121 
        glBindTexture(GL_TEXTURE_2D, 0);
122 
        assert(glGetError() == GL_NO_ERROR);
 - 
 
123 
    }
 122 
    }
124 
 
 123 
 
125 
    //setup matrices
124 
    //setup matrices
126 
    int vp[4];
 125 
    int vp[4];
127 
    glGetIntegerv(GL_VIEWPORT, vp);
 126 
    glGetIntegerv(GL_VIEWPORT, vp);