From c506fdecdf5237a82685813dc93c64e78977adc7 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Tue, 25 Mar 2014 16:48:58 -0700 Subject: [PATCH] - Adding snapshot/restore support for indeded variants of GL_BLEND --- src/voglcommon/gl_gets.inc | 2 ++ src/voglcommon/gl_pname_defs.h | 2 +- src/voglcommon/vogl_general_context_state.cpp | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/voglcommon/gl_gets.inc b/src/voglcommon/gl_gets.inc index 69a5943..cd7211c 100644 --- a/src/voglcommon/gl_gets.inc +++ b/src/voglcommon/gl_gets.inc @@ -484,6 +484,8 @@ DEFINE_GL_GET(GL_MAX_COLOR_ATTACHMENTS, 0x0030, 0x99) // Not sure about the version of the VAO binding DEFINE_GL_GET(GL_VERTEX_ARRAY_BINDING, 0x0030, 0x99) +DEFINE_GL_INDEXED_GET(GL_BLEND, 0x030, 0x99, GL_MAX_DRAW_BUFFERS) + // Start of version 3.1 - DEFINE_GL_GET(GL_MAX_RECTANGLE_TEXTURE_SIZE, 0x0031, 0x99) DEFINE_GL_GET(GL_MAX_TEXTURE_BUFFER_SIZE, 0x0031, 0x99) diff --git a/src/voglcommon/gl_pname_defs.h b/src/voglcommon/gl_pname_defs.h index c67e912..da8fd5c 100644 --- a/src/voglcommon/gl_pname_defs.h +++ b/src/voglcommon/gl_pname_defs.h @@ -191,7 +191,7 @@ struct gl_pname_def_t { "glGet", 'B', 1, "GL_DITHER", 0x0BD0}, { "glGet", 'E', 1, "GL_BLEND_DST", 0x0BE0}, { "glGet", 'E', 1, "GL_BLEND_SRC", 0x0BE1}, - { "glGet", 'B', 1, "GL_BLEND", 0x0BE2}, + { "glGet,glGetI", 'B', 1, "GL_BLEND", 0x0BE2}, { "glGet", 'E', 1, "GL_LOGIC_OP_MODE", 0x0BF0}, { "glGet", 'B', 1, "GL_INDEX_LOGIC_OP", 0x0BF1}, { "glGet", 'B', 1, "GL_COLOR_LOGIC_OP", 0x0BF2}, diff --git a/src/voglcommon/vogl_general_context_state.cpp b/src/voglcommon/vogl_general_context_state.cpp index c47a298..95ceaee 100644 --- a/src/voglcommon/vogl_general_context_state.cpp +++ b/src/voglcommon/vogl_general_context_state.cpp @@ -1862,6 +1862,25 @@ bool vogl_general_context_state::restore(const vogl_context_info &context_info, restore_buffer_binding(GL_UNIFORM_BUFFER_BINDING, GL_UNIFORM_BUFFER, remapper); ADD_PROCESSED_STATE(GL_UNIFORM_BUFFER_BINDING, 0); + // Restore indexed blending state (we've already restored the global state, which sets all the indexed states) + for (uint i = 0; i < context_info.get_max_draw_buffers(); i++) + { + GLint enabled = 0; + if (get(GL_BLEND, i, &enabled, 1, true)) + { + if (enabled) + { + GL_ENTRYPOINT(glEnablei)(GL_BLEND, i); + VOGL_CHECK_GL_ERROR; + } + else + { + GL_ENTRYPOINT(glDisablei)(GL_BLEND, i); + VOGL_CHECK_GL_ERROR; + } + } + } + // TODO: these GL4 guys have indexed and offset/size variants restore_buffer_binding(GL_ATOMIC_COUNTER_BUFFER_BINDING, GL_ATOMIC_COUNTER_BUFFER, remapper); ADD_PROCESSED_STATE(GL_ATOMIC_COUNTER_BUFFER_BINDING, 0); -- 2.43.0