X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=util.cpp;h=08298c7701b9146fcbd76b9330170b458a80f28b;hb=cfe0bc4fa1e2a56eeb12c33e596f79c1292292c8;hp=2176786978544994fcb733a4a2bea5f6fb9f77f5;hpb=758f632c42befae7f2b7af137554429fa544d4cb;p=movit

diff --git a/util.cpp b/util.cpp
index 2176786..08298c7 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,13 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <assert.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include <math.h>
 #include "util.h"
+#include "opengl.h"
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -65,11 +61,11 @@ std::string read_file(const std::string &filename)
 	return std::string(buf, len);
 }
 
-GLhandleARB compile_shader(const std::string &shader_src, GLenum type)
+GLuint compile_shader(const std::string &shader_src, GLenum type)
 {
-	GLhandleARB obj = glCreateShaderObjectARB(type);
+	GLuint obj = glCreateShader(type);
 	const GLchar* source[] = { shader_src.data() };
-	const GLint length[] = { shader_src.size() };
+	const GLint length[] = { (GLint)shader_src.size() };
 	glShaderSource(obj, 1, source, length);
 	glCompileShader(obj);
 
@@ -103,6 +99,13 @@ void multiply_3x3_matrices(const Matrix3x3 a, const Matrix3x3 b, Matrix3x3 resul
         result[8] = a[2] * b[6] + a[5] * b[7] + a[8] * b[8];
 }
 
+void multiply_3x3_matrix_float3(const Matrix3x3 M, float x0, float x1, float x2, float *y0, float *y1, float *y2)
+{
+	*y0 = M[0] * x0 + M[3] * x1 + M[6] * x2;
+	*y1 = M[1] * x0 + M[4] * x1 + M[7] * x2;
+	*y2 = M[2] * x0 + M[5] * x1 + M[8] * x2;
+}
+
 void invert_3x3_matrix(const Matrix3x3 m, Matrix3x3 result)
 {
 	double inv_det = 1.0 / (