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

Commit 39e0df03 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 77bd91f8: Merge change Ie3e80456 into eclair 

Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2

* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
  Turns out the SGX driver is correct and the bug was in this test.
parents 53c0d4aa 964d9430

opengl/tests/linetex/linetex.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ int main(int argc, char** argv) 
     

     

     glBindTexture(GL_TEXTURE_2D, 0);

     glBindTexture(GL_TEXTURE_2D, 0);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

     glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

     glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);

     glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
@@ -77,7 +77,9 @@ int main(int argc, char** argv) 
     glEnable(GL_TEXTURE_2D);

     glEnable(GL_TEXTURE_2D);

     glColor4f(1,1,1,1);

     glColor4f(1,1,1,1);





     const uint16_t t16[64] = { 0xFFFF, 0xF800, 0x07E0, 0x001F };



     // default pack-alignment is 4

     const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 };





     const GLfloat vertices[4][2] = {

     const GLfloat vertices[4][2] = {

             { w/2,  0 },

             { w/2,  0 },