Subversion Repositories Kolibri OS

Rev

Rev 4502 | Rev 4523 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4502 Rev 4517
Line 36... Line 36...
36 
    {
 36 
    {
37 
        printf("failed to make window current");
 37 
        printf("failed to make window current");
38 
        goto err1;
 38 
        goto err1;
39 
    };
 39 
    };
Line -... Line 40...
- 
 
 40 
 
40 
 
 41 
#if 0
41 
    glUseProgram(render->blit_prog);
 42 
    glUseProgram(render->blit_prog);
Line 42... Line 43...
42 
    glUniform1i(render->sampler, 0);
 43 
    glUniform1i(render->sampler, 0);
43 
 
 44 
 
Line -... Line 45...
- 
 
 45 
    glVertexAttribPointer(0, 2, GL_FLOAT,GL_FALSE, 2 * sizeof(float),render->vertices);
- 
 
 46 
    glEnableVertexAttribArray(0);
- 
 
 47 
 
- 
 
 48 
    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->texcoords);
- 
 
 49 
    glEnableVertexAttribArray(1);
44 
    glVertexAttribPointer(0, 2, GL_FLOAT,GL_FALSE, 2 * sizeof(float),render->vertices);
 50 
 
45 
    glEnableVertexAttribArray(0);
 51 
#endif
46 
 
 52 
 
47 
    glActiveTexture(GL_TEXTURE0);
 53 
    glActiveTexture(GL_TEXTURE0);
48 
    glBindTexture(GL_TEXTURE_2D, render->tx_buffers[render->back_buffer]);
 54 
    glBindTexture(GL_TEXTURE_2D, render->tx_buffers[render->back_buffer]);
49 
    glTexParameteri(GL_TEXTURE_2D,
 55 
    glTexParameteri(GL_TEXTURE_2D,
50 
                  GL_TEXTURE_MIN_FILTER,
 56 
                  GL_TEXTURE_MIN_FILTER,
51 
                  GL_NEAREST);
 57 
                  GL_NEAREST);
Line 52... Line -...
52 
    glTexParameteri(GL_TEXTURE_2D,
 - 
 
53 
                  GL_TEXTURE_MAG_FILTER,
 - 
 
54 
                  GL_NEAREST);
 - 
 
55 
 
 58 
    glTexParameteri(GL_TEXTURE_2D,
56 
    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float),render->texcoords);
 59 
                  GL_TEXTURE_MAG_FILTER,
Line 57... Line 60...
57 
    glEnableVertexAttribArray(1);
 60 
                  GL_NEAREST);
58 
 
 61 
 
Line 84... Line 87...
84 
    texcoords[3*2]  = 0.0;
 87 
    texcoords[3*2]  = 0.0;
85 
    texcoords[3*2+1]= 1.0;
 88 
    texcoords[3*2+1]= 1.0;
Line 86... Line 89...
86 
 
 89 
 
Line 87... Line 90...
87 
    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 90 
    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
88 
 
 91 
 
89 
    glDisableVertexAttribArray(0);
 92 
//    glDisableVertexAttribArray(0);
90 
    glDisableVertexAttribArray(1);
 93 
//    glDisableVertexAttribArray(1);
Line 91... Line 94...
91 
    glDisable(GL_TEXTURE_2D);
 94 
//    glDisable(GL_TEXTURE_2D);
92 
    glUseProgram(0);
 95 
//    glUseProgram(0);
Line 93... Line 96...
93 
 
 96