citrun

watch C/C++ source code execute
Log | Files | Refs | LICENSE

commit 17d03c825762147b5b8d52cbc87c35d7070daa94
parent 96b3256e3b87716288dad0b1167788250a906ca6
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat, 17 Dec 2016 16:13:59 -0700

src: enable srgb framebuffer through glfw

Diffstat:
Msrc/gl_main.cc | 1+
Msrc/gl_view.cc | 23-----------------------
Msrc/gl_view.h | 2--
3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/gl_main.cc b/src/gl_main.cc @@ -38,6 +38,7 @@ main(int argc, char *argv[]) glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); + glfwWindowHint(GLFW_SRGB_CAPABLE, 1); window = glfwCreateWindow(1600, 1200, "C It Run", NULL, NULL); if (window == NULL) { diff --git a/src/gl_view.cc b/src/gl_view.cc @@ -142,24 +142,6 @@ current_time (void) } void -View::toggle_srgb() -{ - srgb = !srgb; - LOGI ("Setting sRGB framebuffer %s.\n", srgb ? "on" : "off"); -#if defined(GL_FRAMEBUFFER_SRGB) && defined(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT) - GLboolean available = false; - if ((glewIsSupported ("GL_ARB_framebuffer_sRGB") || glewIsSupported ("GL_EXT_framebuffer_sRGB")) && - (glGetBooleanv (GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &available), available)) { - if (srgb) - glEnable (GL_FRAMEBUFFER_SRGB); - else - glDisable (GL_FRAMEBUFFER_SRGB); - } else -#endif - LOGW ("No sRGB framebuffer extension found; failed to set sRGB framebuffer\n"); -} - -void View::toggle_fullscreen() { #if 0 @@ -240,9 +222,6 @@ View::keyboard_func(GLFWwindow *window, int key, int scancode, int action, int m case 'b': scale_gamma_adjust(1. / STEP); break; - case 'c': - toggle_srgb(); - break; case GLFW_KEY_EQUAL: scale(STEP); @@ -476,7 +455,5 @@ View::display(glyphy_extents_t const &extents) void View::setup() { - if (!srgb) - toggle_srgb(); demo_glstate_setup(st); } diff --git a/src/gl_view.h b/src/gl_view.h @@ -38,7 +38,6 @@ private: void scale(double); void translate(double, double); void apply_transform(float *); - void toggle_srgb(); void toggle_fullscreen(); void toggle_debug(); void advance_frame(long); @@ -48,7 +47,6 @@ private: demo_glstate_t *st; /* Output */ - glyphy_bool_t srgb; glyphy_bool_t fullscreen; /* Mouse handling */