git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenGL 3.1 core profile support.
[ipdf/code.git]
/
src
/
screen.h
diff --git
a/src/screen.h
b/src/screen.h
index
ddcf8ca
..
d918dd1
100644
(file)
--- a/
src/screen.h
+++ b/
src/screen.h
@@
-7,6
+7,7
@@
#include "stb_truetype.h"
#include "graphicsbuffer.h"
#include "stb_truetype.h"
#include "graphicsbuffer.h"
+#include "shaderprogram.h"
namespace IPDF
{
namespace IPDF
{
@@
-70,6
+71,9
@@
namespace IPDF
int m_viewport_height;
SDL_Window *m_window;
SDL_GLContext m_gl_context;
int m_viewport_height;
SDL_Window *m_window;
SDL_GLContext m_gl_context;
+ ShaderProgram m_texture_prog;
+ GLint m_colour_uniform_location;
+ GraphicsBuffer m_viewport_ubo;
stbtt_bakedchar m_debug_font_rects[96];
unsigned int m_debug_font_atlas;
float m_debug_font_x;
stbtt_bakedchar m_debug_font_rects[96];
unsigned int m_debug_font_atlas;
float m_debug_font_x;
UCC
git Repository :: git.ucc.asn.au