Jelajahi Sumber

libogsf: Avoid double calling the same function with the same argument. Change the prototypes of gsd_*buffer(), merge from trunk, https://trac.osgeo.org/grass/changeset/61052

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64023 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 tahun lalu
induk
melakukan
d7e6a8d2e0
3 mengubah file dengan 11 tambahan dan 14 penghapusan
  1. 3 3
      include/defs/ogsf.h
  2. 3 6
      lib/ogsf/gs2.c
  3. 5 5
      lib/ogsf/gsd_prim.c

+ 3 - 3
include/defs/ogsf.h

@@ -510,9 +510,9 @@ void gsd_bgnline(void);
 void gsd_endline(void);
 void gsd_shademodel(int);
 int gsd_getshademodel(void);
-void gsd_bothbuffer(void);
-void gsd_frontbuffer(int);
-void gsd_backbuffer(int);
+void gsd_bothbuffers(void);
+void gsd_frontbuffer(void);
+void gsd_backbuffer(void);
 void gsd_swapbuffers(void);
 void gsd_popmatrix(void);
 void gsd_pushmatrix(void);

+ 3 - 6
lib/ogsf/gs2.c

@@ -2466,19 +2466,16 @@ void GS_set_draw(int where)
 
     switch (where) {
     case GSD_BOTH:
-	gsd_frontbuffer(1);
-	gsd_backbuffer(1);
+	gsd_bothbuffers();
 
 	break;
     case GSD_FRONT:
-	gsd_frontbuffer(1);
-	gsd_backbuffer(0);
+	gsd_frontbuffer();
 
 	break;
     case GSD_BACK:
     default:
-	gsd_frontbuffer(0);
-	gsd_backbuffer(1);
+	gsd_backbuffer();
 
 	break;
     }

+ 5 - 5
lib/ogsf/gsd_prim.c

@@ -433,7 +433,7 @@ int gsd_getshademodel(void)
 /*!
    \brief ADD
  */
-void gsd_bothbuffer(void)
+void gsd_bothbuffers(void)
 {
     /* OGLXXX frontbuffer: other possibilities include GL_FRONT_AND_BACK */
     glDrawBuffer(GL_FRONT_AND_BACK);
@@ -447,10 +447,10 @@ void gsd_bothbuffer(void)
 
    \param bool non-zero for enable otherwise disable front buffer
  */
-void gsd_frontbuffer(int bool)
+void gsd_frontbuffer(void)
 {
     /* OGLXXX frontbuffer: other possibilities include GL_FRONT_AND_BACK */
-    glDrawBuffer((bool) ? GL_FRONT : GL_BACK);
+    glDrawBuffer(GL_FRONT);
 
     return;
 }
@@ -461,10 +461,10 @@ void gsd_frontbuffer(int bool)
 
    \param bool non-zero for enable otherwise disable back buffer
  */
-void gsd_backbuffer(int bool)
+void gsd_backbuffer(void)
 {
     /* OGLXXX backbuffer: other possibilities include GL_FRONT_AND_BACK */
-    glDrawBuffer((bool) ? GL_BACK : GL_FRONT);
+    glDrawBuffer(GL_BACK);
     return;
 }