[Qt][OpenGL] Initial support of OpenGL 4.3 Core profile.

[csp-qt/common_source_project-fm7.git] / source / src / qt / gui / gles2 / qt_glutil_gles_2.h

diff --git a/source/src/qt/gui/gles2/qt_glutil_gles_2.h b/source/src/qt/gui/gles2/qt_glutil_gles_2.h
index 97f3785..0e646d3 100644 (file)
--- a/source/src/qt/gui/gles2/qt_glutil_gles_2.h
+++ b/source/src/qt/gui/gles2/qt_glutil_gles_2.h
@@ -12,7 +12,8 @@
 
 #include <QString>
 
-#include "../gl2/qt_glutil_gl2_0.h"
+#include "../gl/qt_glutil_gl_tmpl.h"
+//#include "../gl2/qt_glutil_gl2_0.h"
 
 QT_BEGIN_NAMESPACE
 class GLScreenPack;
@@ -23,7 +24,7 @@ class QOpenGLVertexArrayObject;
 class QOpenGLShaderProgram;
 class QOpenGLPixelTransferOptions;
 
-class DLL_PREFIX GLDraw_ES_2 : public GLDraw_2_0
+class DLL_PREFIX GLDraw_ES_2 : public GLDraw_Tmpl
 {
        Q_OBJECT
 private:
@@ -124,8 +125,7 @@ protected:
                                                                        QOpenGLVertexArrayObject *vp,
                                                                        GLfloat *tp,
                                                                        int number);
-
-       virtual void drawGridsMain_es(QOpenGLShaderProgram *prg,
+       virtual void drawGridsMain(QOpenGLShaderProgram *prg,
                                                                  QOpenGLBuffer *bp,
                                                                  QOpenGLVertexArrayObject *vp,
                                                                  int number,
@@ -139,6 +139,7 @@ protected:
 
        virtual void drawGridsHorizonal(void);
        virtual void drawGridsVertical(void);
+       virtual void drawGrids();
 
        virtual void drawMain(QOpenGLShaderProgram *prg,
                                                  QOpenGLVertexArrayObject *vp,
@@ -169,6 +170,7 @@ protected:
        virtual void set_osd_vertex(int bit);
        virtual void initBitmapVertex(void);
        virtual QOpenGLTexture *createMainTexture(QImage *img);
+       void updateButtonTexture(void);
 
 public:
        GLDraw_ES_2(GLDrawClass *parent, USING_FLAGS *p, CSP_Logger *logger, EMU *emu = 0);
@@ -185,12 +187,18 @@ public:
        virtual void do_set_screen_multiply(float mul);
        virtual void doSetGridsHorizonal(int lines, bool force);
        virtual void doSetGridsVertical(int pixels, bool force);
+       void uploadBitmapTexture(QImage *p);
 public slots:
+       void updateBitmap(QImage *);
+       void uploadIconTexture(QPixmap *p, int icon_type, int localnum);
        void setBrightness(GLfloat r, GLfloat g, GLfloat b);
        void do_set_texture_size(QImage *p, int w, int h);
        void do_set_horiz_lines(int lines);
        virtual void paintGL(void);
        virtual void resizeGL(int width, int height);
+       void do_set_display_osd(bool onoff);
+       void do_display_osd_leds(int lednum, bool onoff);
+
 };
 QT_END_NAMESPACE
 #endif