Extended double buffering fix to Android

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11360 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 4 insertions, 83 deletions

diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
index fd042bef4..f3ea56e23 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
@@ -44,83 +44,6 @@ Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
 }
 
 
-
-
-static GLint vertices[][3] = {
-  { -0x10000, -0x10000, -0x10000 },
-  {  0x10000, -0x10000, -0x10000 },
-  {  0x10000,  0x10000, -0x10000 },
-  { -0x10000,  0x10000, -0x10000 },
-  { -0x10000, -0x10000,  0x10000 },
-  {  0x10000, -0x10000,  0x10000 },
-  {  0x10000,  0x10000,  0x10000 },
-  { -0x10000,  0x10000,  0x10000 }
-};
-
-static GLint colors[][4] = {
-  { 0x00000, 0x00000, 0x00000, 0x10000 },
-  { 0x10000, 0x00000, 0x00000, 0x10000 },
-  { 0x10000, 0x10000, 0x00000, 0x10000 },
-  { 0x00000, 0x10000, 0x00000, 0x10000 },
-  { 0x00000, 0x00000, 0x10000, 0x10000 },
-  { 0x10000, 0x00000, 0x10000, 0x10000 },
-  { 0x10000, 0x10000, 0x10000, 0x10000 },
-  { 0x00000, 0x10000, 0x10000, 0x10000 }
-};
-
-GLubyte indices[] = {
-  0, 4, 5,    0, 5, 1,
-  1, 5, 6,    1, 6, 2,
-  2, 6, 7,    2, 7, 3,
-  3, 7, 4,    3, 4, 0,
-  4, 7, 6,    4, 6, 5,
-  3, 0, 1,    3, 1, 2
-};
-
-static void drawSomething()
-{
-  /*
-  static float _angle = 0.0f;
-
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glTranslatef(0, 0, -3.0f);
-  glRotatef(_angle, 0, 1, 0);
-  glRotatef(_angle*0.25f, 1, 0, 0);
-
-  glEnableClientState(GL_VERTEX_ARRAY);
-  glEnableClientState(GL_COLOR_ARRAY);
-
-  glFrontFace(GL_CW);
-  glVertexPointer(3, GL_FIXED, 0, vertices);
-  glColorPointer(4, GL_FIXED, 0, colors);
-  glDrawElements(GL_TRIANGLES, 36, GL_UNSIGNED_BYTE, indices);
-
-  _angle += 1.2f;
-   */
-
-  GLfloat q3[] = {
-    -10,-10,
-    10,-10,
-    10,10,
-    -10,10
-  };
-
-  uchar r, g, b;
-  Fl::get_color(FL_RED, r, g, b);
-//  Fl::get_color(Fl_Graphics_Driver::color(), r, g, b);
-  glColor4ub(r, g, b, 255);
-
-  glEnableClientState(GL_VERTEX_ARRAY);
-  glVertexPointer(2, GL_FLOAT, 0, q3);
-  glDrawArrays(GL_TRIANGLE_FAN,0,4);
-  glDisableClientState(GL_VERTEX_ARRAY);
-}
-
-
-
 void Fl_PicoAndroid_Graphics_Driver::rectf(int x, int y, int w, int h)
 {
   GLfloat q3[] = {
@@ -136,10 +59,8 @@ void Fl_PicoAndroid_Graphics_Driver::rectf(int x, int y, int w, int h)
 
   glEnableClientState(GL_VERTEX_ARRAY);
   glVertexPointer(2, GL_FLOAT, 0, q3);
-  glDrawArrays(GL_TRIANGLE_FAN,0,4);
+  glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
   glDisableClientState(GL_VERTEX_ARRAY);
-
-  LOGI("Rect: %d %d %d %d", x, y, w, h);
 }
 
 
@@ -156,7 +77,7 @@ void Fl_PicoAndroid_Graphics_Driver::line(int x, int y, int x1, int y1)
 
   glEnableClientState(GL_VERTEX_ARRAY);
   glVertexPointer(2, GL_FLOAT, 0, q3);
-  glDrawArrays(GL_LINES,0,2);
+  glDrawArrays(GL_LINES, 0, 2);
   glDisableClientState(GL_VERTEX_ARRAY);
 }
 
@@ -172,8 +93,8 @@ void Fl_PicoAndroid_Graphics_Driver::point(int x, int y)
   glColor4ub(r, g, b, 255);
 
   glEnableClientState(GL_VERTEX_ARRAY);
-  glVertexPointer(2, GL_POINTS, 0, q3);
-  glDrawArrays(GL_LINES,0,1);
+  glVertexPointer(2, GL_FLOAT, 0, q3);
+  glDrawArrays(GL_POINTS, 0, 1);
   glDisableClientState(GL_VERTEX_ARRAY);
 }