From d79bf39a243d17ba1ff77fcf4ea5e2e5cf59b617 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 8 Feb 2013 14:09:44 -0800
Subject: [PATCH] using OpenGL later than 2, remove ARB from calls

---
 interface/src/Cloud.cpp | 8 +++-----
 interface/src/Util.cpp  | 4 +---
 interface/src/main.cpp  | 4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/src/Cloud.cpp b/interface/src/Cloud.cpp
index a8f14b6cf4..ab9a534d4c 100644
--- a/interface/src/Cloud.cpp
+++ b/interface/src/Cloud.cpp
@@ -56,11 +56,9 @@ void Cloud::render() {
     glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize );
     glPointSize( maxSize );
     
-#ifdef __APPLE__
-    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
-    glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
-    glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );
-#endif
+    glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, particle_attenuation_quadratic );
+    glPointParameterf( GL_POINT_SIZE_MAX_ARB, maxSize );
+    glPointParameterf( GL_POINT_SIZE_MIN_ARB, 0.001f );
     
     glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE );
     glEnable( GL_POINT_SPRITE_ARB );
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 9e8c5240f3..e42d63d684 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -95,9 +95,7 @@ void render_vector(glm::vec3 * vec)
     glEnd();
     float particle_attenuation_quadratic[] =  { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
 
-#ifndef __APPLE__
-    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
-#endif
+    glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, particle_attenuation_quadratic );
     
     glEnable(GL_POINT_SMOOTH);
     glPointSize(10.0);
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index a79a0cad7b..b6533c9b7f 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -598,9 +598,7 @@ void display(void)
         Audio::render(WIDTH, HEIGHT);
 
         //drawvec3(100, 100, 0.15, 0, 1.0, 0, myHead.getPos(), 0, 1, 0);
-#ifdef __APPLE__
-        glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic );
-#endif
+        glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, pointer_attenuation_quadratic );
 
 //        myFinger.render();