Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#762: saves all frequently used OpenGL attributes

Browse Source 
When rendering the OpenGL layer, this prepares the FLTK rendering
parameters and restores them after FLTK rendering.
This commit is contained in:
Matthias Melcher
2023-08-02 20:24:46 +02:00
parent e49f2008a6
commit 79d3b8d69d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Gl_Window.cxx
+4 -6
View File
@@ -354,13 +354,11 @@ void Fl_Gl_Window::draw_begin() {
valid(1); valid(1);
} }
glPushAttrib(GL_ENABLE_BIT); glPushAttrib(GL_ALL_ATTRIB_BITS);
glPushAttrib(GL_TRANSFORM_BIT);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
// glOrtho(-0.5, w()-0.5, h()-0.5, -0.5, -1, 1);
glOrtho(0.0, w(), h(), 0.0, -1.0, 1.0); glOrtho(0.0, w(), h(), 0.0, -1.0, 1.0);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
@@ -368,6 +366,8 @@ void Fl_Gl_Window::draw_begin() {
glLoadIdentity(); glLoadIdentity();
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
glLineWidth((GLfloat)(drv->pixels_per_unit_*drv->line_width_)); glLineWidth((GLfloat)(drv->pixels_per_unit_*drv->line_width_));
@@ -375,7 +375,6 @@ void Fl_Gl_Window::draw_begin() {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
if (!pGlWindowDriver->need_scissor()) glDisable(GL_SCISSOR_TEST); if (!pGlWindowDriver->need_scissor()) glDisable(GL_SCISSOR_TEST);
// TODO: all of the settings should be saved on the GL stack
} }
/** /**
@@ -389,8 +388,7 @@ void Fl_Gl_Window::draw_end() {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPopMatrix(); glPopMatrix();
glPopAttrib(); // GL_TRANSFORM_BIT glPopAttrib(); // GL_ALL_ATTRIB_BITS
glPopAttrib(); // GL_ENABLE_BIT
Fl_Surface_Device::pop_current(); Fl_Surface_Device::pop_current();
if (mode() & FL_OPENGL3) pGlWindowDriver->switch_back(); if (mode() & FL_OPENGL3) pGlWindowDriver->switch_back();