splitting the GLBackend.cpp in several files and fixing the build for mac

libraries/gpu/src/gpu/Format.h

@@ -140,21 +140,20 @@ public:
 
     uint16 getRaw() const { return *((uint16*) (this)); }
 
+    
+    bool operator ==(const Element& right) const {
+        return getRaw() == right.getRaw();
+    }
+    bool operator !=(const Element& right) const {
+        return getRaw() != right.getRaw();
+    }
+
  protected:
     uint8 _semantic;
     uint8 _dimension : 4;
     uint8 _type : 4;
 };
 
- 
-static bool operator ==(const Element& left, const Element& right) {
-    return left.getRaw() == right.getRaw();
-} 
-static bool operator !=(const Element& left, const Element& right) {
-    return left.getRaw() != right.getRaw();
-}
-
-
 };
 
 

libraries/gpu/src/gpu/GLBackend.cpp

@@ -8,13 +8,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-#include "GLBackend.h"
-
-#include <QDebug>
-
-#include "Batch.h"
-
-using namespace gpu;
+#include "GLBackendShared.h"
 
 GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] = 
 {
@@ -85,35 +79,6 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
     (&::gpu::GLBackend::do_glColor4f),
 };
 
-static const GLenum _primitiveToGLmode[NUM_PRIMITIVES] = {
-    GL_POINTS,
-    GL_LINES,
-    GL_LINE_STRIP,
-    GL_TRIANGLES,
-    GL_TRIANGLE_STRIP,
-    GL_QUADS,
-};
-
-static const GLenum _elementTypeToGLType[NUM_TYPES]= {
-    GL_FLOAT,
-    GL_INT,
-    GL_UNSIGNED_INT,
-    GL_HALF_FLOAT,
-    GL_SHORT,
-    GL_UNSIGNED_SHORT,
-    GL_BYTE,
-    GL_UNSIGNED_BYTE,
-    GL_FLOAT,
-    GL_INT,
-    GL_UNSIGNED_INT,
-    GL_HALF_FLOAT,
-    GL_SHORT,
-    GL_UNSIGNED_SHORT,
-    GL_BYTE,
-    GL_UNSIGNED_BYTE
-};
-
-
 GLBackend::GLBackend() :
     _input(),
     _transform()
@@ -172,9 +137,6 @@ void GLBackend::checkGLError() {
     }
 }
 
-#define CHECK_GL_ERROR() ::gpu::GLBackend::checkGLError()
-//#define CHECK_GL_ERROR()
-
 void GLBackend::do_draw(Batch& batch, uint32 paramOffset) {
     updateInput();
     updateTransform();
@@ -509,13 +471,11 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) {
 void GLBackend::do_setUniformTexture(Batch& batch, uint32 paramOffset) {
     GLuint slot = batch._params[paramOffset + 1]._uint;
     TexturePointer uniformTexture = batch._textures.get(batch._params[paramOffset + 0]._uint);
-#if defined(Q_OS_MAC)
-#elif defined(Q_OS_WIN)
+
     GLuint to = getTextureID(*uniformTexture);
     glActiveTexture(GL_TEXTURE0 + slot);
     glBindTexture(GL_TEXTURE_2D, to);
-#else
-#endif
+
     CHECK_GL_ERROR();
 }
 

libraries/gpu/src/gpu/GLBackendShared.h

@@ -0,0 +1,53 @@
+//
+//  GLBackendShared.h
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 1/22/2014.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_gpu_GLBackend_Shared_h
+#define hifi_gpu_GLBackend_Shared_h
+
+#include "GLBackend.h"
+
+#include <QDebug>
+
+#include "Batch.h"
+
+using namespace gpu;
+
+static const GLenum _primitiveToGLmode[NUM_PRIMITIVES] = {
+    GL_POINTS,
+    GL_LINES,
+    GL_LINE_STRIP,
+    GL_TRIANGLES,
+    GL_TRIANGLE_STRIP,
+    GL_QUADS,
+};
+
+static const GLenum _elementTypeToGLType[NUM_TYPES]= {
+    GL_FLOAT,
+    GL_INT,
+    GL_UNSIGNED_INT,
+    GL_HALF_FLOAT,
+    GL_SHORT,
+    GL_UNSIGNED_SHORT,
+    GL_BYTE,
+    GL_UNSIGNED_BYTE,
+    GL_FLOAT,
+    GL_INT,
+    GL_UNSIGNED_INT,
+    GL_HALF_FLOAT,
+    GL_SHORT,
+    GL_UNSIGNED_SHORT,
+    GL_BYTE,
+    GL_UNSIGNED_BYTE
+};
+
+#define CHECK_GL_ERROR() ::gpu::GLBackend::checkGLError()
+//#define CHECK_GL_ERROR()
+
+#endif

libraries/gpu/src/gpu/GLBackendTexture.cpp

@@ -8,7 +8,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-#include "GLBackend.cpp"
+#include "GLBackendShared.h"
+
 
 GLBackend::GLTexture::GLTexture() :
     _storageStamp(0),

libraries/gpu/src/gpu/Texture.cpp

@@ -10,7 +10,7 @@
 //
 
 #include "Texture.h"
-
+#include <math.h>
 #include <QDebug>
 
 using namespace gpu;

libraries/gpu/src/gpu/Texture.h

@@ -187,8 +187,8 @@ protected:
     uint16 _height;
     uint16 _depth;
 
-    uint16 _numSlices;
     uint16 _numSamples;
+    uint16 _numSlices;
 
     uint16 _maxMip;