Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7fe92b8 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20887 

* changes:
  option to use drawtexture at compile time
parents 50558faf 0d63f816

opengl/tests/filter/filter.cpp

+12 −8
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ 




using namespace android;

using namespace android;





#define USE_DRAW_TEXTURE 1



int main(int argc, char** argv)

int main(int argc, char** argv)

{

{

    if (argc!=2 && argc!=3) {

    if (argc!=2 && argc!=3) {
@@ -66,7 +68,7 @@ int main(int argc, char** argv) 
     glViewport(0, 0, w, h);

     glViewport(0, 0, w, h);

     glMatrixMode(GL_PROJECTION);

     glMatrixMode(GL_PROJECTION);

     glLoadIdentity();

     glLoadIdentity();

     glOrthof(0, w, h, 0, 0, 1);

     glOrthof(0, w, 0, h, 0, 1);





     glClearColor(0,0,0,0);

     glClearColor(0,0,0,0);

     glClear(GL_COLOR_BUFFER_BIT);

     glClear(GL_COLOR_BUFFER_BIT);
@@ -159,16 +161,19 @@ int main(int argc, char** argv) 
     //glScissor(0,dim,dim,h-dim);

     //glScissor(0,dim,dim,h-dim);

     

     

     for (int y=0 ; y<dim ; y++) {

     for (int y=0 ; y<dim ; y++) {

         glLoadIdentity();

         glTranslatef(0, -y, 0);



         glClear(GL_COLOR_BUFFER_BIT);

         glClear(GL_COLOR_BUFFER_BIT);



#if USE_DRAW_TEXTURE && GL_OES_draw_texture

         glDrawTexiOES(0, y, 1, dim, dim);

#else

         glLoadIdentity();

         glTranslatef(0, y, 0);

         glEnableClientState(GL_VERTEX_ARRAY);

         glEnableClientState(GL_VERTEX_ARRAY);

         glEnableClientState(GL_TEXTURE_COORD_ARRAY);

         glEnableClientState(GL_TEXTURE_COORD_ARRAY);

         glVertexPointer(2, GL_FLOAT, 0, vertices);

         glVertexPointer(2, GL_FLOAT, 0, vertices);

         glTexCoordPointer(2, GL_FLOAT, 0, texCoords);

         glTexCoordPointer(2, GL_FLOAT, 0, texCoords);

         glDrawArrays(GL_TRIANGLE_FAN, 0, 4);

         glDrawArrays(GL_TRIANGLE_FAN, 0, 4);



#endif





         if (!usePbuffer) {

         if (!usePbuffer) {

             eglSwapBuffers(dpy, surface);

             eglSwapBuffers(dpy, surface);
@@ -177,7 +182,6 @@ int main(int argc, char** argv) 
         }

         }

     }

     }







     eglTerminate(dpy);

     eglTerminate(dpy);

     return 0;

     return 0;

}
 
}