X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=widgets.cpp;h=fb49993b23349743e049c7fa4bcebb2c3acefded;hp=53b0eacbc5811d3b72fcbcfefe4dc53e039d2115;hb=3d1f6c11c53cd9d3d5c1fb60f4accf050b7f135e;hpb=994ac0c108d8e0f1d1effcad5ba8b4c2d1dd9d28

diff --git a/widgets.cpp b/widgets.cpp
index 53b0eac..fb49993 100644
--- a/widgets.cpp
+++ b/widgets.cpp
@@ -1,24 +1,22 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "widgets.h"
 #include "util.h"
-#include "texture_enum.h"
+#include "opengl.h"
 
 #define HSV_WHEEL_SIZE 128
 
+GLuint hsv_wheel_num;
+
 void draw_hsv_wheel(float y, float rad, float theta, float value)
 {
-	glUseProgramObjectARB(0);
+	glUseProgram(0);
 	check_error();
 	glActiveTexture(GL_TEXTURE0);
 	check_error();
 	glEnable(GL_TEXTURE_2D);
 	check_error();
-	glBindTexture(GL_TEXTURE_2D, HSV_WHEEL);
+	glBindTexture(GL_TEXTURE_2D, hsv_wheel_num);
 	check_error();
 	glActiveTexture(GL_TEXTURE1);
 	check_error();
@@ -81,7 +79,7 @@ void draw_hsv_wheel(float y, float rad, float theta, float value)
 
 void draw_saturation_bar(float y, float saturation)
 {
-	glUseProgramObjectARB(0);
+	glUseProgram(0);
 	check_error();
 
 	// value slider
@@ -110,6 +108,8 @@ void draw_saturation_bar(float y, float saturation)
 
 void make_hsv_wheel_texture()
 {
+	glGenTextures(1, &hsv_wheel_num);
+
 	static unsigned char hsv_pix[HSV_WHEEL_SIZE * HSV_WHEEL_SIZE * 4];
 	for (int y = 0; y < HSV_WHEEL_SIZE; ++y) {
 		for (int x = 0; x < HSV_WHEEL_SIZE; ++x) {
@@ -133,7 +133,7 @@ void make_hsv_wheel_texture()
 		printf("\n");
 	}
 
-	glBindTexture(GL_TEXTURE_2D, HSV_WHEEL);
+	glBindTexture(GL_TEXTURE_2D, hsv_wheel_num);
 	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	check_error();