Fix RenderPixels, CPU rendering "works"

[ipdf/code.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index ddcf8ca..a034d2a 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -7,6 +7,7 @@
 
 #include "stb_truetype.h"
 #include "graphicsbuffer.h"
+#include "shaderprogram.h"
 
 namespace IPDF
 {
@@ -58,6 +59,13 @@ namespace IPDF
 
                void ScreenShot(const char * filename) const;
                void RenderBMP(const char * filename) const;
+               void RenderPixels(int x, int y, int w, int h, uint8_t * pixels) const;
+
+
+               // Returns the CPU time (in seconds) it took to render the last completed frame.
+               double GetLastFrameTimeCPU() const { return m_last_frame_time / SDL_GetPerformanceFrequency(); }
+               // Returns the GPU time (in seconds) it took to render the last completed frame.
+               double GetLastFrameTimeGPU() const;
        private:
                void ResizeViewport(int width, int height);
                void DebugFontFlush();
@@ -66,10 +74,19 @@ namespace IPDF
                int m_last_mouse_x;
                int m_last_mouse_y;
 
+               double m_last_frame_time;
+               double m_frame_begin_time;
+               GLuint m_frame_gpu_timer;
+               GLuint m_last_frame_gpu_timer;
+
                int m_viewport_width;
                int m_viewport_height;
                SDL_Window *m_window;
                SDL_GLContext m_gl_context;
+               ShaderProgram m_texture_prog;
+               ShaderProgram m_font_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;