diff options
author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-06-06 13:24:03 +0000 |
---|---|---|
committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-06-06 13:24:03 +0000 |
commit | 7274b3f1f8ca746fbf3f5224df2b7fae3710d525 (patch) | |
tree | 21503e760d237080fda59ac2f21dead18ad1fe0f /src/displaywindow.h | |
parent | 0772a4fa2344d228f78541e320627c487a5ee4d3 (diff) |
Use GLEW
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@283 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/displaywindow.h')
-rw-r--r-- | src/displaywindow.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/displaywindow.h b/src/displaywindow.h index baab13d..d0173f4 100644 --- a/src/displaywindow.h +++ b/src/displaywindow.h @@ -17,7 +17,7 @@ #define DISPLAYWINDOW_H #include <gtk/gtk.h> -#include <GL/gl.h> +#include <glew.h> #include "control.h" @@ -46,6 +46,7 @@ typedef struct dw_struct { /* Low-level OpenGL stuff */ GLuint gl_list_id; /* Display list for "everything else" */ int gl_use_buffers; /* 0=use vertex arrays only, otherwise use VBOs */ + int gl_use_shaders; /* 1 = use shaders */ GLuint gl_ref_vertex_buffer; /* "Measured reflection" stuff */ GLfloat *gl_ref_vertex_array; GLuint gl_ref_normal_buffer; @@ -64,9 +65,9 @@ typedef struct dw_struct { GLuint gl_line_vertex_buffer; /* Indexing line stuff */ GLfloat *gl_line_vertex_array; GLsizei gl_line_num_vertices; - GLhandleARB gl_vshader_lightpp; - GLhandleARB gl_fshader_lightpp; - GLhandleARB gl_program_lightpp; + GLuint gl_vshader_lightpp; + GLuint gl_fshader_lightpp; + GLuint gl_program_lightpp; /* Display parameters */ DisplayWindowView view; |